Skip to content

Commit 1eaedf6

Browse files
authored
chore: switch to oxfmt and speedup pre-commit hook (#1268)
* chore: switch to oxfmt * speedup precommit hook
1 parent 556da41 commit 1eaedf6

9 files changed

Lines changed: 222 additions & 176 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public/playground-bundles/
4141
dist
4242
build
4343
.react-router
44+
.worktrees/
4445
mdx-manifest.json
4546

4647
app/**/*.mjs

.oxfmtrc.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"$schema": "./node_modules/oxfmt/configuration_schema.json",
3+
"printWidth": 80,
4+
"sortPackageJson": false,
5+
"ignorePatterns": [
6+
"!_shims.mjs",
7+
"!public/_redirects",
8+
".DS_Store",
9+
".worktrees/",
10+
".next/",
11+
".react-router",
12+
"*.swo",
13+
"*.swp",
14+
"app/**/*.mjs",
15+
"build",
16+
"data/api/**/*.json",
17+
"dist",
18+
"index_data/*.json",
19+
"node_modules/",
20+
"out/",
21+
"public/playground-bundles/",
22+
"public/blog/feed.xml",
23+
"_tempFile.cmi",
24+
"_tempFile.cmj",
25+
"_tempFile.cmt",
26+
"_tempFile.res",
27+
"temp",
28+
".bsb.lock",
29+
".merlin",
30+
"lib/",
31+
".vercel",
32+
"src/**/*.mjs",
33+
"scripts/gendocs.mjs",
34+
"scripts/generate_*.mjs",
35+
"public/llms/manual/**/llm*.txt",
36+
"public/llms/react/**/llm*.txt",
37+
"pages/docs/**/**/llms.mdx",
38+
"markdown-pages/docs/manual/installation.mdx",
39+
".yarn/releases/yarn-4.12.0.cjs",
40+
"data/api/*"
41+
]
42+
}

.prettierignore

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

.prettierrc

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

compilers/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "compilers",
3-
"private": true,
43
"version": "1.0.0",
5-
"main": "index.js",
4+
"private": true,
65
"license": "MIT",
6+
"main": "index.js",
77
"dependencies": {
88
"@rescript/core": "^1.3.0",
99
"@rescript/react": "^0.12.0",

lefthook.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1+
glob_matcher: doublestar
2+
13
pre-commit:
24
parallel: true
35
jobs:
4-
- run: yarn format
6+
- name: oxfmt staged
7+
glob:
8+
- "**/*.js"
9+
- "**/*.mjs"
10+
- "**/*.cjs"
11+
- "**/*.json"
12+
- "**/*.md"
13+
- "**/*.mdx"
14+
- "**/*.html"
15+
- "**/*.css"
16+
- "**/*.yml"
17+
- "**/*.yaml"
18+
run: ./node_modules/.bin/oxfmt {staged_files}
19+
stage_fixed: true
20+
21+
- name: rescript format staged
22+
glob:
23+
- "**/*.res"
24+
- "**/*.resi"
25+
run: ./node_modules/.bin/rescript format {staged_files}
526
stage_fixed: true

package.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{
22
"name": "rescript-lang.org",
3-
"private": true,
43
"version": "1.0.0",
5-
"author": "Patrick Ecker <ryyppy@users.noreply.github.com>",
4+
"private": true,
65
"license": "MIT",
7-
"engines": {
8-
"node": ">=22"
9-
},
10-
"packageManager": "yarn@4.13.0",
6+
"author": "Patrick Ecker <ryyppy@users.noreply.github.com>",
117
"type": "module",
128
"scripts": {
139
"build:scripts": "yarn dlx tsdown@0.21.7 scripts/*.jsx -d _scripts --no-clean --ext .mjs",
@@ -17,15 +13,15 @@
1713
"build:update-index": "yarn build:generate-llms && node _scripts/generate_feed.mjs > public/blog/feed.xml",
1814
"build:vite": "react-router build",
1915
"build": "yarn build:res && yarn build:scripts && yarn build:update-index && yarn build:vite",
20-
"ci:format": "prettier . --check --experimental-cli",
16+
"ci:format": "oxfmt --check",
2117
"ci:test": "yarn vitest --run --browser.headless",
2218
"clean:res": "rescript clean",
2319
"convert-images": "auto-convert-images",
2420
"dev:res": "rescript watch",
2521
"dev:vite": "react-router dev --host",
2622
"dev:wrangler": "yarn wrangler pages dev build/client",
2723
"dev": "yarn prepare && yarn dev:res & yarn dev:vite & yarn dev:wrangler",
28-
"format": "prettier . --write --experimental-cli && rescript format",
24+
"format": "oxfmt && rescript format",
2925
"prepare": "yarn build:res && yarn build:scripts && yarn build:update-index",
3026
"preview": "yarn build && static-server build/client",
3127
"reanalyze": "rescript-tools reanalyze -all-cmt .",
@@ -84,11 +80,7 @@
8480
"unified": "^11.0.5",
8581
"vfile-matter": "^5.0.1"
8682
},
87-
"resolutions": {
88-
"marked": "4.0.10"
89-
},
9083
"devDependencies": {
91-
"@prettier/plugin-oxc": "^0.1.3",
9284
"@react-router/dev": "^7.14.0",
9385
"@tailwindcss/vite": "^4.2.2",
9486
"@types/react": "^19.2.14",
@@ -101,8 +93,8 @@
10193
"jsdom": "^26.1.0",
10294
"lefthook": "^2.1.4",
10395
"lightningcss": "^1.32.0",
96+
"oxfmt": "^0.46.0",
10497
"playwright": "^1.59.1",
105-
"prettier": "^3.8.1",
10698
"remark-cli": "^12.0.1",
10799
"search-insights": "^2.17.3",
108100
"tailwindcss": "^4",
@@ -115,5 +107,12 @@
115107
"vitest": "^4.1.2",
116108
"vitest-browser-react": "^2.2.0",
117109
"wrangler": "^4.85.0"
118-
}
110+
},
111+
"resolutions": {
112+
"marked": "4.0.10"
113+
},
114+
"engines": {
115+
"node": ">=22"
116+
},
117+
"packageManager": "yarn@4.13.0"
119118
}

scripts/test-examples.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,9 @@ let ensureTempProject = ({ tempRoot, preserve = false }) => {
508508
fs.cpSync(
509509
path.join(projectRoot, "node_modules", "@rescript", "react"),
510510
tempReactPackage,
511-
{ recursive: true },
511+
{
512+
recursive: true,
513+
},
512514
);
513515
}
514516
};

0 commit comments

Comments
 (0)