@napi-rs/cli 3.0.0-alpha.8 → 3.0.0-alpha.80

package/src/api/templates/ci-template.ts

@@ -1,4 +1,14 @@
-export const YAML = () => `
+import type { SupportedPackageManager } from '../../utils/config.js'
+
+export type WasiTargetName =
+  | 'wasm32-wasi-preview1-threads'
+  | 'wasm32-wasip1-threads'
+  | 'wasm32-wasip2'
+
+export const YAML = (
+  packageManager: SupportedPackageManager,
+  wasiTargetName: WasiTargetName,
+) => `
 name: CI
 
 env:
@@ -32,82 +42,68 @@ jobs:
         settings:
           - host: macos-latest
             target: 'x86_64-apple-darwin'
-            build: |
-              yarn build --platform
-              strip -x *.node
+            build: ${packageManager} build --platform --target x86_64-apple-darwin
           - host: windows-latest
-            build: yarn build --platform
+            build: ${packageManager} build --platform
             target: 'x86_64-pc-windows-msvc'
           - host: windows-latest
             build: |
-              yarn build --platform --target i686-pc-windows-msvc
-              yarn test
+              ${packageManager} build --platform --target i686-pc-windows-msvc
+              ${packageManager} test
             target: 'i686-pc-windows-msvc'
           - host: ubuntu-latest
             target: 'x86_64-unknown-linux-gnu'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
-            build: >-
-              set -e &&\n
-              yarn build --platform --target x86_64-unknown-linux-gnu &&\n
-              strip *.node
+            build: ${packageManager} build --platform --target x86_64-unknown-linux-gnu --use-napi-cross
           - host: ubuntu-latest
             target: 'x86_64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-            build: >-
-              set -e &&
-              yarn build --platform &&
-              strip *.node
+            build: ${packageManager} build --platform --target x86_64-unknown-linux-musl -x
           - host: macos-latest
             target: 'aarch64-apple-darwin'
-            build: |
-              yarn build --platform --target aarch64-apple-darwin
-              strip -x *.node
+            build: ${packageManager} build --platform --target aarch64-apple-darwin
           - host: ubuntu-latest
             target: 'aarch64-unknown-linux-gnu'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
-            build: >-
-              set -e &&\n
-              yarn build --platform --target aarch64-unknown-linux-gnu &&\n
-              aarch64-unknown-linux-gnu-strip *.node
+            build: ${packageManager} build --platform --target aarch64-unknown-linux-gnu --use-napi-cross
           - host: ubuntu-latest
             target: 'armv7-unknown-linux-gnueabihf'
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-arm-linux-gnueabihf -y
-            build: |
-              yarn build --platform --target armv7-unknown-linux-gnueabihf --cross-compile
-              arm-linux-gnueabihf-strip *.node
+            build: ${packageManager} build --platform --target armv7-unknown-linux-gnueabihf --use-napi-cross
+          - host: ubuntu-latest
+            target: 'armv7-unknown-linux-musleabihf'
+            build: ${packageManager} build --platform --target armv7-unknown-linux-musleabihf -x
           - host: ubuntu-latest
             target: 'aarch64-linux-android'
-            build: |
-              yarn build --platform --target aarch64-linux-android
-              \${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
+            build: ${packageManager} build --platform --target aarch64-linux-android
           - host: ubuntu-latest
             target: 'armv7-linux-androideabi'
-            build: |
-              yarn build --platform --target armv7-linux-androideabi
-              \${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip *.node
+            build: ${packageManager} build --platform --target armv7-linux-androideabi
           - host: ubuntu-latest
             target: 'aarch64-unknown-linux-musl'
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
-            build: >-
-              set -e &&\n
-              rustup target add aarch64-unknown-linux-musl &&\n
-              yarn build --platform --target aarch64-unknown-linux-musl &&\n
-              /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
+            build: ${packageManager} build --platform --target aarch64-unknown-linux-musl -x
           - host: windows-latest
             target: 'aarch64-pc-windows-msvc'
-            build: yarn build --platform --target aarch64-pc-windows-msvc
+            build: ${packageManager} build --platform --target aarch64-pc-windows-msvc
           - host: ubuntu-latest
             target: 'riscv64gc-unknown-linux-gnu'
             setup: |
               sudo apt-get update
               sudo apt-get install gcc-riscv64-linux-gnu -y
-            build: |
-              yarn build --platform --target riscv64gc-unknown-linux-gnu
-              riscv64-linux-gnu-strip *.node
+            build: ${packageManager} build --platform --target riscv64gc-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: 'powerpc64le-unknown-linux-gnu'
+            setup: |
+              sudo apt-get update
+              sudo apt-get install gcc-powerpc64le-linux-gnu -y
+            build: ${packageManager} build --platform --target powerpc64le-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: 's390x-unknown-linux-gnu'
+            setup: |
+              sudo apt-get update
+              sudo apt-get install gcc-s390x-linux-gnu -y
+            build: ${packageManager} build --platform --target s390x-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: '${wasiTargetName}'
+            build: ${packageManager} build --platform --target ${wasiTargetName}
 
-    name: stable - \${{ matrix.settings.target }} - node@18
+    name: stable - \${{ matrix.settings.target }} - node@20
     runs-on: \${{ matrix.settings.host }}
 
     steps:
@@ -115,33 +111,40 @@ jobs:
 
       - name: Setup node
         uses: actions/setup-node@v4
-        if: \${{ !matrix.settings.docker }}
         with:
-          node-version: 18
-          cache: yarn
+          node-version: 20
+          cache: ${packageManager}
 
       - name: Install
         uses: dtolnay/rust-toolchain@stable
-        if: \${{ !matrix.settings.docker }}
         with:
           toolchain: stable
           targets: \${{ matrix.settings.target }}
 
       - name: Cache cargo
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
+            ~/.napi-rs
             .cargo-cache
             target/
           key: \${{ matrix.settings.target }}-cargo-\${{ matrix.settings.host }}
 
       - uses: goto-bus-stop/setup-zig@v2
-        if: \${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
+        if: \${{ contains(matrix.settings.target, 'musl') }}
+        with:
+          version: 0.13.0
+
+      - name: Install cargo-zigbuild
+        uses: taiki-e/install-action@v2
+        if: \${{ contains(matrix.settings.target, 'musl') }}
+        env:
+          GITHUB_TOKEN: \${{ github.token }}
         with:
-          version: 0.11.0
+          tool: cargo-zigbuild
 
       - name: Setup toolchain
         run: \${{ matrix.settings.setup }}
@@ -154,57 +157,56 @@ jobs:
         shell: bash
 
       - name: 'Install dependencies'
-        run: yarn install
+        run: ${packageManager} install
 
       - name: Setup node x86
         uses: actions/setup-node@v4
         if: matrix.settings.target == 'i686-pc-windows-msvc'
         with:
-          node-version: 18
-          cache: yarn
+          node-version: 20
           architecture: x86
 
-      - name: Build in docker
-        uses: addnab/docker-run-action@v3
-        if: \${{ matrix.settings.docker }}
-        with:
-          image: \${{ matrix.settings.docker }}
-          options: --user 0:0 -v \${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v \${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v \${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v \${{ github.workspace }}:/build -w /build
-          run: \${{ matrix.settings.build }}
-
       - name: 'Build'
         run: \${{ matrix.settings.build }}
-        if: \${{ !matrix.settings.docker }}
         shell: bash
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        if: matrix.settings.target != '${wasiTargetName}'
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: "*.node"
           if-no-files-found: error
 
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        if: matrix.settings.target == '${wasiTargetName}'
+        with:
+          name: bindings-\${{ matrix.settings.target }}
+          path: "*.wasm"
+          if-no-files-found: error
+
   build-freebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     name: Build FreeBSD
     steps:
       - uses: actions/checkout@v4
       - name: Build
         id: build
-        uses: cross-platform-actions/action@v0.21.0
+        uses: cross-platform-actions/action@v0.25.0
         env:
           DEBUG: 'napi:*'
           RUSTUP_IO_THREADS: 1
         with:
           operating_system: freebsd
-          version: '13.2'
-          memory: 13G
+          version: '14.1'
+          memory: 8G
           cpu_count: 3
           environment_variables: 'DEBUG RUSTUP_IO_THREADS'
           shell: bash
-          prepare: |
+          run: |
             sudo pkg install -y -f curl node libnghttp2 npm
-            sudo npm install -g yarn --ignore-scripts
+            sudo npm install -g ${packageManager} --ignore-scripts
             curl https://sh.rustup.rs -sSf --output rustup.sh
             sh rustup.sh -y --profile minimal --default-toolchain stable
             source "$HOME/.cargo/env"
@@ -219,15 +221,15 @@ jobs:
             whoami
             env
             freebsd-version
-            yarn install
-            yarn build
+            ${packageManager} install
+            ${packageManager} build
             strip -x *.node
             yarn test
             rm -rf node_modules
             rm -rf target
             rm -rf .yarn/cache
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-freebsd
           path: "*.node"
@@ -243,9 +245,13 @@ jobs:
         settings:
           - host: macos-latest
             target: 'x86_64-apple-darwin'
+            architecture: x64
+          - host: macos-latest
+            target: 'aarch64-apple-darwin'
+            architecture: arm64
           - host: windows-latest
             target: 'x86_64-pc-windows-msvc'
-        node: ['16', '18']
+            architecture: x64
         node: ['18', '20']
     runs-on: \${{ matrix.settings.host }}
 
@@ -256,13 +262,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: \${{ matrix.node }}
-          cache: 'yarn'
+          cache: '${packageManager}'
+          architecture: \${{ matrix.settings.architecture }}
 
       - name: 'Install dependencies'
-        run: yarn install
+        run: ${packageManager} install
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: .
@@ -272,7 +279,7 @@ jobs:
         shell: bash
 
       - name: Test bindings
-        run: yarn test
+        run: ${packageManager} run test
 
   test-linux-x64-gnu-binding:
     name: Test bindings on Linux-x64-gnu - node@\${{ matrix.node }}
@@ -281,7 +288,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
         node: ['18', '20']
     runs-on: ubuntu-latest
 
@@ -292,13 +298,13 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: \${{ matrix.node }}
-          cache: 'yarn'
+          cache: '${packageManager}'
 
       - name: 'Install dependencies'
-        run: yarn install
+        run: ${packageManager} install
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-x86_64-unknown-linux-gnu
           path: .
@@ -308,7 +314,7 @@ jobs:
         shell: bash
 
       - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build node:\${{ matrix.node }}-slim yarn test
+        run: docker run --rm -v $(pwd):/build -w /build node:\${{ matrix.node }}-slim ${packageManager} run test
 
   test-linux-x64-musl-binding:
     name: Test bindings on x86_64-unknown-linux-musl - node@\${{ matrix.node }}
@@ -317,7 +323,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
         node: ['18', '20']
     runs-on: ubuntu-latest
 
@@ -328,15 +333,15 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: \${{ matrix.node }}
-          cache: 'yarn'
+          cache: '${packageManager}'
 
       - name: 'Install dependencies'
         run: |
           yarn config set supportedArchitectures.libc "musl"
-          yarn install
+          ${packageManager} install
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-x86_64-unknown-linux-musl
           path: .
@@ -346,7 +351,7 @@ jobs:
         shell: bash
 
       - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build node:\${{ matrix.node }}-alpine yarn test
+        run: docker run --rm -v $(pwd):/build -w /build node:\${{ matrix.node }}-alpine ${packageManager} run test
 
   test-linux-aarch64-gnu-binding:
     name: Test bindings on aarch64-unknown-linux-gnu - node@\${{ matrix.node }}
@@ -355,15 +360,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
-        node: ['18', '20']
+        node: ['20']
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-aarch64-unknown-linux-gnu
           path: .
@@ -376,7 +380,7 @@ jobs:
         run: |
           yarn config set supportedArchitectures.cpu "arm64"
           yarn config set supportedArchitectures.libc "glibc"
-          yarn install
+          ${packageManager} install
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -389,10 +393,7 @@ jobs:
         with:
           image: node:\${{ matrix.node }}-slim
           options: --platform linux/arm64 -v \${{ github.workspace }}:/build -w /build
-          run: |
-            set -e
-            yarn test
-            ls -la
+          run: ${packageManager} run test
 
   test-linux-aarch64-musl-binding:
     name: Test bindings on aarch64-unknown-linux-musl - node@\${{ matrix.node }}
@@ -401,7 +402,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
+        node: ['18', '20']
 
     runs-on: ubuntu-latest
 
@@ -409,7 +410,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-aarch64-unknown-linux-musl
           path: .
@@ -422,7 +423,7 @@ jobs:
         run: |
           yarn config set supportedArchitectures.cpu "arm64"
           yarn config set supportedArchitectures.libc "musl"
-          yarn install
+          ${packageManager} install
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -435,9 +436,7 @@ jobs:
         with:
           image: node:\${{ matrix.node }}-alpine
           options: --platform linux/arm64 -v \${{ github.workspace }}:/build -w /build
-          run: |
-            set -e
-            yarn test
+          run: ${packageManager} run test
 
   test-linux-arm-gnueabihf-binding:
     name: Test bindings on armv7-unknown-linux-gnueabihf - node@\${{ matrix.node }}
@@ -446,7 +445,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
         node: ['18', '20']
     runs-on: ubuntu-latest
 
@@ -454,7 +452,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-armv7-unknown-linux-gnueabihf
           path: .
@@ -466,7 +464,7 @@ jobs:
       - name: Install dependencies
         run: |
           yarn config set supportedArchitectures.cpu "arm"
-          yarn install
+          ${packageManager} install
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -479,10 +477,7 @@ jobs:
         with:
           image: node:\${{ matrix.node }}-bullseye-slim
           options: --platform linux/arm/v7 -v \${{ github.workspace }}:/build -w /build
-          run: |
-            set -e
-            yarn test
-            ls -la
+          run: ${packageManager} test
 
   universal-macOS:
     name: Build universal macOS binary
@@ -496,33 +491,62 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
-          cache: yarn
+          node-version: 20
+          cache: ${packageManager}
 
       - name: 'Install dependencies'
-        run: yarn install
+        run: ${packageManager} install
 
       - name: Download macOS x64 artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-x86_64-apple-darwin
           path: .
       - name: Download macOS arm64 artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bindings-aarch64-apple-darwin
           path: .
 
       - name: Combine binaries
-        run: yarn napi universalize
+        run: ${packageManager} napi universalize
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-universal-apple-darwin
           path: "*.node"
           if-no-files-found: error
 
+  test-wasi-nodejs:
+    name: Test bindings on wasi - node@\${{ matrix.node }}
+    needs:
+      - build
+    strategy:
+      fail-fast: false
+      matrix:
+        node: ['18', '20']
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: bindings-${wasiTargetName}
+          path: .
+      - name: List packages
+        run: ls -R .
+      - uses: actions/setup-node@v4
+        with:
+          node-version: \${{ matrix.node }}
+          cache: ${packageManager}
+      - name: 'Install dependencies'
+        run: ${packageManager} install
+      - name: Test
+        run: ${packageManager} test
+        env:
+          NAPI_RS_FORCE_WASI: true
+
   publish:
     name: Publish
     runs-on: ubuntu-latest
@@ -533,6 +557,7 @@ jobs:
       - test-linux-arm-gnueabihf-binding
       - test-macOS-windows-binding
       - test-linux-aarch64-musl-binding
+      - test-wasi-nodejs
       - build-freebsd
 
     steps:
@@ -541,20 +566,20 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
-          cache: 'yarn'
+          node-version: 20
+          cache: '${packageManager}'
           registry-url: 'https://registry.npmjs.org'
 
       - name: 'Install dependencies'
-        run: yarn install
+        run: ${packageManager} install
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
       - name: Move artifacts
-        run: yarn artifacts
+        run: ${packageManager} artifacts
 
       - name: List packages
         run: ls -R ./npm

package/src/api/templates/ci.yml.ts

@@ -2,11 +2,12 @@ import { load, dump } from 'js-yaml'
 
 import {
   NodeArchToCpu,
+  type SupportedPackageManager,
   UniArchsByPlatform,
   parseTriple,
 } from '../../utils/index.js'
 
-import { YAML } from './ci-template.js'
+import { type WasiTargetName, YAML } from './ci-template.js'
 
 const BUILD_FREEBSD = 'build-freebsd'
 const TEST_MACOS_WINDOWS = 'test-macOS-windows-binding'
@@ -15,9 +16,14 @@ const TEST_LINUX_X64_MUSL = 'test-linux-x64-musl-binding'
 const TEST_LINUX_AARCH64_GNU = 'test-linux-aarch64-gnu-binding'
 const TEST_LINUX_AARCH64_MUSL = 'test-linux-aarch64-musl-binding'
 const TEST_LINUX_ARM_GNUEABIHF = 'test-linux-arm-gnueabihf-binding'
+const TEST_WASI = 'test-wasi-nodejs'
 const UNIVERSAL_MACOS = 'universal-macOS'
 
-export const createGithubActionsCIYml = (targets: string[]) => {
+export const createGithubActionsCIYml = (
+  targets: string[],
+  packageManager: SupportedPackageManager,
+  wasiTargetName: WasiTargetName,
+) => {
   const allTargets = new Set(
     targets.flatMap((t) => {
       const platform = parseTriple(t)
@@ -31,7 +37,7 @@ export const createGithubActionsCIYml = (targets: string[]) => {
     }),
   )
 
-  const fullTemplate = load(YAML()) as any
+  const fullTemplate = load(YAML(packageManager, wasiTargetName)) as any
 
   const requiredSteps = []
   const enableWindowsX86 = allTargets.has('x86_64-pc-windows-msvc')
@@ -43,6 +49,10 @@ export const createGithubActionsCIYml = (targets: string[]) => {
   const enableLinuxArm7 = allTargets.has('armv7-unknown-linux-gnueabihf')
   const enableFreeBSD = allTargets.has('x86_64-unknown-freebsd')
   const enableMacOSUni = allTargets.has('universal-apple-darwin')
+  const enableWasi =
+    allTargets.has('wasm32-wasi-preview1-threads') ||
+    allTargets.has('wasm32-wasip1-threads') ||
+    allTargets.has('wasm32-wasip2')
   fullTemplate.jobs.build.strategy.matrix.settings =
     fullTemplate.jobs.build.strategy.matrix.settings.filter(
       ({ target }: { target: string }) => allTargets.has(target),
@@ -111,9 +121,20 @@ export const createGithubActionsCIYml = (targets: string[]) => {
     requiredSteps.push(UNIVERSAL_MACOS)
   }
 
+  if (!enableWasi) {
+    delete fullTemplate.jobs[TEST_WASI]
+  } else {
+    requiredSteps.push(TEST_WASI)
+  }
+
   fullTemplate.jobs.publish.needs = requiredSteps
 
-  return dump(fullTemplate, {
-    lineWidth: 1000,
-  })
+  try {
+    return dump(fullTemplate, {
+      lineWidth: 1000,
+    })
+  } catch (err) {
+    console.info(fullTemplate)
+    throw err
+  }
 }