diff --git a/biome.json b/biome.json index 587892a380..39077df201 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", + "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json", "vcs": { "enabled": true, "clientKind": "git", @@ -11,11 +11,10 @@ "rules": { "recommended": true, "style": { - "useTemplate": "off" - }, - "nursery": { + "useTemplate": "off", "noCommonJs": "error" }, + "nursery": {}, "suspicious": { "noAssignInExpressions": "warn" }, @@ -27,9 +26,7 @@ } } }, - "organizeImports": { - "enabled": true - }, + "assist": { "actions": { "source": { "organizeImports": "on" } } }, "formatter": { "enabled": true, "formatWithErrors": false, @@ -53,30 +50,32 @@ } }, "files": { - "ignore": [ - ".yarn/**", - "tests/analysis_tests/**/src/**", - "tests/build_tests/**/src/**", - "tests/docstring_tests/**", - "tests/gentype_tests/**", - "tests/tests/**/src/**", - "tests/tools_tests/**/src/**", - "analysis/examples/**/src/**", - "rewatch/**", - "lib/es6/**", - "lib/js/**", - "lib/bs/**", - "playground/**", - "*.bs.js", - "*.res.js", - "*.res.mjs", - "*.gen.ts*", - "*.d.ts", - "*.exe", - "package.json", - "packages/artifacts.json", - ".mypy_cache/**", - ".history/**" + "includes": [ + "**", + "!**/.yarn", + "!**/tests/analysis_tests/**/src", + "!**/tests/build_tests/**/src", + "!**/tests/docstring_tests", + "!**/tests/gentype_tests", + "**/tests/gentype_tests/typescript-react-example/**", + "!**/tests/tests/**/src", + "!**/tests/tools_tests/**/src", + "!**/analysis/examples/**/src", + "!**/rewatch", + "!**/lib/es6", + "!**/lib/js", + "!**/lib/bs", + "!**/playground", + "!**/*.bs.js", + "!**/*.res.js", + "!**/*.res.mjs", + "!**/*.gen.ts*", + "!**/*.d.ts", + "!**/*.exe", + "!**/package.json", + "!**/packages/artifacts.json", + "!**/.mypy_cache", + "!**/.history" ] } } diff --git a/package.json b/package.json index 92eed3b336..493c16d03a 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "@rescript/win32-x64": "workspace:packages/@rescript/win32-x64" }, "devDependencies": { - "@biomejs/biome": "1.9.4", + "@biomejs/biome": "2.3.11", "@types/node": "^25.0.3", "@types/semver": "^7.7.0", "@yarnpkg/types": "^4.0.1", diff --git a/tests/build_tests/weird_deps/input.js b/tests/build_tests/weird_deps/input.js index 1675283d2e..d98217346b 100644 --- a/tests/build_tests/weird_deps/input.js +++ b/tests/build_tests/weird_deps/input.js @@ -2,6 +2,7 @@ import * as assert from "node:assert"; import { setup } from "#dev/process"; + const { execBuild, execClean } = setup(import.meta.dirname); const out = await execBuild(); diff --git a/tests/gentype_tests/typescript-react-example/Makefile b/tests/gentype_tests/typescript-react-example/Makefile index 46f6aae7a6..62f0c2e2bf 100644 --- a/tests/gentype_tests/typescript-react-example/Makefile +++ b/tests/gentype_tests/typescript-react-example/Makefile @@ -2,7 +2,6 @@ SHELL = /bin/bash test: yarn build - yarn check yarn typecheck @git diff --quiet src/ \ || { echo; echo "Please review the Gentype outputs too!"; echo; false; } \ diff --git a/tests/gentype_tests/typescript-react-example/biome.json b/tests/gentype_tests/typescript-react-example/biome.json deleted file mode 100644 index f89a93677e..0000000000 --- a/tests/gentype_tests/typescript-react-example/biome.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "extends": ["../../../biome.json"], - "linter": { - "ignore": ["**/*.res.js", "**/*.gen.ts*"] - }, - "organizeImports": { - "ignore": ["**/*.res.js", "**/*.gen.ts*"] - }, - "formatter": { - "ignore": ["**/*.res.js", "**/*.gen.ts*"] - } -} diff --git a/tests/gentype_tests/typescript-react-example/package.json b/tests/gentype_tests/typescript-react-example/package.json index 689d837361..f8e2d691ad 100644 --- a/tests/gentype_tests/typescript-react-example/package.json +++ b/tests/gentype_tests/typescript-react-example/package.json @@ -5,8 +5,7 @@ "start": "rescript build -w", "build": "rescript build", "clean": "rescript clean", - "typecheck": "tsc", - "check": "biome check --changed --no-errors-on-unmatched ." + "typecheck": "tsc" }, "dependencies": { "@rescript/react": "^0.13.1", @@ -15,7 +14,6 @@ "rescript": "workspace:^" }, "devDependencies": { - "@biomejs/biome": "1.9.4", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "typescript": "5.9.3" diff --git a/yarn.lock b/yarn.lock index 3a1e8c3e3e..1569da60f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -180,18 +180,18 @@ __metadata: languageName: node linkType: hard -"@biomejs/biome@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/biome@npm:1.9.4" - dependencies: - "@biomejs/cli-darwin-arm64": "npm:1.9.4" - "@biomejs/cli-darwin-x64": "npm:1.9.4" - "@biomejs/cli-linux-arm64": "npm:1.9.4" - "@biomejs/cli-linux-arm64-musl": "npm:1.9.4" - "@biomejs/cli-linux-x64": "npm:1.9.4" - "@biomejs/cli-linux-x64-musl": "npm:1.9.4" - "@biomejs/cli-win32-arm64": "npm:1.9.4" - "@biomejs/cli-win32-x64": "npm:1.9.4" +"@biomejs/biome@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/biome@npm:2.3.11" + dependencies: + "@biomejs/cli-darwin-arm64": "npm:2.3.11" + "@biomejs/cli-darwin-x64": "npm:2.3.11" + "@biomejs/cli-linux-arm64": "npm:2.3.11" + "@biomejs/cli-linux-arm64-musl": "npm:2.3.11" + "@biomejs/cli-linux-x64": "npm:2.3.11" + "@biomejs/cli-linux-x64-musl": "npm:2.3.11" + "@biomejs/cli-win32-arm64": "npm:2.3.11" + "@biomejs/cli-win32-x64": "npm:2.3.11" dependenciesMeta: "@biomejs/cli-darwin-arm64": optional: true @@ -211,62 +211,62 @@ __metadata: optional: true bin: biome: bin/biome - checksum: 10c0/b5655c5aed9a6fffe24f7d04f15ba4444389d0e891c9ed9106fab7388ac9b4be63185852cc2a937b22940dac3e550b71032a4afd306925cfea436c33e5646b3e + checksum: 10c0/b9764070c3d1583466a8861d37dc480c18103f7bb52115db0f265a38e6343d69792c9beea094e0b3db0905cb365b9a82ad2a0f3f05b7f04873a8f9b444263140 languageName: node linkType: hard -"@biomejs/cli-darwin-arm64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-darwin-arm64@npm:1.9.4" +"@biomejs/cli-darwin-arm64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-darwin-arm64@npm:2.3.11" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@biomejs/cli-darwin-x64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-darwin-x64@npm:1.9.4" +"@biomejs/cli-darwin-x64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-darwin-x64@npm:2.3.11" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@biomejs/cli-linux-arm64-musl@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-linux-arm64-musl@npm:1.9.4" +"@biomejs/cli-linux-arm64-musl@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-linux-arm64-musl@npm:2.3.11" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@biomejs/cli-linux-arm64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-linux-arm64@npm:1.9.4" +"@biomejs/cli-linux-arm64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-linux-arm64@npm:2.3.11" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@biomejs/cli-linux-x64-musl@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-linux-x64-musl@npm:1.9.4" +"@biomejs/cli-linux-x64-musl@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-linux-x64-musl@npm:2.3.11" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@biomejs/cli-linux-x64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-linux-x64@npm:1.9.4" +"@biomejs/cli-linux-x64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-linux-x64@npm:2.3.11" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@biomejs/cli-win32-arm64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-win32-arm64@npm:1.9.4" +"@biomejs/cli-win32-arm64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-win32-arm64@npm:2.3.11" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@biomejs/cli-win32-x64@npm:1.9.4": - version: 1.9.4 - resolution: "@biomejs/cli-win32-x64@npm:1.9.4" +"@biomejs/cli-win32-x64@npm:2.3.11": + version: 2.3.11 + resolution: "@biomejs/cli-win32-x64@npm:2.3.11" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -745,7 +745,6 @@ __metadata: version: 0.0.0-use.local resolution: "@tests/gentype-react-example@workspace:tests/gentype_tests/typescript-react-example" dependencies: - "@biomejs/biome": "npm:1.9.4" "@rescript/react": "npm:^0.13.1" "@types/react": "npm:^18.3.3" "@types/react-dom": "npm:^18.3.0" @@ -2459,7 +2458,7 @@ __metadata: version: 0.0.0-use.local resolution: "rescript@workspace:." dependencies: - "@biomejs/biome": "npm:1.9.4" + "@biomejs/biome": "npm:2.3.11" "@rescript/darwin-arm64": "workspace:packages/@rescript/darwin-arm64" "@rescript/darwin-x64": "workspace:packages/@rescript/darwin-x64" "@rescript/linux-arm64": "workspace:packages/@rescript/linux-arm64"