Merge branch 'main' into renovate/pnpm-package-manager

Author: stormslowly

.github/actions/artifact/download/action.yml

@@ -18,7 +18,7 @@ runs:
   using: composite
   steps:
     - name: Download artifact from github
-      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
       if: ${{ inputs.force-use-github == 'true' || runner.environment == 'github-hosted' }}
       with:
         name: ${{ inputs.name }}

.github/actions/artifact/upload/action.yml

@@ -18,7 +18,7 @@ runs:
   using: composite
   steps:
     - name: Upload artifact to github
-      uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       if: ${{ inputs.force-use-github == 'true' || runner.environment == 'github-hosted' }}
       with:
         name: ${{ inputs.name }}

.github/actions/zigbuild/action.yml

@@ -0,0 +1,39 @@
+name: Zigbuild
+
+description: Build a musl target using cargo-zigbuild (avoids Docker with outdated Node.js)
+
+inputs:
+  target:
+    required: true
+    type: string
+  profile:
+    default: "release"
+    required: false
+    type: string
+  zig-version:
+    default: "0.14.1"
+    required: false
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Rust Target
+      shell: bash
+      run: rustup target add ${{ inputs.target }}
+
+    - name: Setup Zig
+      uses: mlugg/setup-zig@v2
+      with:
+        version: ${{ inputs.zig-version }}
+
+    - name: Install cargo-zigbuild
+      uses: taiki-e/install-action@v2
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        tool: cargo-zigbuild
+
+    - name: Build ${{ inputs.target }}
+      shell: bash
+      run: RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} --target ${{ inputs.target }} -x

.github/workflows/codecov.yml

@@ -38,7 +38,7 @@ jobs:
           RUST_MIN_STACK: 8388608
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: codecov
           path: lcov.info
@@ -58,7 +58,7 @@ jobs:
 
       - name: Download coverage file
         if: env.CODECOV_TOKEN
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: codecov
 

.github/workflows/release-npm.yml

@@ -95,7 +95,7 @@ jobs:
         uses: ./.github/actions/pnpm
 
       - name: Download artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           path: artifacts
 

.github/workflows/reusable-build.yml

@@ -89,30 +89,21 @@ jobs:
           pre: |
             export CC_aarch64_unknown_linux_gnu=clang
 
-      - name: Build x86_64-unknown-linux-musl in Docker
+      - name: Build x86_64-unknown-linux-musl with zigbuild
         if: ${{ inputs.target == 'x86_64-unknown-linux-musl' }}
-        uses: ./.github/actions/docker-build
+        uses: ./.github/actions/zigbuild
         with:
           target: ${{ inputs.target }}
-          image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
           profile: ${{ inputs.profile }}
-          pre: |
-            # musl will enable clang-sys static linking
-            # https://github.com/KyleMayes/clang-sys?tab=readme-ov-file#static
 
-      - name: Build aarch64-unknown-linux-musl in Docker
+      - name: Build aarch64-unknown-linux-musl with zigbuild
         if: ${{ inputs.target == 'aarch64-unknown-linux-musl' }}
-        uses: ./.github/actions/docker-build
+        uses: ./.github/actions/zigbuild
         with:
           target: ${{ inputs.target }}
-          image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
           profile: ${{ inputs.profile }}
-          pre: |
-            export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-gcc
-            # musl will enable clang-sys static linking
-            # https://github.com/KyleMayes/clang-sys?tab=readme-ov-file#static
 
-      # setup rust target for native runner
+      # setup rust target for native runner (non-linux)
       - name: Setup Rust Target
         if: ${{ !contains(inputs.target, 'linux') }}
         run: rustup target add ${{ inputs.target }}

Cargo.lock

@@ -15,7 +15,7 @@ name         = "rspack_resolver"
 readme       = "README.md"
 repository   = "https://github.com/rstackjs/rspack-resolver"
 rust-version = "1.70"
-version      = "0.6.7"
+version      = "0.6.8"
 
 [lib]
 doctest = false

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/resolver",
-  "version": "0.2.6",
+  "version": "0.2.8-alpha.0",
   "description": "Rspack Resolver Node API",
   "main": "index.js",
   "browser": "browser.js",

npm/package.json

@@ -43,6 +43,20 @@ const UniArchsByPlatform = {
  *   - `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
  */
 function parseTriple(rawTriple) {
+  if (
+    rawTriple === "wasm32-wasi" ||
+    rawTriple === "wasm32-wasi-preview1-threads" ||
+    rawTriple.startsWith("wasm32-wasip")
+  ) {
+    return {
+      raw: rawTriple,
+      platformArchABI: "wasm32-wasi",
+      platform: "wasi",
+      arch: "wasm32",
+      abi: "wasi"
+    };
+  }
+
   const triple = rawTriple.endsWith("eabi")
     ? `${rawTriple.slice(0, -4)}-eabi`
     : rawTriple;