chore: debug in pr

Author: stormslowly

.github/actions/docker-build/action.yml

@@ -50,7 +50,7 @@ runs:
           echo "Corepack version: $(corepack --version)"
           corepack enable
 
-          RUST_TARGET=${{ inputs.target }} ${{ inputs.plugin == 'false' && 'DISABLE_PLUGIN=1' || '' }} pnpm build:binding:${{ inputs.profile }}
+          RUST_TARGET=${{ inputs.target }} ${{ inputs.plugin == 'false' && 'DISABLE_PLUGIN=1' || '' }} pnpm build:binding:${{ inputs.profile }}  --target ${{ inputs.target }}
           ${{ inputs.post }}
         '
         if [[ ! -n "$CARGO_HOME" ]]; then

.github/workflows/release-npm.yml

@@ -1,12 +1,17 @@
 name: Release Full
 
 on:
+  pull_request:
+    types: [opened, synchronize]
+    paths-ignore:
+      - '**/*.md'
+
   workflow_dispatch:
     inputs:
       tag:
         type: choice
         description: "Release Npm Tag"
-        required: true
+        required: false
         default: "latest"
         options:
           - canary
@@ -17,17 +22,17 @@ on:
       test:
         type: boolean
         description: "Run tests before release"
-        required: true
-        default: true
+        required: false
+        default: false
       dry_run:
         type: boolean
         description: "DryRun release"
-        required: true
+        required: false
         default: false
       push_tags:
         type: boolean
         description: "push tags to github"
-        required: true
+        required: false
         default: true
 
 permissions:
@@ -43,18 +48,29 @@ jobs:
       matrix:
         array:
           - target: x86_64-unknown-linux-gnu
+            runner: "ubuntu-22.04"
           - target: aarch64-unknown-linux-gnu
+            runner: "ubuntu-22.04"
           - target: x86_64-unknown-linux-musl
+            runner: "ubuntu-22.04"
           - target: aarch64-unknown-linux-musl
+            runner: "ubuntu-22.04"
           - target: i686-pc-windows-msvc
+            runner: "windows-latest"
           - target: x86_64-pc-windows-msvc
+            runner: "windows-latest"
           - target: aarch64-pc-windows-msvc
+            runner: "windows-latest"
           - target: x86_64-apple-darwin
+            runner: "macos-latest"
           - target: aarch64-apple-darwin
+            runner: "macos-latest"
+
     uses: ./.github/workflows/reusable-build.yml
     with:
       target: ${{ matrix.array.target }}
-      test: ${{ inputs.test }}
+      runner: ${{ matrix.array.runner }}
+      test: false
       profile: "release"
 
   release:
@@ -65,7 +81,7 @@ jobs:
       id-token: write
     runs-on: ubuntu-latest
     needs: build
-    if: ${{ github.event_name == 'workflow_dispatch' }}
+#    if: ${{ github.event_name == 'workflow_dispatch' }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -74,25 +90,30 @@ jobs:
           fetch-depth: 1
 
       - name: Pnpm Setup
-        uses: ./.github/actions/pnpm/setup
+        uses: ./.github/actions/pnpm
 
       - name: Download artifacts
         uses: actions/download-artifact@v4.1.7
         with:
           path: artifacts
 
-      - name: Build node packages
-        run: pnpm run build:js
+      - name: ls
+        run: ls -R artifacts
 
       - name: Move artifacts
-        run: node scripts/build-npm.cjs
+        run: |
+          pnpm napi create-npm-dirs --package-json-path npm/package.json --npm-dir bindings
+          pnpm napi artifacts       --package-json-path npm/package.json --npm-dir bindings --build-output-dir napi
 
       - name: Show binding packages
-        run: ls -R npm
-
-      - name: Link optional dependencies
-        run: pnpm install --no-frozen-lockfile
+        run: ls -R bindings
 
+      - name: Publish All
+        run: |
+          git status
+          cp napi/{index,browser}.js  npm
+          cp napi/index.d.ts          npm
+          pnpm publish -r --dry-run --no-git-checks
 #      - name: Release Full
 #        run: |
 #          ./x publish stable --tag ${{inputs.tag}} ${{inputs.dry_run && '--dry-run' || '--no-dry-run'}} ${{inputs.push_tags && '--push-tags' || '--no-push-tags'}}

.github/workflows/reusable-build.yml

@@ -3,13 +3,13 @@ name: Reusable Release
 on:
   workflow_call:
     inputs:
-      skipable:
-        required: false
-        type: boolean
-        default: false
       target:
         required: true
         type: string
+      runner:
+        default: "ubuntu-22.04"
+        required: false
+        type: string
       full-install:
         default: true
         required: false
@@ -41,7 +41,7 @@ permissions:
 jobs:
   build:
     name: Build
-    runs-on: ${{ fromJSON(inputs.runner) }}
+    runs-on: ${{ inputs.runner }}
     defaults:
       run:
         shell: bash
@@ -53,21 +53,18 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      - name: Clean
-        uses: ./.github/actions/clean
-        with:
-          target: ${{ inputs.target }}
-
       - name: Pnpm Setup
         uses: ./.github/actions/pnpm
 
       - uses: Boshen/setup-rust@main
         with:
+          save-cache: true
           cache-key: build-${{ inputs.target }}-${{ inputs.profile }}
 
       - name: Trim paths
         shell: bash
         run: |
+          mkdir -p .cargo
           echo $'\n' >> .cargo/config.toml
           echo '[unstable]' >> .cargo/config.toml
           echo 'trim-paths = true' >> .cargo/config.toml
@@ -129,21 +126,21 @@ jobs:
       # Windows
       - name: Build i686-pc-windows-msvc
         if: ${{ inputs.target == 'i686-pc-windows-msvc' }}
-        run: RUST_TARGET=${{ inputs.target }} DISABLE_PLUGIN=1 pnpm build:binding:${{ inputs.profile }}
+        run: RUST_TARGET=${{ inputs.target }} DISABLE_PLUGIN=1 pnpm build:binding:${{ inputs.profile }}  --target ${{ inputs.target }}
 
       - name: Build x86_64-pc-windows-msvc
         if: ${{ inputs.target == 'x86_64-pc-windows-msvc' }}
-        run: RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }}
+        run: RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} --target ${{ inputs.target }}
 
       - name: Build aarch64-pc-windows-msvc
         if: ${{ inputs.target == 'aarch64-pc-windows-msvc' }}
-        run: RUST_TARGET=${{ inputs.target }} DISABLE_PLUGIN=1 pnpm build:binding:${{ inputs.profile }}
+        run: RUST_TARGET=${{ inputs.target }} DISABLE_PLUGIN=1 pnpm build:binding:${{ inputs.profile }}  --target ${{ inputs.target }}
 
       # Mac
       - name: Build x86_64-apple-darwin
         if: ${{ inputs.target == 'x86_64-apple-darwin' }}
         run: |
-          RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }}
+          RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} --target ${{ inputs.target }}
 
       - name: Build aarch64-apple-darwin
         if: ${{ inputs.target == 'aarch64-apple-darwin' }}
@@ -153,17 +150,15 @@ jobs:
           export CXX=$(xcrun -f clang++);
           SYSROOT=$(xcrun --sdk macosx --show-sdk-path);
           export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
-          RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }}
+          RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} --target ${{ inputs.target }}
 
       - name: Upload artifact
         id: upload-artifact
         uses: ./.github/actions/artifact/upload
         if: ${{ inputs.target != 'wasm32-wasip1-threads' }}
         with:
           name: bindings-${{ inputs.target }}
-          path: crates/node_binding/*.node
-          try-local-cache: ${{ inputs.profile == 'ci' }}
-          mv-when-local: true
+          path: napi/resolver*.node
 
       # WASM
       - name: Build wasm32-wasip1-threads with linux in Docker
@@ -182,6 +177,4 @@ jobs:
         if: ${{ inputs.target == 'wasm32-wasip1-threads' }}
         with:
           name: bindings-wasm32-wasi
-          path: crates/node_binding/rspack.wasm32-wasi.wasm
-          try-local-cache: ${{ inputs.profile == 'ci' }}
-          mv-when-local: true
+          path: napi/resolver*.wasm

.gitignore

@@ -1,3 +1,5 @@
 target/
 node_modules
 fuzz/Cargo.lock
+artifacts
+bindings

fixtures/pnpm-workspace/package.json

@@ -1,5 +1,6 @@
 {
   "name": "monorepo",
+  "private": "true",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

napi/browser.js

@@ -1 +1 @@
-export * from '@oxc-resolver/binding-wasm32-wasi'
+export * from '@rspack/resolver-binding-wasm32-wasi'