@napi-rs/cli 3.0.0-alpha.27 → 3.0.0-alpha.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/artifacts.js +14 -4
- package/dist/api/artifacts.js.map +1 -1
- package/dist/api/create-npm-dirs.js +12 -0
- package/dist/api/create-npm-dirs.js.map +1 -1
- package/dist/api/templates/package.json.d.ts +5 -0
- package/dist/def/artifacts.d.ts +10 -0
- package/dist/def/artifacts.js +4 -0
- package/dist/def/artifacts.js.map +1 -1
- package/dist/index.cjs +30 -6
- package/package.json +2 -2
- package/src/api/artifacts.ts +39 -4
- package/src/api/create-npm-dirs.ts +17 -0
- package/src/api/templates/package.json.ts +1 -1
- package/src/def/artifacts.ts +10 -0
package/dist/api/artifacts.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { join, parse
|
|
1
|
+
import { join, parse } from 'node:path';
|
|
2
2
|
import * as colors from 'colorette';
|
|
3
3
|
import { applyDefaultArtifactsOptions, } from '../def/artifacts.js';
|
|
4
4
|
import { readNapiConfig, debugFactory, readFileAsync, writeFileAsync, UniArchsByPlatform, readdirAsync, } from '../utils/index.js';
|
|
5
5
|
const debug = debugFactory('artifacts');
|
|
6
6
|
export async function collectArtifacts(userOptions) {
|
|
7
7
|
const options = applyDefaultArtifactsOptions(userOptions);
|
|
8
|
-
const packageJsonPath =
|
|
8
|
+
const packageJsonPath = join(options.cwd, options.packageJsonPath);
|
|
9
9
|
const { targets, binaryName } = await readNapiConfig(packageJsonPath);
|
|
10
|
-
const distDirs = targets.map((platform) =>
|
|
10
|
+
const distDirs = targets.map((platform) => join(options.cwd, options.npmDir, platform.platformArchABI));
|
|
11
11
|
const universalSourceBins = new Set(targets
|
|
12
12
|
.filter((platform) => platform.arch === 'universal')
|
|
13
13
|
.flatMap((p) => UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`))
|
|
14
14
|
.filter(Boolean));
|
|
15
|
-
await collectNodeBinaries(
|
|
15
|
+
await collectNodeBinaries(join(options.cwd, options.outputDir)).then((output) => Promise.all(output.map(async (filePath) => {
|
|
16
16
|
debug.info(`Read [${colors.yellowBright(filePath)}]`);
|
|
17
17
|
const sourceContent = await readFileAsync(filePath);
|
|
18
18
|
const parsedName = parse(filePath);
|
|
@@ -38,6 +38,16 @@ export async function collectArtifacts(userOptions) {
|
|
|
38
38
|
debug.info(`Write file content to [${colors.yellowBright(distFilePathLocal)}]`);
|
|
39
39
|
await writeFileAsync(distFilePathLocal, sourceContent);
|
|
40
40
|
})));
|
|
41
|
+
const wasiTarget = targets.find((t) => t.platform === 'wasi');
|
|
42
|
+
if (wasiTarget) {
|
|
43
|
+
const wasiDir = join(options.cwd, options.npmDir, wasiTarget.platformArchABI);
|
|
44
|
+
const cjsFile = join(options.buildOutputDir ?? options.cwd, `${binaryName}.wasi.cjs`);
|
|
45
|
+
const workerFile = join(options.buildOutputDir ?? options.cwd, `wasi-worker.mjs`);
|
|
46
|
+
debug.info(`Move wasi cjs file [${colors.yellowBright(cjsFile)}] to [${colors.yellowBright(wasiDir)}]`);
|
|
47
|
+
await writeFileAsync(join(wasiDir, `${binaryName}.wasi.cjs`), await readFileAsync(cjsFile));
|
|
48
|
+
debug.info(`Move wasi worker file [${colors.yellowBright(workerFile)}] to [${colors.yellowBright(wasiDir)}]`);
|
|
49
|
+
await writeFileAsync(join(wasiDir, `wasi-worker.mjs`), await readFileAsync(workerFile));
|
|
50
|
+
}
|
|
41
51
|
}
|
|
42
52
|
async function collectNodeBinaries(root) {
|
|
43
53
|
const files = await readdirAsync(root, { withFileTypes: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/api/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/api/artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,18 @@ export async function createNpmDirs(userOptions) {
|
|
|
43
43
|
// @ts-expect-error
|
|
44
44
|
scopedPackageJson.os = [target.platform];
|
|
45
45
|
}
|
|
46
|
+
else {
|
|
47
|
+
const entry = `${binaryName}.wasi.cjs`;
|
|
48
|
+
scopedPackageJson.files.push(entry, `wasi-worker.mjs`);
|
|
49
|
+
scopedPackageJson.main = entry;
|
|
50
|
+
const emnapiCore = await fetch(`https://registry.npmjs.org/@emnapi/core`).then((res) => res.json());
|
|
51
|
+
const emnapiRuntime = await fetch(`https://registry.npmjs.org/@emnapi/runtime`).then((res) => res.json());
|
|
52
|
+
// @ts-expect-error
|
|
53
|
+
scopedPackageJson.dependencies = {
|
|
54
|
+
'@emnapi/core': `^${emnapiCore['dist-tags'].latest}`,
|
|
55
|
+
'@emnapi/runtime': `^${emnapiRuntime['dist-tags'].latest}`,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
46
58
|
if (target.abi === 'gnu') {
|
|
47
59
|
// @ts-expect-error
|
|
48
60
|
scopedPackageJson.libc = ['glibc'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-npm-dirs.js","sourceRoot":"","sources":["../../src/api/create-npm-dirs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EACL,gCAAgC,GAEjC,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,YAAY,EACZ,cAAc,EACd,UAAU,IAAI,aAAa,EAC3B,IAAI,EACJ,cAAc,IAAI,iBAAiB,GAEpC,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"create-npm-dirs.js","sourceRoot":"","sources":["../../src/api/create-npm-dirs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import type { SupportedTestFramework } from '../../utils/config.js';
|
|
2
|
+
export interface PackageMeta {
|
|
3
|
+
'dist-tags': {
|
|
4
|
+
[index: string]: string;
|
|
5
|
+
};
|
|
6
|
+
}
|
|
2
7
|
export declare const createPackageJson: ({ name, binaryName, targets, license, engineRequirement, cliVersion, testFramework, }: {
|
|
3
8
|
name: string;
|
|
4
9
|
binaryName: string;
|
package/dist/def/artifacts.d.ts
CHANGED
|
@@ -7,12 +7,14 @@ export declare abstract class BaseArtifactsCommand extends Command {
|
|
|
7
7
|
packageJsonPath: string;
|
|
8
8
|
outputDir: string;
|
|
9
9
|
npmDir: string;
|
|
10
|
+
buildOutputDir?: string;
|
|
10
11
|
getOptions(): {
|
|
11
12
|
cwd: string;
|
|
12
13
|
configPath: string | undefined;
|
|
13
14
|
packageJsonPath: string;
|
|
14
15
|
outputDir: string;
|
|
15
16
|
npmDir: string;
|
|
17
|
+
buildOutputDir: string | undefined;
|
|
16
18
|
};
|
|
17
19
|
}
|
|
18
20
|
/**
|
|
@@ -47,6 +49,10 @@ export interface ArtifactsOptions {
|
|
|
47
49
|
* @default 'npm'
|
|
48
50
|
*/
|
|
49
51
|
npmDir?: string;
|
|
52
|
+
/**
|
|
53
|
+
* Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
|
|
54
|
+
*/
|
|
55
|
+
buildOutputDir?: string;
|
|
50
56
|
}
|
|
51
57
|
export declare function applyDefaultArtifactsOptions(options: ArtifactsOptions): {
|
|
52
58
|
cwd: string;
|
|
@@ -57,4 +63,8 @@ export declare function applyDefaultArtifactsOptions(options: ArtifactsOptions):
|
|
|
57
63
|
packageJsonPath: string;
|
|
58
64
|
outputDir: string;
|
|
59
65
|
npmDir: string;
|
|
66
|
+
/**
|
|
67
|
+
* Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
|
|
68
|
+
*/
|
|
69
|
+
buildOutputDir?: string | undefined;
|
|
60
70
|
};
|
package/dist/def/artifacts.js
CHANGED
|
@@ -21,6 +21,9 @@ export class BaseArtifactsCommand extends Command {
|
|
|
21
21
|
npmDir = Option.String('--npm-dir', 'npm', {
|
|
22
22
|
description: 'Path to the folder where the npm packages put',
|
|
23
23
|
});
|
|
24
|
+
buildOutputDir = Option.String('--build-output-dir', {
|
|
25
|
+
description: 'Path to the build output dir, only needed when targets contains `wasm32-wasi-*`',
|
|
26
|
+
});
|
|
24
27
|
getOptions() {
|
|
25
28
|
return {
|
|
26
29
|
cwd: this.cwd,
|
|
@@ -28,6 +31,7 @@ export class BaseArtifactsCommand extends Command {
|
|
|
28
31
|
packageJsonPath: this.packageJsonPath,
|
|
29
32
|
outputDir: this.outputDir,
|
|
30
33
|
npmDir: this.npmDir,
|
|
34
|
+
buildOutputDir: this.buildOutputDir,
|
|
31
35
|
};
|
|
32
36
|
}
|
|
33
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/def/artifacts.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,iCAAiC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAgB,oBAAqB,SAAQ,OAAO;IACxD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EACT,2EAA2E;KAC9E,CAAC,CAAA;IAEF,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;QAC1C,WAAW,EACT,oHAAoH;KACvH,CAAC,CAAA;IAEF,UAAU,GAAY,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE;QACtD,WAAW,EAAE,iCAAiC;KAC/C,CAAC,CAAA;IAEF,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,EAAE;QACrE,WAAW,EAAE,wBAAwB;KACtC,CAAC,CAAA;IAEF,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,aAAa,EAAE;QAC7D,WAAW,EACT,+FAA+F;KAClG,CAAC,CAAA;IAEF,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE;QACzC,WAAW,EAAE,+CAA+C;KAC7D,CAAC,CAAA;IAEF,UAAU;QACR,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/def/artifacts.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,iCAAiC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,OAAgB,oBAAqB,SAAQ,OAAO;IACxD,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;IAE9B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,WAAW,EACT,2EAA2E;KAC9E,CAAC,CAAA;IAEF,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;QAC1C,WAAW,EACT,oHAAoH;KACvH,CAAC,CAAA;IAEF,UAAU,GAAY,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE;QACtD,WAAW,EAAE,iCAAiC;KAC/C,CAAC,CAAA;IAEF,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,cAAc,EAAE;QACrE,WAAW,EAAE,wBAAwB;KACtC,CAAC,CAAA;IAEF,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE,aAAa,EAAE;QAC7D,WAAW,EACT,+FAA+F;KAClG,CAAC,CAAA;IAEF,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE;QACzC,WAAW,EAAE,+CAA+C;KAC7D,CAAC,CAAA;IAEF,cAAc,GAAY,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAC5D,WAAW,EACT,iFAAiF;KACpF,CAAC,CAAA;IAEF,UAAU;QACR,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAA;IACH,CAAC;;AAyCH,MAAM,UAAU,4BAA4B,CAAC,OAAyB;IACpE,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,eAAe,EAAE,cAAc;QAC/B,SAAS,EAAE,aAAa;QACxB,MAAM,EAAE,KAAK;QACb,GAAG,OAAO;KACX,CAAA;AACH,CAAC"}
|
package/dist/index.cjs
CHANGED
|
@@ -7780,13 +7780,17 @@ var BaseArtifactsCommand = class extends import_clipanion.Command {
|
|
|
7780
7780
|
npmDir = import_clipanion.Option.String("--npm-dir", "npm", {
|
|
7781
7781
|
description: "Path to the folder where the npm packages put"
|
|
7782
7782
|
});
|
|
7783
|
+
buildOutputDir = import_clipanion.Option.String("--build-output-dir", {
|
|
7784
|
+
description: "Path to the build output dir, only needed when targets contains `wasm32-wasi-*`"
|
|
7785
|
+
});
|
|
7783
7786
|
getOptions() {
|
|
7784
7787
|
return {
|
|
7785
7788
|
cwd: this.cwd,
|
|
7786
7789
|
configPath: this.configPath,
|
|
7787
7790
|
packageJsonPath: this.packageJsonPath,
|
|
7788
7791
|
outputDir: this.outputDir,
|
|
7789
|
-
npmDir: this.npmDir
|
|
7792
|
+
npmDir: this.npmDir,
|
|
7793
|
+
buildOutputDir: this.buildOutputDir
|
|
7790
7794
|
};
|
|
7791
7795
|
}
|
|
7792
7796
|
};
|
|
@@ -10668,11 +10672,11 @@ function correctStringIdent(src, ident) {
|
|
|
10668
10672
|
var debug2 = debugFactory("artifacts");
|
|
10669
10673
|
async function collectArtifacts(userOptions) {
|
|
10670
10674
|
const options = applyDefaultArtifactsOptions(userOptions);
|
|
10671
|
-
const packageJsonPath = (0, import_node_path.
|
|
10675
|
+
const packageJsonPath = (0, import_node_path.join)(options.cwd, options.packageJsonPath);
|
|
10672
10676
|
const { targets, binaryName } = await readNapiConfig(packageJsonPath);
|
|
10673
|
-
const distDirs = targets.map((platform2) => (0, import_node_path.
|
|
10677
|
+
const distDirs = targets.map((platform2) => (0, import_node_path.join)(options.cwd, options.npmDir, platform2.platformArchABI));
|
|
10674
10678
|
const universalSourceBins = new Set(targets.filter((platform2) => platform2.arch === "universal").flatMap((p) => UniArchsByPlatform[p.platform]?.map((a) => `${p.platform}-${a}`)).filter(Boolean));
|
|
10675
|
-
await collectNodeBinaries((0, import_node_path.
|
|
10679
|
+
await collectNodeBinaries((0, import_node_path.join)(options.cwd, options.outputDir)).then((output) => Promise.all(output.map(async (filePath) => {
|
|
10676
10680
|
debug2.info(`Read [${yellowBright(filePath)}]`);
|
|
10677
10681
|
const sourceContent = await readFileAsync(filePath);
|
|
10678
10682
|
const parsedName = (0, import_node_path.parse)(filePath);
|
|
@@ -10698,6 +10702,16 @@ async function collectArtifacts(userOptions) {
|
|
|
10698
10702
|
debug2.info(`Write file content to [${yellowBright(distFilePathLocal)}]`);
|
|
10699
10703
|
await writeFileAsync(distFilePathLocal, sourceContent);
|
|
10700
10704
|
})));
|
|
10705
|
+
const wasiTarget = targets.find((t) => t.platform === "wasi");
|
|
10706
|
+
if (wasiTarget) {
|
|
10707
|
+
const wasiDir = (0, import_node_path.join)(options.cwd, options.npmDir, wasiTarget.platformArchABI);
|
|
10708
|
+
const cjsFile = (0, import_node_path.join)(options.buildOutputDir ?? options.cwd, `${binaryName}.wasi.cjs`);
|
|
10709
|
+
const workerFile = (0, import_node_path.join)(options.buildOutputDir ?? options.cwd, `wasi-worker.mjs`);
|
|
10710
|
+
debug2.info(`Move wasi cjs file [${yellowBright(cjsFile)}] to [${yellowBright(wasiDir)}]`);
|
|
10711
|
+
await writeFileAsync((0, import_node_path.join)(wasiDir, `${binaryName}.wasi.cjs`), await readFileAsync(cjsFile));
|
|
10712
|
+
debug2.info(`Move wasi worker file [${yellowBright(workerFile)}] to [${yellowBright(wasiDir)}]`);
|
|
10713
|
+
await writeFileAsync((0, import_node_path.join)(wasiDir, `wasi-worker.mjs`), await readFileAsync(workerFile));
|
|
10714
|
+
}
|
|
10701
10715
|
}
|
|
10702
10716
|
async function collectNodeBinaries(root2) {
|
|
10703
10717
|
const files = await readdirAsync(root2, { withFileTypes: true });
|
|
@@ -14926,7 +14940,7 @@ var Builder = class {
|
|
|
14926
14940
|
debug3(" %i", `cargo ${this.args.join(" ")}`);
|
|
14927
14941
|
const controller = new AbortController();
|
|
14928
14942
|
const watch = this.options.watch;
|
|
14929
|
-
const buildTask = new Promise((
|
|
14943
|
+
const buildTask = new Promise((resolve7, reject) => {
|
|
14930
14944
|
if (this.options.useCross && this.options.crossCompile) {
|
|
14931
14945
|
throw new Error("`--use-cross` and `--cross-compile` can not be used together");
|
|
14932
14946
|
}
|
|
@@ -14943,7 +14957,7 @@ var Builder = class {
|
|
|
14943
14957
|
buildProcess.once("exit", (code) => {
|
|
14944
14958
|
if (code === 0) {
|
|
14945
14959
|
debug3("%i", `Build crate ${this.crate.name} successfully!`);
|
|
14946
|
-
|
|
14960
|
+
resolve7();
|
|
14947
14961
|
} else {
|
|
14948
14962
|
reject(new Error(`Build failed with exit code ${code}`));
|
|
14949
14963
|
}
|
|
@@ -15356,6 +15370,16 @@ async function createNpmDirs(userOptions) {
|
|
|
15356
15370
|
};
|
|
15357
15371
|
if (target.arch !== "wasm32") {
|
|
15358
15372
|
scopedPackageJson.os = [target.platform];
|
|
15373
|
+
} else {
|
|
15374
|
+
const entry = `${binaryName}.wasi.cjs`;
|
|
15375
|
+
scopedPackageJson.files.push(entry, `wasi-worker.mjs`);
|
|
15376
|
+
scopedPackageJson.main = entry;
|
|
15377
|
+
const emnapiCore = await fetch(`https://registry.npmjs.org/@emnapi/core`).then((res) => res.json());
|
|
15378
|
+
const emnapiRuntime = await fetch(`https://registry.npmjs.org/@emnapi/runtime`).then((res) => res.json());
|
|
15379
|
+
scopedPackageJson.dependencies = {
|
|
15380
|
+
"@emnapi/core": `^${emnapiCore["dist-tags"].latest}`,
|
|
15381
|
+
"@emnapi/runtime": `^${emnapiRuntime["dist-tags"].latest}`
|
|
15382
|
+
};
|
|
15359
15383
|
}
|
|
15360
15384
|
if (target.abi === "gnu") {
|
|
15361
15385
|
scopedPackageJson.libc = ["glibc"];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@napi-rs/cli",
|
|
3
|
-
"version": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.28",
|
|
4
4
|
"description": "Cli tools for napi-rs",
|
|
5
5
|
"author": "LongYinan <lynweklm@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/napi-rs/napi-rs",
|
|
@@ -130,5 +130,5 @@
|
|
|
130
130
|
"**/__tests__/**/*.spec.ts"
|
|
131
131
|
]
|
|
132
132
|
},
|
|
133
|
-
"gitHead": "
|
|
133
|
+
"gitHead": "f47cc7274952c81d1fe364226a20fc347ff44c74"
|
|
134
134
|
}
|
package/src/api/artifacts.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join, parse
|
|
1
|
+
import { join, parse } from 'node:path'
|
|
2
2
|
|
|
3
3
|
import * as colors from 'colorette'
|
|
4
4
|
|
|
@@ -20,11 +20,11 @@ const debug = debugFactory('artifacts')
|
|
|
20
20
|
export async function collectArtifacts(userOptions: ArtifactsOptions) {
|
|
21
21
|
const options = applyDefaultArtifactsOptions(userOptions)
|
|
22
22
|
|
|
23
|
-
const packageJsonPath =
|
|
23
|
+
const packageJsonPath = join(options.cwd, options.packageJsonPath)
|
|
24
24
|
const { targets, binaryName } = await readNapiConfig(packageJsonPath)
|
|
25
25
|
|
|
26
26
|
const distDirs = targets.map((platform) =>
|
|
27
|
-
|
|
27
|
+
join(options.cwd, options.npmDir, platform.platformArchABI),
|
|
28
28
|
)
|
|
29
29
|
|
|
30
30
|
const universalSourceBins = new Set(
|
|
@@ -36,7 +36,7 @@ export async function collectArtifacts(userOptions: ArtifactsOptions) {
|
|
|
36
36
|
.filter(Boolean) as string[],
|
|
37
37
|
)
|
|
38
38
|
|
|
39
|
-
await collectNodeBinaries(
|
|
39
|
+
await collectNodeBinaries(join(options.cwd, options.outputDir)).then(
|
|
40
40
|
(output) =>
|
|
41
41
|
Promise.all(
|
|
42
42
|
output.map(async (filePath) => {
|
|
@@ -80,6 +80,41 @@ export async function collectArtifacts(userOptions: ArtifactsOptions) {
|
|
|
80
80
|
}),
|
|
81
81
|
),
|
|
82
82
|
)
|
|
83
|
+
|
|
84
|
+
const wasiTarget = targets.find((t) => t.platform === 'wasi')
|
|
85
|
+
if (wasiTarget) {
|
|
86
|
+
const wasiDir = join(
|
|
87
|
+
options.cwd,
|
|
88
|
+
options.npmDir,
|
|
89
|
+
wasiTarget.platformArchABI,
|
|
90
|
+
)
|
|
91
|
+
const cjsFile = join(
|
|
92
|
+
options.buildOutputDir ?? options.cwd,
|
|
93
|
+
`${binaryName}.wasi.cjs`,
|
|
94
|
+
)
|
|
95
|
+
const workerFile = join(
|
|
96
|
+
options.buildOutputDir ?? options.cwd,
|
|
97
|
+
`wasi-worker.mjs`,
|
|
98
|
+
)
|
|
99
|
+
debug.info(
|
|
100
|
+
`Move wasi cjs file [${colors.yellowBright(
|
|
101
|
+
cjsFile,
|
|
102
|
+
)}] to [${colors.yellowBright(wasiDir)}]`,
|
|
103
|
+
)
|
|
104
|
+
await writeFileAsync(
|
|
105
|
+
join(wasiDir, `${binaryName}.wasi.cjs`),
|
|
106
|
+
await readFileAsync(cjsFile),
|
|
107
|
+
)
|
|
108
|
+
debug.info(
|
|
109
|
+
`Move wasi worker file [${colors.yellowBright(
|
|
110
|
+
workerFile,
|
|
111
|
+
)}] to [${colors.yellowBright(wasiDir)}]`,
|
|
112
|
+
)
|
|
113
|
+
await writeFileAsync(
|
|
114
|
+
join(wasiDir, `wasi-worker.mjs`),
|
|
115
|
+
await readFileAsync(workerFile),
|
|
116
|
+
)
|
|
117
|
+
}
|
|
83
118
|
}
|
|
84
119
|
|
|
85
120
|
async function collectNodeBinaries(root: string) {
|
|
@@ -13,6 +13,8 @@ import {
|
|
|
13
13
|
Target,
|
|
14
14
|
} from '../utils/index.js'
|
|
15
15
|
|
|
16
|
+
import type { PackageMeta } from './templates/package.json.js'
|
|
17
|
+
|
|
16
18
|
const debug = debugFactory('create-npm-dirs')
|
|
17
19
|
|
|
18
20
|
export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
|
|
@@ -82,6 +84,21 @@ export async function createNpmDirs(userOptions: CreateNpmDirsOptions) {
|
|
|
82
84
|
if (target.arch !== 'wasm32') {
|
|
83
85
|
// @ts-expect-error
|
|
84
86
|
scopedPackageJson.os = [target.platform]
|
|
87
|
+
} else {
|
|
88
|
+
const entry = `${binaryName}.wasi.cjs`
|
|
89
|
+
scopedPackageJson.files.push(entry, `wasi-worker.mjs`)
|
|
90
|
+
scopedPackageJson.main = entry
|
|
91
|
+
const emnapiCore = await fetch(
|
|
92
|
+
`https://registry.npmjs.org/@emnapi/core`,
|
|
93
|
+
).then((res) => res.json() as Promise<PackageMeta>)
|
|
94
|
+
const emnapiRuntime = await fetch(
|
|
95
|
+
`https://registry.npmjs.org/@emnapi/runtime`,
|
|
96
|
+
).then((res) => res.json() as Promise<PackageMeta>)
|
|
97
|
+
// @ts-expect-error
|
|
98
|
+
scopedPackageJson.dependencies = {
|
|
99
|
+
'@emnapi/core': `^${emnapiCore['dist-tags'].latest}`,
|
|
100
|
+
'@emnapi/runtime': `^${emnapiRuntime['dist-tags'].latest}`,
|
|
101
|
+
}
|
|
85
102
|
}
|
|
86
103
|
|
|
87
104
|
if (target.abi === 'gnu') {
|
package/src/def/artifacts.ts
CHANGED
|
@@ -32,6 +32,11 @@ export abstract class BaseArtifactsCommand extends Command {
|
|
|
32
32
|
description: 'Path to the folder where the npm packages put',
|
|
33
33
|
})
|
|
34
34
|
|
|
35
|
+
buildOutputDir?: string = Option.String('--build-output-dir', {
|
|
36
|
+
description:
|
|
37
|
+
'Path to the build output dir, only needed when targets contains `wasm32-wasi-*`',
|
|
38
|
+
})
|
|
39
|
+
|
|
35
40
|
getOptions() {
|
|
36
41
|
return {
|
|
37
42
|
cwd: this.cwd,
|
|
@@ -39,6 +44,7 @@ export abstract class BaseArtifactsCommand extends Command {
|
|
|
39
44
|
packageJsonPath: this.packageJsonPath,
|
|
40
45
|
outputDir: this.outputDir,
|
|
41
46
|
npmDir: this.npmDir,
|
|
47
|
+
buildOutputDir: this.buildOutputDir,
|
|
42
48
|
}
|
|
43
49
|
}
|
|
44
50
|
}
|
|
@@ -75,6 +81,10 @@ export interface ArtifactsOptions {
|
|
|
75
81
|
* @default 'npm'
|
|
76
82
|
*/
|
|
77
83
|
npmDir?: string
|
|
84
|
+
/**
|
|
85
|
+
* Path to the build output dir, only needed when targets contains `wasm32-wasi-*`
|
|
86
|
+
*/
|
|
87
|
+
buildOutputDir?: string
|
|
78
88
|
}
|
|
79
89
|
|
|
80
90
|
export function applyDefaultArtifactsOptions(options: ArtifactsOptions) {
|