Merge remote-tracking branch 'upstream/main' into chore/merge_upstream

JounQin · JounQin · commit 09b426bd8701 · 2025-04-11T19:48:49.000+08:00
diff --git a/.github/workflows/release-napi.yml b/.github/workflows/release-napi.yml
@@ -82,6 +82,14 @@ jobs:
           - os: ubuntu-latest
             target: powerpc64le-unknown-linux-gnu
             build: pnpm build --use-napi-cross
+          - os: ubuntu-latest
+            target: riscv64gc-unknown-linux-gnu
+            build: |
+              sudo apt-get update &&
+              sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu -y &&
+              export CC=riscv64-linux-gnu-gcc &&
+              export CXX=riscv64-linux-gnu-g++ &&
+              pnpm build
           - os: ubuntu-latest
             target: s390x-unknown-linux-gnu
             build: export CFLAGS="-fuse-ld=lld" && pnpm build --use-napi-cross
@@ -126,11 +134,11 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
+          if-no-files-found: error
           name: bindings-${{ matrix.target }}
           path: |
             napi/*.node
             napi/*.wasm
-          if-no-files-found: error
 
   build-freebsd:
     needs: check
diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Run release-plz
         id: release-plz
-        uses: MarcoIeni/release-plz-action@245a2a85f1ebdb6a7dd33c813443793e33f08544 # v0.5
+        uses: MarcoIeni/release-plz-action@245a2a85f1ebdb6a7dd33c813443793e33f08544 # v0.5.103
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [package]
 name = "unrs_resolver"
 version = "1.4.1"
-authors = ["UnRS"]
+authors = ["JounQin <admin@1stg.me> (https://www.1stG.me)"]
 categories = ["development-tools"]
 edition = "2024"
 homepage = "https://github.com/unrs/unrs-resolver"
diff --git a/fixtures/pnp/package.json b/fixtures/pnp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pnp",
-  "packageManager": "yarn@4.8.1",
+  "packageManager": "yarn@4.9.1",
   "dependencies": {
     "beachball": "^2.52.0",
     "is-even": "^1.0.0",
diff --git a/fixtures/pnpm-workspace/package.json b/fixtures/pnpm-workspace/package.json
@@ -8,6 +8,6 @@
   "license": "MIT",
   "dependencies": {
     "enhanced-resolve": "^5.18.1",
-    "oxc-resolver": "^5.0.0"
+    "unrs-resolver": "workspace:*"
   }
 }
diff --git a/fixtures/tsconfig/cases/extends-paths/tsconfig.base.json b/fixtures/tsconfig/cases/extends-paths/tsconfig.base.json
@@ -1,7 +1,7 @@
 {
-	"compilerOptions": {
-		"paths": {
-			"@/*": ["./*"]
-		}
-	}
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
 }
diff --git a/fixtures/tsconfig/cases/extends-paths/tsconfig.json b/fixtures/tsconfig/cases/extends-paths/tsconfig.json
@@ -1,6 +1,6 @@
 {
-  "extends":	"./tsconfig.base.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": "src",
-  },
+    "baseUrl": "src"
+  }
 }
diff --git a/fixtures/tsconfig/cases/paths_template_variable/src/foo.js b/fixtures/tsconfig/cases/paths_template_variable/src/foo.js
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "paths": {
-      "foo": ["${configDir}/foo.js"]
+      "foo": ["${configDir}/src/foo.js"]
     }
   }
 }
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig1.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig1.json
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url1.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url1.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "${configDir}",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
+}
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url2.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_base_url2.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "${configDir}/",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
+}
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends1.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends1.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig_template_variable1.json"
+}
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends2.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends2.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig_template_variable2.json"
+}
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends3.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends3.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig_template_variable3.json"
+}
diff --git a/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends4.json b/fixtures/tsconfig/cases/paths_template_variable/tsconfig_extends4.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig_template_variable4.json"
+}
diff --git a/fixtures/tsconfig/cases/project_references/app/tsconfig.json b/fixtures/tsconfig/cases/project_references/app/tsconfig.json
@@ -17,7 +17,7 @@
       "path": "../project_c/tsconfig.json"
     },
     {
-      "path": "../../paths_template_variable/tsconfig2.json"
+      "path": "../../paths_template_variable/tsconfig.json"
     }
   ]
 }
diff --git a/fixtures/tsconfig/cases/project_references/app/tsconfig.nopaths.json b/fixtures/tsconfig/cases/project_references/app/tsconfig.nopaths.json
@@ -14,7 +14,7 @@
       "path": "../project_c/tsconfig.json"
     },
     {
-      "path": "../../paths_template_variable/tsconfig2.json"
+      "path": "../../paths_template_variable/tsconfig.json"
     }
   ]
 }
diff --git a/fixtures/tsconfig/src/foo.js b/fixtures/tsconfig/src/foo.js
diff --git a/fixtures/tsconfig/tsconfig.json b/fixtures/tsconfig/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "paths": {
-      "ts-path": ["foo.js"]
+      "ts-path": ["src/foo.js"]
     }
   }
 }
diff --git a/fixtures/tsconfig/tsconfig_template_variable1.json b/fixtures/tsconfig/tsconfig_template_variable1.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "paths": {
-      "foo": ["${configDir}/foo.js"]
+      "foo": ["${configDir}/src/foo.js"]
     }
   }
 }
diff --git a/fixtures/tsconfig/tsconfig_template_variable2.json b/fixtures/tsconfig/tsconfig_template_variable2.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "${configDir}",
+    "paths": {
+      "foo": ["./src/foo.js"]
+    }
+  }
+}
diff --git a/fixtures/tsconfig/tsconfig_template_variable3.json b/fixtures/tsconfig/tsconfig_template_variable3.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "foo": ["${configDir}/src/foo.js"]
+    }
+  }
+}
diff --git a/fixtures/tsconfig/tsconfig_template_variable4.json b/fixtures/tsconfig/tsconfig_template_variable4.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": "${configDir}",
+    "paths": {
+      "foo": ["${configDir}/src/foo.js"]
+    }
+  }
+}
diff --git a/napi/Cargo.toml b/napi/Cargo.toml
@@ -24,6 +24,3 @@ mimalloc-safe = { version = "0.1.50", features = ["skip_collect_on_exit", "local
 
 [build-dependencies]
 napi-build = "2.1.6"
-
-[package.metadata.cargo-machete]
-ignored = ["napi"]
diff --git a/npm/package.json b/npm/package.json
@@ -39,6 +39,7 @@
       "armv7-unknown-linux-gnueabihf",
       "armv7-unknown-linux-musleabihf",
       "powerpc64le-unknown-linux-gnu",
+      "riscv64gc-unknown-linux-gnu",
       "s390x-unknown-linux-gnu",
       "x86_64-apple-darwin",
       "aarch64-apple-darwin",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/fs_cache.rs b/src/fs_cache.rs
diff --git a/src/tests/tsconfig_paths.rs b/src/tests/tsconfig_paths.rs
diff --git a/src/tests/tsconfig_project_references.rs b/src/tests/tsconfig_project_references.rs
diff --git a/src/tsconfig.rs b/src/tsconfig.rs
diff --git a/src/tsconfig_serde.rs b/src/tsconfig_serde.rs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pnp",`
`3`		`- "packageManager": "yarn@4.8.1",`
	`3`	`+ "packageManager": "yarn@4.9.1",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"beachball": "^2.52.0",`
`6`	`6`	`"is-even": "^1.0.0",`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`"license": "MIT",`
`9`	`9`	`"dependencies": {`
`10`	`10`	`"enhanced-resolve": "^5.18.1",`
`11`		`- "oxc-resolver": "^5.0.0"`
	`11`	`+ "unrs-resolver": "workspace:*"`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "compilerOptions": {`
`3`		`- "paths": {`
`4`		`- "@/": ["./"]`
`5`		`- }`
`6`		`- }`
	`2`	`+ "compilerOptions": {`
	`3`	`+ "paths": {`
	`4`	`+ "@/": ["./"]`
	`5`	`+ }`
	`6`	`+ }`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "extends": "./tsconfig.base.json",`
	`2`	`+ "extends": "./tsconfig.base.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "baseUrl": "src",`
`5`		`- },`
	`4`	`+ "baseUrl": "src"`
	`5`	`+ }`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"composite": true,`
`4`	`4`	`"paths": {`
`5`		`- "foo": ["${configDir}/foo.js"]`
	`5`	`+ "foo": ["${configDir}/src/foo.js"]`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`