Skip to content

Commit c911e06

Browse files
committed
Merge branch 'main'
2 parents da1bf03 + dc80382 commit c911e06

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+9241
-744
lines changed

.github/actions/pnpm/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ description: Install pnpm
55
runs:
66
using: composite
77
steps:
8-
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
8+
- uses: pnpm/action-setup@v4
99

10-
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
10+
- uses: actions/setup-node@v4
1111
with:
1212
node-version-file: .node-version
1313
cache: pnpm

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["github>Boshen/renovate", "helpers:pinGitHubActionDigestsToSemver"],
3+
"extends": ["github>1stG/configs"],
44
"ignorePaths": ["**/node_modules/**", "**/fixtures/**"],
55
"packageRules": [
66
{

.github/workflows/benchmark.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ on:
1717
- "Cargo.lock"
1818

1919
concurrency:
20-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
20+
group: ${{ github.workflow }}-${{ github.ref }}
2121
cancel-in-progress: true
2222

2323
jobs:
2424
benchmark:
2525
name: Benchmark
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
28+
- uses: taiki-e/checkout-action@v1
2929

30-
- uses: oxc-project/setup-rust@cd82e1efec7fef815e2c23d296756f31c7cdc03d # v1.0.0
30+
- uses: oxc-project/[email protected]
3131
with:
3232
cache-key: benchmark
3333
save-cache: ${{ github.ref_name == 'main' }}
@@ -39,7 +39,7 @@ jobs:
3939
env:
4040
RUSTFLAGS: "-C debuginfo=1 -C strip=none"
4141

42-
- uses: CodSpeedHQ/action@0010eb0ca6e89b80c88e8edaaa07cfe5f3e6664d # v3.5.0
42+
- uses: CodSpeedHQ/action@v3
4343
timeout-minutes: 30
4444
with:
4545
run: cargo codspeed run

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717
- "!.github/workflows/ci.yml"
1818

1919
concurrency:
20-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
21-
cancel-in-progress: ${{ github.ref_name != 'main' }}
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
2222

2323
defaults:
2424
run:
@@ -28,7 +28,7 @@ jobs:
2828
test:
2929
name: Test
3030
strategy:
31-
fail-fast: true
31+
fail-fast: false
3232
matrix:
3333
include:
3434
- os: windows-latest

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
21-
cancel-in-progress: ${{ github.ref_name != 'main' }}
21+
cancel-in-progress: true
2222

2323
jobs:
2424
coverage:
@@ -66,7 +66,7 @@ jobs:
6666

6767
- name: Upload to codecov.io
6868
if: env.CODECOV_TOKEN
69-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
69+
uses: codecov/codecov-action@v5
7070
with:
7171
token: ${{ secrets.CODECOV_TOKEN }}
7272
fail_ci_if_error: true

.github/workflows/release-napi.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
id: version
3333
with:
3434
static-checking: localIsNew
35-
file-url: https://unpkg.com/oxc-resolver@latest/package.json
35+
file-url: https://cdn.jsdelivr.net/npm/rspack-resolver@latest/package.json
3636
file-name: npm/package.json
3737

3838
- name: Set version name
3939
if: steps.version.outputs.changed == 'true'
4040
run: |
41-
echo "Version change found! New version: ${{ steps.version.outputs.version }} (${{ steps.version.outputs.version_type }})"
41+
echo "Version change found! New version: ${{ steps.version.outputs.version }} (${{ steps.version.outputs.type }})"
4242
echo "version=${{ steps.version.outputs.version }}" >> $GITHUB_ENV
4343
4444
build:
@@ -146,7 +146,7 @@ jobs:
146146
if: ${{ contains(matrix.target, 'linux') }}
147147

148148
- name: Run linux test
149-
uses: addnab/docker-run-action@4f65fabd2431ebc8d299f8e5a018d79a769ae185 # v3
149+
uses: addnab/docker-run-action@v3
150150
if: false # ${{ contains(matrix.target, 'linux') }}
151151
with:
152152
image: ${{ steps.docker.outputs.IMAGE }}
@@ -169,10 +169,10 @@ jobs:
169169
name: Build FreeBSD
170170
runs-on: ubuntu-latest
171171
steps:
172-
- uses: taiki-e/checkout-action@b13d20b7cda4e2f325ef19895128f7ff735c0b3d # v1.3.1
172+
- uses: taiki-e/checkout-action@v1
173173
- name: Build
174174
id: build
175-
uses: cross-platform-actions/action@fe0167d8082ac584754ef3ffb567fded22642c7d # v0.27.0
175+
uses: cross-platform-actions/[email protected]
176176
env:
177177
DEBUG: napi:*
178178
RUSTUP_IO_THREADS: 1
@@ -203,7 +203,7 @@ jobs:
203203
rm -rf node_modules
204204
rm -rf target
205205
- name: Upload artifact
206-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
206+
uses: actions/upload-artifact@v4
207207
with:
208208
name: bindings-freebsd
209209
path: napi/*.node

.github/workflows/release-plz.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
branches:
99
- main
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
release-plz:
1317
name: Release-plz

CHANGELOG.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [1.1.2](https://github.com/unrs/rspack-resolver/compare/unrspack-resolver-v1.1.1...unrspack-resolver-v1.1.2) - 2025-03-16
10+
11+
### Fixed
12+
13+
- references should take higher priority ([#13](https://github.com/unrs/rspack-resolver/pull/13))
14+
- takes paths and references into account at the same time
15+
- should always try resolve_path_alias
16+
17+
## [1.1.1](https://github.com/unrs/rspack-resolver/compare/unrspack-resolver-v1.1.0...unrspack-resolver-v1.1.1) - 2025-03-16
18+
19+
### Other
20+
21+
- bump all (dev) deps
22+
- bump to edition 2024
23+
24+
## [1.1.0](https://github.com/unrs/rspack-resolver/compare/unrspack-resolver-v1.0.0...unrspack-resolver-v1.1.0) - 2025-03-15
25+
26+
### Added
27+
28+
- support resolving path with extra query ([#7](https://github.com/unrs/rspack-resolver/pull/7))
29+
30+
## [1.0.0](https://github.com/unrs/rspack-resolver/releases/tag/unrspack-resolver-v1.0.0) - 2025-03-15
31+
932
## [5.0.0](https://github.com/oxc-project/oxc-resolver/compare/oxc_resolver-v4.2.0...oxc_resolver-v5.0.0) - 2025-03-07
1033

1134
### <!-- 0 -->Features
@@ -128,6 +151,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
128151
- use `fs::canonicalize` to cover symlink edge cases ([#284](https://github.com/oxc-project/oxc-resolver/pull/284))
129152
- extensionAlias cannot resolve mathjs ([#273](https://github.com/oxc-project/oxc-resolver/pull/273))
130153

154+
## [0.5.2](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.5.1...rspack_resolver-v0.5.2) - 2025-02-28
155+
156+
### Added
157+
158+
- *(pnp)* support link (#49)
159+
160+
### Other
161+
162+
- bump pnp 0.9.1 (#50)
163+
164+
## [0.5.1](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.5.0...rspack_resolver-v0.5.1) - 2025-02-11
165+
166+
### Fixed
167+
168+
- 🐛 pnp feat respect options.enable_pnp (#47)
169+
170+
## [0.4.0](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.3.6...rspack_resolver-v0.4.0) - 2024-12-26
171+
172+
### Feat
173+
174+
- Implements the PnP manifest lookup within the resolver ([#39](https://github.com/web-infra-dev/rspack-resolver/pull/39))
175+
176+
## [0.3.6](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.3.5...rspack_resolver-v0.3.6) - 2024-12-13
177+
178+
### Fixed
179+
180+
- alias match request end with slash (#35)
181+
182+
## [0.3.5](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.3.4...rspack_resolver-v0.3.5) - 2024-10-21
183+
184+
### Fixed
185+
186+
- resolve mathjs error when using `extensionAlias` ([#31](https://github.com/web-infra-dev/rspack-resolver/pull/31))
187+
188+
## [0.3.4](https://github.com/web-infra-dev/rspack-resolver/compare/rspack_resolver-v0.3.3...rspack_resolver-v0.3.4) - 2024-10-21
189+
190+
### Added
191+
192+
- rebase and refine extension-alias error format ([#30](https://github.com/web-infra-dev/rspack-resolver/pull/30))
193+
131194
## [1.12.0](https://github.com/oxc-project/oxc_resolver/compare/oxc_resolver-v1.11.0...oxc_resolver-v1.12.0) - 2024-09-25
132195

133196
### Added

0 commit comments

Comments
 (0)