Skip to content

Commit a3b42a8

Browse files
JounQinrenovate[bot]Boshenoxc-bot
authored
feat: merge from upstream oxc-project/oxc-resolver - 3rd (#58)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Boshen <boshenc@gmail.com> Co-authored-by: oxc-bot <boshen_chen@qq.com>
1 parent cc0f4fb commit a3b42a8

29 files changed

+352
-208
lines changed

‎.github/workflows/release-napi.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ jobs:
8282
- os: ubuntu-latest
8383
target: powerpc64le-unknown-linux-gnu
8484
build: pnpm build --use-napi-cross
85+
- os: ubuntu-latest
86+
target: riscv64gc-unknown-linux-gnu
87+
build: |
88+
sudo apt-get update &&
89+
sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu -y &&
90+
export CC=riscv64-linux-gnu-gcc &&
91+
export CXX=riscv64-linux-gnu-g++ &&
92+
pnpm build
8593
- os: ubuntu-latest
8694
target: s390x-unknown-linux-gnu
8795
build: export CFLAGS="-fuse-ld=lld" && pnpm build --use-napi-cross
@@ -126,11 +134,11 @@ jobs:
126134
- name: Upload artifacts
127135
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
128136
with:
137+
if-no-files-found: error
129138
name: bindings-${{ matrix.target }}
130139
path: |
131140
napi/*.node
132141
napi/*.wasm
133-
if-no-files-found: error
134142
135143
build-freebsd:
136144
needs: check

‎.github/workflows/release-plz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Run release-plz
3030
id: release-plz
31-
uses: MarcoIeni/release-plz-action@7419a2cb1535b9c0e852b4dec626967baf65c022 # v0.5
31+
uses: MarcoIeni/release-plz-action@7419a2cb1535b9c0e852b4dec626967baf65c022 # v0.5.102
3232
env:
3333
GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
3434
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

‎Cargo.lock

Lines changed: 59 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fixtures/tsconfig/cases/paths_template_variable/foo.js renamed to ‎fixtures/tsconfig/cases/paths_template_variable/src/foo.js

File renamed without changes.

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig2.json renamed to ‎fixtures/tsconfig/cases/paths_template_variable/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"composite": true,
44
"paths": {
5-
"foo": ["${configDir}/foo.js"]
5+
"foo": ["${configDir}/src/foo.js"]
66
}
77
}
88
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig1.json

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

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url1.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": "${configDir}",
4+
"paths": {
5+
"@/*": ["./src/*"]
6+
}
7+
}
8+
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url2.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": "${configDir}/",
4+
"paths": {
5+
"@/*": ["./src/*"]
6+
}
7+
}
8+
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends1.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../tsconfig_template_variable1.json"
3+
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends2.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../tsconfig_template_variable2.json"
3+
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends3.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../tsconfig_template_variable3.json"
3+
}

‎fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends4.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "../../tsconfig_template_variable4.json"
3+
}

‎fixtures/tsconfig/cases/project_references/app/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"path": "../project_c/tsconfig.json"
1818
},
1919
{
20-
"path": "../../paths_template_variable/tsconfig2.json"
20+
"path": "../../paths_template_variable/tsconfig.json"
2121
}
2222
]
2323
}

‎fixtures/tsconfig/cases/project_references/app/tsconfig.nopaths.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"path": "../project_c/tsconfig.json"
1515
},
1616
{
17-
"path": "../../paths_template_variable/tsconfig2.json"
17+
"path": "../../paths_template_variable/tsconfig.json"
1818
}
1919
]
2020
}

‎fixtures/tsconfig/foo.js renamed to ‎fixtures/tsconfig/src/foo.js

File renamed without changes.

‎fixtures/tsconfig/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"paths": {
4-
"ts-path": ["foo.js"]
4+
"ts-path": ["src/foo.js"]
55
}
66
}
77
}

‎fixtures/tsconfig/tsconfig_template_variable.json renamed to ‎fixtures/tsconfig/tsconfig_template_variable1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"paths": {
4-
"foo": ["${configDir}/foo.js"]
4+
"foo": ["${configDir}/src/foo.js"]
55
}
66
}
77
}

‎fixtures/tsconfig/tsconfig_template_variable2.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": "${configDir}",
4+
"paths": {
5+
"foo": ["./src/foo.js"]
6+
}
7+
}
8+
}

‎fixtures/tsconfig/tsconfig_template_variable3.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"foo": ["${configDir}/src/foo.js"]
6+
}
7+
}
8+
}

‎fixtures/tsconfig/tsconfig_template_variable4.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": "${configDir}",
4+
"paths": {
5+
"foo": ["${configDir}/src/foo.js"]
6+
}
7+
}
8+
}

‎napi/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ mimalloc-safe = { version = "0.1.50", features = ["skip_collect_on_exit", "local
2424

2525
[build-dependencies]
2626
napi-build = "2.1.6"
27-
28-
[package.metadata.cargo-machete]
29-
ignored = ["napi"]

‎npm/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"aarch64-unknown-linux-musl",
3939
"armv7-unknown-linux-gnueabihf",
4040
"armv7-unknown-linux-musleabihf",
41+
"riscv64gc-unknown-linux-gnu",
4142
"powerpc64le-unknown-linux-gnu",
4243
"s390x-unknown-linux-gnu",
4344
"x86_64-apple-darwin",

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
"test": "vitest run -r ./napi"
1717
},
1818
"devDependencies": {
19-
"@napi-rs/cli": "3.0.0-alpha.77",
19+
"@napi-rs/cli": "^3.0.0-alpha.77",
2020
"@napi-rs/wasm-runtime": "^0.2.8",
2121
"@types/node": "^22.14.0",
2222
"emnapi": "^1.4.0",
2323
"typescript": "^5.8.3",
2424
"vitest": "^3.1.1"
2525
},
26-
"packageManager": "pnpm@10.7.1"
26+
"packageManager": "pnpm@10.8.0"
2727
}

0 commit comments

Comments
 (0)