From 6a368d69da7dcdb4f99b5bb72b0ebdf4cbf5894b Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 19:39:12 +0800 Subject: [PATCH 1/6] chore: bump `rspack-resolver` to v1.2.0 --- package.json | 2 +- yarn.lock | 100 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index b96a708..58a56c0 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "dependencies": { "debug": "^4.4.0", "get-tsconfig": "^4.10.0", - "rspack-resolver": "^1.1.2", + "rspack-resolver": "^1.2.0", "stable-hash": "^0.0.5", "tinyglobby": "^0.2.12" }, diff --git a/yarn.lock b/yarn.lock index d64142b..ee7e68f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4248,81 +4248,81 @@ __metadata: languageName: node linkType: hard -"@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.2" +"@unrs/rspack-resolver-binding-darwin-arm64@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-darwin-arm64@npm:1.2.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.2" +"@unrs/rspack-resolver-binding-darwin-x64@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-darwin-x64@npm:1.2.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.2" +"@unrs/rspack-resolver-binding-freebsd-x64@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-freebsd-x64@npm:1.2.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.2" +"@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.2.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.2" +"@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.2.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.2" +"@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.2.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.2" +"@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.2.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.2" +"@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.2.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.2" +"@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.2.0" dependencies: "@napi-rs/wasm-runtime": "npm:^0.2.7" conditions: cpu=wasm32 languageName: node linkType: hard -"@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.2" +"@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.2.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.2": - version: 1.1.2 - resolution: "@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.2" +"@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.2.0": + version: 1.2.0 + resolution: "@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.2.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -6702,7 +6702,7 @@ __metadata: npm-run-all2: "npm:^7.0.2" prettier: "npm:^3.5.3" react: "npm:^19.0.0" - rspack-resolver: "npm:^1.1.2" + rspack-resolver: "npm:^1.2.0" simple-git-hooks: "npm:^2.11.1" size-limit: "npm:^11.2.0" size-limit-preset-node-lib: "npm:^0.3.0" @@ -13210,21 +13210,21 @@ __metadata: languageName: node linkType: hard -"rspack-resolver@npm:^1.1.0, rspack-resolver@npm:^1.1.2": - version: 1.1.2 - resolution: "rspack-resolver@npm:1.1.2" - dependencies: - "@unrs/rspack-resolver-binding-darwin-arm64": "npm:1.1.2" - "@unrs/rspack-resolver-binding-darwin-x64": "npm:1.1.2" - "@unrs/rspack-resolver-binding-freebsd-x64": "npm:1.1.2" - "@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "npm:1.1.2" - "@unrs/rspack-resolver-binding-linux-arm64-gnu": "npm:1.1.2" - "@unrs/rspack-resolver-binding-linux-arm64-musl": "npm:1.1.2" - "@unrs/rspack-resolver-binding-linux-x64-gnu": "npm:1.1.2" - "@unrs/rspack-resolver-binding-linux-x64-musl": "npm:1.1.2" - "@unrs/rspack-resolver-binding-wasm32-wasi": "npm:1.1.2" - "@unrs/rspack-resolver-binding-win32-arm64-msvc": "npm:1.1.2" - "@unrs/rspack-resolver-binding-win32-x64-msvc": "npm:1.1.2" +"rspack-resolver@npm:^1.1.0, rspack-resolver@npm:^1.2.0": + version: 1.2.0 + resolution: "rspack-resolver@npm:1.2.0" + dependencies: + "@unrs/rspack-resolver-binding-darwin-arm64": "npm:1.2.0" + "@unrs/rspack-resolver-binding-darwin-x64": "npm:1.2.0" + "@unrs/rspack-resolver-binding-freebsd-x64": "npm:1.2.0" + "@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "npm:1.2.0" + "@unrs/rspack-resolver-binding-linux-arm64-gnu": "npm:1.2.0" + "@unrs/rspack-resolver-binding-linux-arm64-musl": "npm:1.2.0" + "@unrs/rspack-resolver-binding-linux-x64-gnu": "npm:1.2.0" + "@unrs/rspack-resolver-binding-linux-x64-musl": "npm:1.2.0" + "@unrs/rspack-resolver-binding-wasm32-wasi": "npm:1.2.0" + "@unrs/rspack-resolver-binding-win32-arm64-msvc": "npm:1.2.0" + "@unrs/rspack-resolver-binding-win32-x64-msvc": "npm:1.2.0" dependenciesMeta: "@unrs/rspack-resolver-binding-darwin-arm64": optional: true @@ -13248,7 +13248,7 @@ __metadata: optional: true "@unrs/rspack-resolver-binding-win32-x64-msvc": optional: true - checksum: 10/116fadb51a778560a079d82874e85d519a82f54987992fbde766c912597c347f5517cd7f8223bcc2658e742b8cd4f3beb5d994a48b0fbbe4818af75dcf994481 + checksum: 10/c2b869ba530bfa419142130118b543de63f62a1999df7680fffad1ff66b92fc2be7f8d8dfc146ee4a31bcae7f6ab5bd6fd1ec99fd64c0287bbdd9b030ff7ffd8 languageName: node linkType: hard From 29a27ac5db5b4e0e639a42ad0a0463ec32187edb Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 20:07:18 +0800 Subject: [PATCH 2/6] fix: don't set empty `configFile` when no tsconfig found --- src/normalize-options.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/normalize-options.ts b/src/normalize-options.ts index 62a354b..ec61e00 100644 --- a/src/normalize-options.ts +++ b/src/normalize-options.ts @@ -94,10 +94,9 @@ export function normalizeOptions( mainFields: defaultMainFields, ...options, project, - tsconfig: { - references: references ?? 'auto', - configFile: configFile || '', - }, + tsconfig: configFile + ? { references: references ?? 'auto', configFile: configFile } + : undefined, } if (configFile) { From 72ccbadbfac3cae1d348bff5bbebfe4d1407ed44 Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 20:11:00 +0800 Subject: [PATCH 3/6] ci: run `pkg-pr-new publish` for any commits --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6342dc0..3470944 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,3 +44,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + + - run: yarn dlx pkg-pr-new publish From 4ce4b9811f397984b50f7531168e8f0a4083a4db Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 20:11:52 +0800 Subject: [PATCH 4/6] Create modern-turtles-hide.md --- .changeset/modern-turtles-hide.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/modern-turtles-hide.md diff --git a/.changeset/modern-turtles-hide.md b/.changeset/modern-turtles-hide.md new file mode 100644 index 0000000..38f8306 --- /dev/null +++ b/.changeset/modern-turtles-hide.md @@ -0,0 +1,5 @@ +--- +"eslint-import-resolver-typescript": patch +--- + +chore: bump `rspack-resolver` to v1.2.0 From 11bd719b16b48d8ccb1efabea2fa0dd83e279778 Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 20:12:26 +0800 Subject: [PATCH 5/6] Create good-queens-shout.md --- .changeset/good-queens-shout.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/good-queens-shout.md diff --git a/.changeset/good-queens-shout.md b/.changeset/good-queens-shout.md new file mode 100644 index 0000000..bc15385 --- /dev/null +++ b/.changeset/good-queens-shout.md @@ -0,0 +1,5 @@ +--- +"eslint-import-resolver-typescript": patch +--- + +fix: don't set empty `configFile` when no `tsconfig` found From ea0b1aece662bf9eed57a20f00e203d66077c69c Mon Sep 17 00:00:00 2001 From: JounQin Date: Tue, 18 Mar 2025 20:17:55 +0800 Subject: [PATCH 6/6] ci: split pkg-pr-new action --- .github/workflows/pkg-pr-new.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 -- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/pkg-pr-new.yml diff --git a/.github/workflows/pkg-pr-new.yml b/.github/workflows/pkg-pr-new.yml new file mode 100644 index 0000000..e8860eb --- /dev/null +++ b/.github/workflows/pkg-pr-new.yml @@ -0,0 +1,30 @@ +name: Publish Any Commit +on: + - push + - pull_request + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repo + uses: actions/checkout@v4 + + - name: Setup Node.js LTS + uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: yarn + + - name: Install dependencies + run: yarn --immutable + + - name: Build + run: yarn build + + - run: yarn dlx pkg-pr-new publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3470944..6342dc0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,5 +44,3 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - - run: yarn dlx pkg-pr-new publish