Skip to content

Commit 8426ee0

Browse files
committed
chore: replace Oxfmt with Prettier
1 parent 66af7eb commit 8426ee0

16 files changed

Lines changed: 139 additions & 275 deletions

File tree

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**/dist/**
2+
pnpm-lock.yaml

.vscode/settings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"**/.DS_Store": true
1414
},
1515
"mdx.validate.validateFileLinks": "ignore",
16-
"editor.defaultFormatter": "oxc.oxc-vscode",
16+
"editor.defaultFormatter": "esbenp.prettier-vscode",
1717
"js/ts.tsdk.path": "node_modules/typescript/lib",
1818
"[typescript]": {
19-
"editor.defaultFormatter": "oxc.oxc-vscode"
19+
"editor.defaultFormatter": "esbenp.prettier-vscode"
2020
},
2121
"[javascript]": {
22-
"editor.defaultFormatter": "oxc.oxc-vscode"
22+
"editor.defaultFormatter": "esbenp.prettier-vscode"
2323
},
2424
"[mdx]": {
25-
"editor.defaultFormatter": "oxc.oxc-vscode"
25+
"editor.defaultFormatter": "esbenp.prettier-vscode"
2626
}
2727
}

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
- Use repo Node.js/pnpm versions (`package.json`)
66
- `pnpm` workspace; shared deps in `pnpm-workspace.yaml` catalogs
7-
- TypeScript, Rsbuild/Rslib/Rstest/Rslint, Oxfmt
7+
- TypeScript, Rsbuild/Rslib/Rstest/Rslint, Prettier
88

99
## Commands
1010

examples/app-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"build": "rs build",
77
"dev": "rs dev",
88
"lint": "rs lint",
9-
"test": "rs test",
10-
"preview": "rs preview"
9+
"preview": "rs preview",
10+
"test": "rs test"
1111
},
1212
"dependencies": {
1313
"react": "catalog:",

examples/app-vanilla/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"build": "rs build",
77
"dev": "rs dev",
88
"lint": "rs lint",
9-
"test": "rs test",
10-
"preview": "rs preview"
9+
"preview": "rs preview",
10+
"test": "rs test"
1111
},
1212
"devDependencies": {
1313
"@testing-library/dom": "catalog:",

examples/lib-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@examples/lib-node",
33
"private": true,
4-
"files": [
5-
"dist"
6-
],
74
"type": "module",
8-
"types": "./dist/index.d.ts",
95
"exports": {
106
".": {
117
"types": "./dist/index.d.ts",
128
"import": "./dist/index.js"
139
}
1410
},
11+
"types": "./dist/index.d.ts",
12+
"files": [
13+
"dist"
14+
],
1515
"scripts": {
1616
"build": "rs lib",
1717
"dev": "rs lib -w",

examples/lib-react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "@examples/lib-react",
33
"private": true,
4-
"files": [
5-
"dist"
6-
],
74
"type": "module",
8-
"types": "./dist/index.d.ts",
95
"exports": {
106
".": {
117
"types": "./dist/index.d.ts",
128
"import": "./dist/index.js"
139
}
1410
},
11+
"types": "./dist/index.d.ts",
12+
"files": [
13+
"dist"
14+
],
1515
"scripts": {
1616
"build": "rs lib",
1717
"dev": "rs lib -w",

oxfmt.config.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "rstack-monorepo",
33
"private": true,
4-
"license": "MIT",
54
"repository": "https://github.com/rstackjs/rstack-cli",
5+
"license": "MIT",
66
"type": "module",
77
"scripts": {
88
"build": "pnpm --filter './packages/**' build",
9-
"check:format": "oxfmt . --check",
9+
"check:format": "prettier . --check --experimental-cli",
1010
"check:spell": "pnpm dlx cspell && heading-case",
1111
"doc": "pnpm --dir website dev",
1212
"doc:build": "node --run build && pnpm --dir website build",
13-
"format": "oxfmt . && heading-case --write",
13+
"format": "prettier . --write --experimental-cli && heading-case --write",
1414
"lint": "rs lint --type-check",
1515
"prepare": "node scripts/rs.js setup",
1616
"test": "pnpm --filter './packages/**' test"
@@ -19,7 +19,8 @@
1919
"@types/node": "catalog:",
2020
"cspell-ban-words": "catalog:",
2121
"heading-case": "catalog:",
22-
"oxfmt": "catalog:",
22+
"prettier": "catalog:",
23+
"prettier-plugin-packagejson": "catalog:",
2324
"rstack": "workspace:*",
2425
"typescript": "catalog:"
2526
},

packages/rstack/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
{
22
"name": "rstack",
33
"version": "0.2.0",
4-
"license": "MIT",
54
"repository": "https://github.com/rstackjs/rstack-cli",
6-
"bin": {
7-
"rs": "./bin/rs.js",
8-
"rstack": "./bin/rs.js"
9-
},
10-
"files": [
11-
"bin",
12-
"dist",
13-
"types",
14-
"THIRD_PARTY_NOTICES.md"
15-
],
5+
"license": "MIT",
166
"type": "module",
17-
"types": "./dist/index.d.ts",
187
"exports": {
198
".": {
209
"types": "./dist/index.d.ts",
@@ -47,10 +36,17 @@
4736
},
4837
"./package.json": "./package.json"
4938
},
50-
"publishConfig": {
51-
"access": "public",
52-
"registry": "https://registry.npmjs.org/"
39+
"types": "./dist/index.d.ts",
40+
"bin": {
41+
"rs": "./bin/rs.js",
42+
"rstack": "./bin/rs.js"
5343
},
44+
"files": [
45+
"bin",
46+
"dist",
47+
"types",
48+
"THIRD_PARTY_NOTICES.md"
49+
],
5450
"scripts": {
5551
"build": "rslib",
5652
"dev": "rslib -w",
@@ -84,5 +80,9 @@
8480
},
8581
"engines": {
8682
"node": ">=22.12.0"
83+
},
84+
"publishConfig": {
85+
"access": "public",
86+
"registry": "https://registry.npmjs.org/"
8787
}
8888
}

0 commit comments

Comments
 (0)