@napi-rs/cli 3.0.0-alpha.44 → 3.0.0-alpha.46

package/dist/index.cjs

@@ -6453,7 +6453,7 @@ var require_dist_node2 = __commonJS({
     });
     module2.exports = __toCommonJS2(dist_src_exports);
     var import_universal_user_agent = require_dist_node();
-    var VERSION = "9.0.4";
+    var VERSION = "9.0.5";
     var userAgent = `octokit-endpoint.js/${VERSION} ${(0, import_universal_user_agent.getUserAgent)()}`;
     var DEFAULTS = {
       method: "GET",
@@ -6986,7 +6986,7 @@ var require_dist_node5 = __commonJS({
     module2.exports = __toCommonJS2(dist_src_exports);
     var import_endpoint = require_dist_node2();
     var import_universal_user_agent = require_dist_node();
-    var VERSION = "8.2.0";
+    var VERSION = "8.3.1";
     function isPlainObject2(value) {
       if (typeof value !== "object" || value === null)
         return false;
@@ -7197,7 +7197,7 @@ var require_dist_node6 = __commonJS({
     module2.exports = __toCommonJS2(dist_src_exports);
     var import_request3 = require_dist_node5();
     var import_universal_user_agent = require_dist_node();
-    var VERSION = "7.0.2";
+    var VERSION = "7.1.0";
     var import_request2 = require_dist_node5();
     var import_request = require_dist_node5();
     function _buildMessageForResponseErrors(data) {
@@ -7407,7 +7407,7 @@ var require_dist_node8 = __commonJS({
     var import_request = require_dist_node5();
     var import_graphql = require_dist_node6();
     var import_auth_token = require_dist_node7();
-    var VERSION = "5.1.0";
+    var VERSION = "5.2.0";
     var noop = () => {
     };
     var consoleWarn = console.warn.bind(console);
@@ -7991,7 +7991,7 @@ var require_dist_node11 = __commonJS({
       restEndpointMethods: () => restEndpointMethods
     });
     module2.exports = __toCommonJS2(dist_src_exports);
-    var VERSION = "10.4.0";
+    var VERSION = "10.4.1";
     var Endpoints = {
       actions: {
         addCustomLabelsToSelfHostedRunnerForOrg: [
@@ -10150,7 +10150,7 @@ var require_dist_node12 = __commonJS({
     var import_plugin_request_log = require_dist_node9();
     var import_plugin_paginate_rest = require_dist_node10();
     var import_plugin_rest_endpoint_methods = require_dist_node11();
-    var VERSION = "20.0.2";
+    var VERSION = "20.1.0";
     var Octokit2 = import_core.Octokit.plugin(
       import_plugin_request_log.requestLog,
       import_plugin_rest_endpoint_methods.legacyRestEndpointMethods,
@@ -10399,9 +10399,12 @@ var AVAILABLE_TARGETS = [
   "x86_64-unknown-freebsd",
   "i686-pc-windows-msvc",
   "armv7-unknown-linux-gnueabihf",
+  "armv7-unknown-linux-musleabihf",
   "armv7-linux-androideabi",
   "universal-apple-darwin",
   "riscv64gc-unknown-linux-gnu",
+  "powerpc64le-unknown-linux-gnu",
+  "s390x-unknown-linux-gnu",
   "wasm32-wasi-preview1-threads"
 ];
 var DEFAULT_TARGETS = [
@@ -10412,21 +10415,25 @@ var DEFAULT_TARGETS = [
 ];
 var TARGET_LINKER = {
   "aarch64-unknown-linux-musl": "aarch64-linux-musl-gcc",
-  "riscv64gc-unknown-linux-gnu": "riscv64-linux-gnu-gcc"
+  "riscv64gc-unknown-linux-gnu": "riscv64-linux-gnu-gcc",
+  "powerpc64le-unknown-linux-gnu": "powerpc64le-linux-gnu-gcc",
+  "s390x-unknown-linux-gnu": "s390x-linux-gnu-gcc"
 };
 var CpuToNodeArch = {
   x86_64: "x64",
   aarch64: "arm64",
   i686: "ia32",
   armv7: "arm",
-  riscv64gc: "riscv64"
+  riscv64gc: "riscv64",
+  powerpc64le: "ppc64"
 };
 var NodeArchToCpu = {
   x64: "x86_64",
   arm64: "aarch64",
   ia32: "i686",
   arm: "armv7",
-  riscv64: "riscv64gc"
+  riscv64: "riscv64gc",
+  ppc64: "powerpc64le"
 };
 var SysToNodePlatform = {
   linux: "linux",
@@ -10438,7 +10445,7 @@ var UniArchsByPlatform = {
   darwin: ["x64", "arm64"]
 };
 function parseTriple(rawTriple) {
-  if (rawTriple === "wasm32-wasi-preview1-threads") {
+  if (rawTriple === "wasm32-wasi-preview1-threads" || rawTriple.startsWith("wasm32-wasip")) {
     return {
       triple: rawTriple,
       platformArchABI: "wasm32-wasi",
@@ -16181,7 +16188,7 @@ var safeLoadAll = renamed("safeLoadAll", "loadAll");
 var safeDump = renamed("safeDump", "dump");
 
 // dist/api/templates/ci-template.js
-var YAML = (packageManager) => `
+var YAML = (packageManager, wasiTargetName) => `
 name: CI
 
 env:
@@ -16239,6 +16246,9 @@ jobs:
           - host: ubuntu-latest
             target: 'armv7-unknown-linux-gnueabihf'
             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: ${packageManager} build --platform --target aarch64-linux-android
@@ -16257,9 +16267,23 @@ jobs:
               sudo apt-get update
               sudo apt-get install gcc-riscv64-linux-gnu -y
             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: 'wasm32-wasi-preview1-threads'
             build: ${packageManager} build --platform --target wasm32-wasi-preview1-threads
+            target: '${wasiTargetName}'
+            build: ${packageManager} build --platform --target ${wasiTargetName}
 
     name: stable - \${{ matrix.settings.target }} - node@20
     runs-on: \${{ matrix.settings.host }}
@@ -16322,7 +16346,7 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
-        if: matrix.settings.target != 'wasm32-wasi-preview1-threads'
+        if: matrix.settings.target != '${wasiTargetName}'
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: "*.node"
@@ -16330,7 +16354,7 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
-        if: matrix.settings.target == 'wasm32-wasi-preview1-threads'
+        if: matrix.settings.target == '${wasiTargetName}'
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: "*.wasm"
@@ -16343,7 +16367,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build
         id: build
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@v0.23.0
         timeout-minutes: 30
         env:
           DEBUG: 'napi:*'
@@ -16677,7 +16701,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: bindings-wasm32-wasi-preview1-threads
+          name: bindings-${wasiTargetName}
           path: .
       - name: List packages
         run: ls -R .
@@ -16756,7 +16780,7 @@ var TEST_LINUX_AARCH64_MUSL = "test-linux-aarch64-musl-binding";
 var TEST_LINUX_ARM_GNUEABIHF = "test-linux-arm-gnueabihf-binding";
 var TEST_WASI = "test-wasi-nodejs";
 var UNIVERSAL_MACOS = "universal-macOS";
-var createGithubActionsCIYml = (targets, packageManager) => {
+var createGithubActionsCIYml = (targets, packageManager, wasiTargetName) => {
   const allTargets = new Set(targets.flatMap((t) => {
     const platform2 = parseTriple(t);
     if (platform2.arch === "universal") {
@@ -16765,7 +16789,7 @@ var createGithubActionsCIYml = (targets, packageManager) => {
     }
     return [t];
   }));
-  const fullTemplate = load(YAML(packageManager));
+  const fullTemplate = load(YAML(packageManager, wasiTargetName));
   const requiredSteps = [];
   const enableWindowsX86 = allTargets.has("x86_64-pc-windows-msvc");
   const enableMacOSX86 = allTargets.has("x86_64-apple-darwin");
@@ -16776,7 +16800,7 @@ var createGithubActionsCIYml = (targets, packageManager) => {
   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");
+  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 }) => allTargets.has(target));
   if (!fullTemplate.jobs.build.strategy.matrix.settings.length) {
     delete fullTemplate.jobs.build.strategy.matrix;
@@ -17023,13 +17047,19 @@ function requireNative() {
         ${requireTuple("linux-arm64-gnu")}
       }
     } else if (process.arch === 'arm') {
-      ${requireTuple("linux-arm-gnueabihf")}
+      if (isMusl()) {
+        ${requireTuple("linux-arm-musleabihf")}
+      } else {
+        ${requireTuple("linux-arm-gnueabihf")}
+      }
     } else if (process.arch === 'riscv64') {
       if (isMusl()) {
         ${requireTuple("linux-riscv64-musl")}
       } else {
         ${requireTuple("linux-riscv64-gnu")}
       }
+    } else if (process.arch === 'ppc64') {
+      ${requireTuple("linux-ppc64-gnu")}
     } else if (process.arch === 's390x') {
       ${requireTuple("linux-s390x-gnu")}
     } else {
@@ -17219,12 +17249,13 @@ ${wasiRegisterFunctions.map((name) => `  __napiInstance.exports['${name}']?.()`)
 // dist/api/templates/wasi-worker-template.js
 var WASI_WORKER_TEMPLATE = `import fs from "node:fs";
 import { createRequire } from "node:module";
+import { WASI } from "node:wasi";
 import { parentPort, Worker } from "node:worker_threads";
 
-import { instantiateNapiModuleSync, MessageHandler, WASI } from "@napi-rs/wasm-runtime";
-
 const require = createRequire(import.meta.url);
 
+const { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require("@napi-rs/wasm-runtime");
+
 if (parentPort) {
   parentPort.on("message", (data) => {
     globalThis.onmessage({ data });
@@ -17245,13 +17276,22 @@ Object.assign(globalThis, {
   },
 });
 
+const emnapiContext = getDefaultContext()
+
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
-    const wasi = new WASI({ fs });
+    const wasi = new WASI({
+      version: 'preview1',
+      env: process.env,
+      preopens: {
+        '/': '/',
+      },
+    });
 
     return instantiateNapiModuleSync(wasmModule, {
       childThread: true,
       wasi,
+      context: emnapiContext,
       overwriteImports(importObject) {
         importObject.env = {
           ...importObject.env,
@@ -17961,6 +18001,7 @@ This is the **${target.triple}** binary for \`${packageName}\`
 }
 
 // dist/api/new.js
+var import_node_child_process5 = require("node:child_process");
 var import_node_path4 = __toESM(require("node:path"), 1);
 
 // dist/def/new.js
@@ -18063,6 +18104,14 @@ function processOptions(options) {
       throw new Error("At least one target must be enabled");
     }
   }
+  if (options.targets.some((target) => target === "wasm32-wasi-preview1-threads")) {
+    const out = (0, import_node_child_process5.execSync)(`rustup target list`, {
+      encoding: "utf8"
+    });
+    if (out.includes("wasm32-wasip1-threads")) {
+      options.targets.map((target) => target === "wasm32-wasi-preview1-threads" ? "wasm32-wasip1-threads" : target);
+    }
+  }
   return applyDefaultNewOptions(options);
 }
 async function newProject(userOptions) {
@@ -18207,7 +18256,7 @@ function getBinaryName(name) {
 }
 
 // dist/api/pre-publish.js
-var import_node_child_process5 = require("node:child_process");
+var import_node_child_process6 = require("node:child_process");
 var import_node_fs4 = require("node:fs");
 var import_node_path6 = require("node:path");
 var import_rest = __toESM(require_dist_node12(), 1);
@@ -18368,7 +18417,7 @@ async function prePublish(userOptions) {
     return { owner: owner2, repo: repo2, pkgInfo: pkgInfo2, octokit: octokit2 };
   }
   function getRepoInfo(packageName2, version2) {
-    const headCommit = (0, import_node_child_process5.execSync)("git log -1 --pretty=%B", {
+    const headCommit = (0, import_node_child_process6.execSync)("git log -1 --pretty=%B", {
       encoding: "utf-8"
     }).trim();
     const { GITHUB_REPOSITORY } = process.env;
@@ -18420,7 +18469,7 @@ async function prePublish(userOptions) {
         debug7.warn(`%s doesn't exist`, dstPath);
         continue;
       }
-      (0, import_node_child_process5.execSync)(`${npmClient} publish`, {
+      (0, import_node_child_process6.execSync)(`${npmClient} publish`, {
         cwd: pkgDir,
         env: process.env
       });
@@ -18566,7 +18615,7 @@ async function renameProject(userOptions) {
 }
 
 // dist/api/universalize.js
-var import_node_child_process6 = require("node:child_process");
+var import_node_child_process7 = require("node:child_process");
 var import_node_path8 = require("node:path");
 
 // dist/def/universalize.js
@@ -18610,7 +18659,7 @@ function applyDefaultUniversalizeOptions(options) {
 var debug8 = debugFactory("universalize");
 var universalizers = {
   darwin: (inputs, output) => {
-    (0, import_node_child_process6.spawnSync)("lipo", ["-create", "-output", output, ...inputs], {
+    (0, import_node_child_process7.spawnSync)("lipo", ["-create", "-output", output, ...inputs], {
       stdio: "inherit"
     });
   }

package/dist/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from './ci.js';
 export * from './log.js';
 export * from './misc.js';
 export * from './target.js';

package/dist/utils/index.js

@@ -1,4 +1,3 @@
-export * from './ci.js';
 export * from './log.js';
 export * from './misc.js';
 export * from './target.js';

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}

package/dist/utils/target.d.ts

@@ -3,7 +3,7 @@ export type Platform = NodeJS.Platform | 'wasm' | 'wasi';
 export declare const UNIVERSAL_TARGETS: {
     readonly 'universal-apple-darwin': readonly ["aarch64-apple-darwin", "x86_64-apple-darwin"];
 };
-export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu", "wasm32-wasi-preview1-threads"];
+export declare const AVAILABLE_TARGETS: readonly ["aarch64-apple-darwin", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-unknown-freebsd", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", "armv7-linux-androideabi", "universal-apple-darwin", "riscv64gc-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-wasi-preview1-threads"];
 export type TargetTriple = (typeof AVAILABLE_TARGETS)[number];
 export declare const DEFAULT_TARGETS: readonly ["x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu"];
 export declare const TARGET_LINKER: Record<string, string>;

package/dist/utils/target.js

@@ -15,9 +15,12 @@ export const AVAILABLE_TARGETS = [
     'x86_64-unknown-freebsd',
     'i686-pc-windows-msvc',
     'armv7-unknown-linux-gnueabihf',
+    'armv7-unknown-linux-musleabihf',
     'armv7-linux-androideabi',
     'universal-apple-darwin',
     'riscv64gc-unknown-linux-gnu',
+    'powerpc64le-unknown-linux-gnu',
+    's390x-unknown-linux-gnu',
     'wasm32-wasi-preview1-threads',
 ];
 export const DEFAULT_TARGETS = [
@@ -29,6 +32,8 @@ export const DEFAULT_TARGETS = [
 export const TARGET_LINKER = {
     'aarch64-unknown-linux-musl': 'aarch64-linux-musl-gcc',
     'riscv64gc-unknown-linux-gnu': 'riscv64-linux-gnu-gcc',
+    'powerpc64le-unknown-linux-gnu': 'powerpc64le-linux-gnu-gcc',
+    's390x-unknown-linux-gnu': 's390x-linux-gnu-gcc',
 };
 const CpuToNodeArch = {
     x86_64: 'x64',
@@ -36,6 +41,7 @@ const CpuToNodeArch = {
     i686: 'ia32',
     armv7: 'arm',
     riscv64gc: 'riscv64',
+    powerpc64le: 'ppc64',
 };
 export const NodeArchToCpu = {
     x64: 'x86_64',
@@ -43,6 +49,7 @@ export const NodeArchToCpu = {
     ia32: 'i686',
     arm: 'armv7',
     riscv64: 'riscv64gc',
+    ppc64: 'powerpc64le',
 };
 const SysToNodePlatform = {
     linux: 'linux',
@@ -64,7 +71,8 @@ export const UniArchsByPlatform = {
  *   - `abi` = The ABI, for example `gnu`, `android`, `eabi`, etc.
  */
 export function parseTriple(rawTriple) {
-    if (rawTriple === 'wasm32-wasi-preview1-threads') {
+    if (rawTriple === 'wasm32-wasi-preview1-threads' ||
+        rawTriple.startsWith('wasm32-wasip')) {
         return {
             triple: rawTriple,
             platformArchABI: 'wasm32-wasi',

package/dist/utils/target.js.map

@@ -1 +1 @@
-{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/utils/target.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/utils/target.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/cli",
-  "version": "3.0.0-alpha.44",
+  "version": "3.0.0-alpha.46",
   "description": "Cli tools for napi-rs",
   "author": "LongYinan <lynweklm@gmail.com>",
   "homepage": "https://github.com/napi-rs/napi-rs",
@@ -72,7 +72,7 @@
     "clipanion": "^3.2.1",
     "colorette": "^2.0.20",
     "debug": "^4.3.4",
-    "emnapi": "1.1.0",
+    "emnapi": "1.1.1",
     "inquirer": "^9.2.13",
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
@@ -89,13 +89,14 @@
     "@types/js-yaml": "^4.0.9",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.11.13",
+    "@types/semver": "^7.5.8",
     "ava": "^6.1.1",
     "env-paths": "^3.0.0",
     "esbuild": "^0.20.0",
     "prettier": "^3.2.4",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.4"
   },
   "peerDependencies": {
     "@emnapi/runtime": "^1.1.0",
@@ -127,5 +128,5 @@
       "**/__tests__/**/*.spec.ts"
     ]
   },
-  "gitHead": "35b9637151a91471976d04937bbaa49a9690130b"
+  "gitHead": "f1b8ab5e645e674df33c796ef75aa278cd1b4a31"
 }

package/src/api/new.ts

@@ -1,3 +1,4 @@
+import { execSync } from 'node:child_process'
 import path from 'node:path'
 
 import {
@@ -61,6 +62,20 @@ function processOptions(options: RawNewOptions) {
       throw new Error('At least one target must be enabled')
     }
   }
+  if (
+    options.targets.some((target) => target === 'wasm32-wasi-preview1-threads')
+  ) {
+    const out = execSync(`rustup target list`, {
+      encoding: 'utf8',
+    })
+    if (out.includes('wasm32-wasip1-threads')) {
+      options.targets.map((target) =>
+        target === 'wasm32-wasi-preview1-threads'
+          ? 'wasm32-wasip1-threads'
+          : target,
+      )
+    }
+  }
 
   return applyDefaultNewOptions(options) as NewOptions
 }

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

@@ -1,6 +1,14 @@
 import type { SupportedPackageManager } from '../../utils/config.js'
 
-export const YAML = (packageManager: SupportedPackageManager) => `
+export type WasiTargetName =
+  | 'wasm32-wasi-preview1-threads'
+  | 'wasm32-wasip1-threads'
+  | 'wasm32-wasip2'
+
+export const YAML = (
+  packageManager: SupportedPackageManager,
+  wasiTargetName?: WasiTargetName,
+) => `
 name: CI
 
 env:
@@ -58,6 +66,9 @@ jobs:
           - host: ubuntu-latest
             target: 'armv7-unknown-linux-gnueabihf'
             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: ${packageManager} build --platform --target aarch64-linux-android
@@ -76,9 +87,23 @@ jobs:
               sudo apt-get update
               sudo apt-get install gcc-riscv64-linux-gnu -y
             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: 'wasm32-wasi-preview1-threads'
             build: ${packageManager} build --platform --target wasm32-wasi-preview1-threads
+            target: '${wasiTargetName}'
+            build: ${packageManager} build --platform --target ${wasiTargetName}
 
     name: stable - \${{ matrix.settings.target }} - node@20
     runs-on: \${{ matrix.settings.host }}
@@ -141,7 +166,7 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
-        if: matrix.settings.target != 'wasm32-wasi-preview1-threads'
+        if: matrix.settings.target != '${wasiTargetName}'
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: "*.node"
@@ -149,7 +174,7 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
-        if: matrix.settings.target == 'wasm32-wasi-preview1-threads'
+        if: matrix.settings.target == '${wasiTargetName}'
         with:
           name: bindings-\${{ matrix.settings.target }}
           path: "*.wasm"
@@ -162,7 +187,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build
         id: build
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@v0.23.0
         timeout-minutes: 30
         env:
           DEBUG: 'napi:*'
@@ -496,7 +521,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: bindings-wasm32-wasi-preview1-threads
+          name: bindings-${wasiTargetName}
           path: .
       - name: List packages
         run: ls -R .

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

@@ -7,7 +7,7 @@ import {
   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'
@@ -22,6 +22,7 @@ const UNIVERSAL_MACOS = 'universal-macOS'
 export const createGithubActionsCIYml = (
   targets: string[],
   packageManager: SupportedPackageManager,
+  wasiTargetName?: WasiTargetName,
 ) => {
   const allTargets = new Set(
     targets.flatMap((t) => {
@@ -36,7 +37,7 @@ export const createGithubActionsCIYml = (
     }),
   )
 
-  const fullTemplate = load(YAML(packageManager)) as any
+  const fullTemplate = load(YAML(packageManager, wasiTargetName)) as any
 
   const requiredSteps = []
   const enableWindowsX86 = allTargets.has('x86_64-pc-windows-msvc')
@@ -48,7 +49,10 @@ export const createGithubActionsCIYml = (
   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')
+  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),

package/src/api/templates/js-binding.ts

@@ -125,13 +125,19 @@ function requireNative() {
         ${requireTuple('linux-arm64-gnu')}
       }
     } else if (process.arch === 'arm') {
-      ${requireTuple('linux-arm-gnueabihf')}
+      if (isMusl()) {
+        ${requireTuple('linux-arm-musleabihf')}
+      } else {
+        ${requireTuple('linux-arm-gnueabihf')}
+      }
     } else if (process.arch === 'riscv64') {
       if (isMusl()) {
         ${requireTuple('linux-riscv64-musl')}
       } else {
         ${requireTuple('linux-riscv64-gnu')}
       }
+    } else if (process.arch === 'ppc64') {
+      ${requireTuple('linux-ppc64-gnu')}
     } else if (process.arch === 's390x') {
       ${requireTuple('linux-s390x-gnu')}
     } else {