diff --git a/.lefthook/pre-push/check.sh b/.lefthook/pre-push/check.sh index 70e573c..d7131f4 100755 --- a/.lefthook/pre-push/check.sh +++ b/.lefthook/pre-push/check.sh @@ -1 +1 @@ -yarn run lint --quiet +yarn wb lint --quiet diff --git a/lefthook.yml b/lefthook.yml index 3170d7c..fa22903 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -15,29 +15,7 @@ pre-commit: glob: '**/*.{astro,cjs,css,cts,gql,graphql,hbs,htm,html,java,js,json,json5,jsonc,jsx,less,md,mdx,mjs,mts,scss,svelte,toml,ts,tsx,vue,yaml,yml}' run: |- # Lefthook expands {staged_files} as shell-escaped args, so paths with spaces stay intact. - oxlint_files="$(printf '%s\n' {staged_files} | grep -E '(\.astro$|\.cjs$|\.cts$|\.js$|\.jsx$|\.mjs$|\.mts$|\.svelte$|\.ts$|\.tsx$|\.vue$)' || true)" - oxfmt_files="$(printf '%s\n' {staged_files} | grep -E '(\.astro$|\.cjs$|\.css$|\.cts$|\.gql$|\.graphql$|\.hbs$|\.htm$|\.html$|\.js$|\.json$|\.json5$|\.jsonc$|\.jsx$|\.less$|\.md$|\.mdx$|\.mjs$|\.mts$|\.scss$|\.svelte$|\.toml$|\.ts$|\.tsx$|\.vue$|\.yaml$|\.yml$)' | grep -v -E '(^|/)package\.json$' || true)" - prettier_files="$(printf '%s\n' {staged_files} | grep -E '(\.java$)' || true)" - package_json_files="$(printf '%s\n' {staged_files} | grep -E '(^|/)package\.json$' || true)" - - - - - if [ -n "$oxfmt_files" ]; then - node node_modules/.bin/oxfmt --write --no-error-on-unmatched-pattern '!**/package.json' $oxfmt_files - fi - - if [ -n "$prettier_files" ]; then - node node_modules/.bin/prettier --cache --write --ignore-unknown -- $prettier_files - fi - - if [ -n "$oxlint_files" ]; then - node node_modules/.bin/oxlint --fix $oxlint_files - fi - - if [ -n "$package_json_files" ]; then - node node_modules/.bin/sort-package-json -- $package_json_files - fi + yarn wb lint --fix --format -- {staged_files} stage_fixed: true - name: check-migrations glob: '**/migration.sql' diff --git a/package.json b/package.json index 3328c27..cffcdb8 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,6 @@ ], "scripts": { "build": "build-ts lib --input src/index.ts src/presets/*.ts", - "check-all-for-ai": "yarn check-for-ai && yarn test", - "check-for-ai": "yarn install > /dev/null && yarn format > /dev/null 2> /dev/null || true && yarn lint-fix --quiet", "cleanup": "yarn format && yarn lint-fix", "format": "sort-package-json && yarn format-code && yarn prettify", "format-code": "oxfmt --write --no-error-on-unmatched-pattern . '!**/package.json'", @@ -46,7 +44,7 @@ "start": "build-ts run src/index.ts", "test": "rm -fr temp && dotenv -c test -- vitest test", "test/ci-setup": "yarn build && bun install --cwd example", - "typecheck": "tsgo --noEmit", + "typecheck": "wb typecheck", "verify": "wb verify", "verify-full": "wb verify --full" }, @@ -65,12 +63,12 @@ "@tsconfig/node-ts": "23.6.4", "@tsconfig/node24": "24.0.4", "@types/node": "24.12.2", - "@typescript/native-preview": "7.0.0-dev.20260426.1", + "@typescript/native-preview": "7.0.0-dev.20260421.2", "@willbooster/oxfmt-config": "1.2.2", "@willbooster/oxlint-config": "1.4.6", "@willbooster/prettier-config": "10.4.0", "@willbooster/wb": "13.12.10", - "build-ts": "17.1.8", + "build-ts": "17.1.9", "conventional-changelog-conventionalcommits": "9.3.1", "dotenv-cli": "11.0.0", "lefthook": "2.1.6", diff --git a/yarn.lock b/yarn.lock index c42d69e..b192909 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1723,13 +1723,13 @@ __metadata: "@tsconfig/node-ts": "npm:23.6.4" "@tsconfig/node24": "npm:24.0.4" "@types/node": "npm:24.12.2" - "@typescript/native-preview": "npm:7.0.0-dev.20260426.1" + "@typescript/native-preview": "npm:7.0.0-dev.20260421.2" "@willbooster/oxfmt-config": "npm:1.2.2" "@willbooster/oxlint-config": "npm:1.4.6" "@willbooster/prettier-config": "npm:10.4.0" "@willbooster/wb": "npm:13.12.10" ai: "npm:6.0.168" - build-ts: "npm:17.1.8" + build-ts: "npm:17.1.9" conventional-changelog-conventionalcommits: "npm:9.3.1" dotenv-cli: "npm:11.0.0" front-matter: "npm:4.0.2" @@ -3355,9 +3355,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260421.2" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -3369,9 +3369,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260421.2" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -3383,9 +3383,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260421.2" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -3397,9 +3397,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260421.2" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -3411,9 +3411,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260421.2" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -3425,9 +3425,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260421.2" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -3439,9 +3439,9 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260421.2" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -3453,17 +3453,17 @@ __metadata: languageName: node linkType: hard -"@typescript/native-preview@npm:7.0.0-dev.20260420.1": - version: 7.0.0-dev.20260420.1 - resolution: "@typescript/native-preview@npm:7.0.0-dev.20260420.1" +"@typescript/native-preview@npm:7.0.0-dev.20260421.2": + version: 7.0.0-dev.20260421.2 + resolution: "@typescript/native-preview@npm:7.0.0-dev.20260421.2" dependencies: - "@typescript/native-preview-darwin-arm64": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-darwin-x64": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-linux-arm": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-linux-arm64": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-linux-x64": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-win32-arm64": "npm:7.0.0-dev.20260420.1" - "@typescript/native-preview-win32-x64": "npm:7.0.0-dev.20260420.1" + "@typescript/native-preview-darwin-arm64": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-darwin-x64": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-linux-arm": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-linux-arm64": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-linux-x64": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-win32-arm64": "npm:7.0.0-dev.20260421.2" + "@typescript/native-preview-win32-x64": "npm:7.0.0-dev.20260421.2" dependenciesMeta: "@typescript/native-preview-darwin-arm64": optional: true @@ -3481,7 +3481,7 @@ __metadata: optional: true bin: tsgo: bin/tsgo.js - checksum: 10c0/618c2e8e7497e0b5185b7aed942db6fa0c041667a061b33e354b839185b05387c6b164097ada0c479f846dc4a42163983c69850e91e07958fe42a4acce0af1cb + checksum: 10c0/79dbb7e5204c5906bcb3a2946209162efbaac9c8fa78ffeccb8b6718661a5b40f988d60b27350ad538cc1a4143524e5fc97b04fa4767bd42a036000f226438db languageName: node linkType: hard @@ -3635,13 +3635,13 @@ __metadata: languageName: node linkType: hard -"@willbooster/shared-lib-node@npm:8.5.9": - version: 8.5.9 - resolution: "@willbooster/shared-lib-node@npm:8.5.9" +"@willbooster/shared-lib-node@npm:8.5.13": + version: 8.5.13 + resolution: "@willbooster/shared-lib-node@npm:8.5.13" dependencies: dotenv: "npm:17.4.2" dotenv-expand: "npm:12.0.3" - checksum: 10c0/086f447bd058575734be525afb6fe156d6966f6c78bcb29ee05531a293e193b5571601b8cad48d94f55801b5ccf95d2bf101a5c4d7c24bfd556a9eaecb07742b + checksum: 10c0/e7e7dd32b0641654415f70fdd3d158a8e6c5e10a58752a69842531bdce3fe0d3bd2074911daf50698dc7bc2e76226f1413487b3da65404f299c9646d85b0e6d2 languageName: node linkType: hard @@ -4079,9 +4079,9 @@ __metadata: languageName: node linkType: hard -"build-ts@npm:17.1.8": - version: 17.1.8 - resolution: "build-ts@npm:17.1.8" +"build-ts@npm:17.1.9": + version: 17.1.9 + resolution: "build-ts@npm:17.1.9" dependencies: "@babel/core": "npm:7.29.0" "@babel/plugin-proposal-decorators": "npm:7.29.0" @@ -4098,8 +4098,8 @@ __metadata: "@rollup/plugin-replace": "npm:6.0.3" "@rollup/plugin-terser": "npm:1.0.0" "@rollup/pluginutils": "npm:5.3.0" - "@typescript/native-preview": "npm:7.0.0-dev.20260420.1" - "@willbooster/shared-lib-node": "npm:8.5.9" + "@typescript/native-preview": "npm:7.0.0-dev.20260426.1" + "@willbooster/shared-lib-node": "npm:8.5.13" babel-plugin-polyfill-corejs3: "npm:0.14.2" babel-plugin-transform-remove-console: "npm:6.9.4" chalk: "npm:5.6.2" @@ -4118,7 +4118,7 @@ __metadata: yargs: "npm:18.0.0" bin: build-ts: bin/index.js - checksum: 10c0/57647a5babc69cff10c3f14d1c8ffdd3e7fe2a4f8179e63131d76e3cacaacb80c39434a102a4a1b7f457f78fed9cba3a7f60670b1effc9b742653f3e4b528f54 + checksum: 10c0/c0ebd8da20f51a34fa9c7be54c4031a3534cce0aabc5a2a94ee4cbaceaa7dbd8cd15e0ec1a57cc64b25cb3a6c549401b6a0812267c05240e60a817ac9a463c11 languageName: node linkType: hard