@napi-rs/cli 3.0.0-alpha.6 → 3.0.0-alpha.61
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 +28 -7
- package/dist/api/artifacts.js.map +1 -1
- package/dist/api/build.js +220 -39
- package/dist/api/build.js.map +1 -1
- package/dist/api/create-npm-dirs.js +45 -8
- package/dist/api/create-npm-dirs.js.map +1 -1
- package/dist/api/new.js +57 -20
- package/dist/api/new.js.map +1 -1
- package/dist/api/pre-publish.js +9 -7
- package/dist/api/pre-publish.js.map +1 -1
- package/dist/api/rename.js +9 -1
- package/dist/api/rename.js.map +1 -1
- package/dist/api/templates/ci-template.d.ts +3 -1
- package/dist/api/templates/ci-template.js +124 -124
- package/dist/api/templates/ci-template.js.map +1 -1
- package/dist/api/templates/ci.yml.d.ts +3 -1
- package/dist/api/templates/ci.yml.js +21 -5
- package/dist/api/templates/ci.yml.js.map +1 -1
- package/dist/api/templates/js-binding.js +104 -214
- package/dist/api/templates/js-binding.js.map +1 -1
- package/dist/api/templates/lib.rs.js +1 -4
- package/dist/api/templates/lib.rs.js.map +1 -1
- package/dist/api/templates/load-wasi-template.d.ts +2 -0
- package/dist/api/templates/load-wasi-template.js +166 -0
- package/dist/api/templates/load-wasi-template.js.map +1 -0
- package/dist/api/templates/package.json.d.ts +9 -2
- package/dist/api/templates/package.json.js +26 -4
- package/dist/api/templates/package.json.js.map +1 -1
- package/dist/api/templates/wasi-worker-template.d.ts +2 -0
- package/dist/api/templates/wasi-worker-template.js +122 -0
- package/dist/api/templates/wasi-worker-template.js.map +1 -0
- package/dist/api/universalize.js +5 -5
- package/dist/api/universalize.js.map +1 -1
- package/dist/api/version.js +2 -2
- package/dist/api/version.js.map +1 -1
- package/dist/commands/artifacts.js +2 -2
- package/dist/commands/artifacts.js.map +1 -1
- package/dist/commands/build.js +1 -1
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/new.js +30 -8
- package/dist/commands/new.js.map +1 -1
- package/dist/def/artifacts.d.ts +21 -1
- package/dist/def/artifacts.js +10 -2
- package/dist/def/artifacts.js.map +1 -1
- package/dist/def/build.d.ts +22 -4
- package/dist/def/build.js +16 -4
- package/dist/def/build.js.map +1 -1
- package/dist/def/create-npm-dirs.d.ts +10 -0
- package/dist/def/create-npm-dirs.js +4 -0
- package/dist/def/create-npm-dirs.js.map +1 -1
- package/dist/def/new.d.ts +25 -7
- package/dist/def/new.js +11 -1
- package/dist/def/new.js.map +1 -1
- package/dist/def/pre-publish.d.ts +12 -2
- package/dist/def/pre-publish.js +7 -3
- package/dist/def/pre-publish.js.map +1 -1
- package/dist/def/rename.d.ts +16 -6
- package/dist/def/rename.js +5 -1
- package/dist/def/rename.js.map +1 -1
- package/dist/def/universalize.d.ts +10 -0
- package/dist/def/universalize.js +4 -0
- package/dist/def/universalize.js.map +1 -1
- package/dist/def/version.d.ts +10 -0
- package/dist/def/version.js +4 -0
- package/dist/def/version.js.map +1 -1
- package/dist/index.cjs +8143 -14638
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/utils/__tests__/config.spec.d.ts +1 -0
- package/dist/utils/__tests__/config.spec.js +63 -0
- package/dist/utils/__tests__/config.spec.js.map +1 -0
- package/dist/utils/__tests__/typegen.spec.js +8 -4
- package/dist/utils/__tests__/typegen.spec.js.map +1 -1
- package/dist/utils/cargo.js +1 -1
- package/dist/utils/cargo.js.map +1 -1
- package/dist/utils/config.d.ts +49 -5
- package/dist/utils/config.js +38 -6
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/index.d.ts +0 -1
- package/dist/utils/index.js +0 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/metadata.js +2 -2
- package/dist/utils/metadata.js.map +1 -1
- package/dist/utils/misc.d.ts +1 -2
- package/dist/utils/misc.js +3 -3
- package/dist/utils/misc.js.map +1 -1
- package/dist/utils/target.d.ts +7 -5
- package/dist/utils/target.js +17 -3
- package/dist/utils/target.js.map +1 -1
- package/dist/utils/typegen.d.ts +1 -1
- package/dist/utils/typegen.js +29 -9
- package/dist/utils/typegen.js.map +1 -1
- package/dist/utils/version.d.ts +2 -1
- package/dist/utils/version.js +10 -8
- package/dist/utils/version.js.map +1 -1
- package/package.json +25 -24
- package/src/api/artifacts.ts +81 -9
- package/src/api/build.ts +379 -58
- package/src/api/create-npm-dirs.ts +56 -8
- package/src/api/new.ts +89 -31
- package/src/api/pre-publish.ts +13 -7
- package/src/api/rename.ts +10 -1
- package/src/api/templates/ci-template.ts +134 -124
- package/src/api/templates/ci.yml.ts +27 -6
- package/src/api/templates/js-binding.ts +105 -214
- package/src/api/templates/lib.rs.ts +1 -4
- package/src/api/templates/load-wasi-template.ts +180 -0
- package/src/api/templates/package.json.ts +47 -5
- package/src/api/templates/wasi-worker-template.ts +122 -0
- package/src/api/universalize.ts +13 -8
- package/src/api/version.ts +5 -2
- package/src/commands/artifacts.ts +2 -2
- package/src/commands/build.ts +1 -1
- package/src/commands/new.ts +31 -8
- package/src/def/artifacts.ts +22 -3
- package/src/def/build.ts +36 -8
- package/src/def/create-npm-dirs.ts +9 -0
- package/src/def/new.ts +28 -3
- package/src/def/pre-publish.ts +12 -3
- package/src/def/rename.ts +11 -2
- package/src/def/universalize.ts +9 -0
- package/src/def/version.ts +9 -0
- package/src/index.ts +2 -0
- package/src/utils/__tests__/__fixtures__/napi_type_def +130 -130
- package/src/utils/__tests__/__snapshots__/config.spec.ts.md +97 -0
- package/src/utils/__tests__/__snapshots__/config.spec.ts.snap +0 -0
- package/src/utils/__tests__/__snapshots__/target.spec.ts.md +28 -0
- package/src/utils/__tests__/__snapshots__/target.spec.ts.snap +0 -0
- package/src/utils/__tests__/__snapshots__/typegen.spec.ts.md +713 -158
- package/src/utils/__tests__/__snapshots__/typegen.spec.ts.snap +0 -0
- package/src/utils/__tests__/__snapshots__/version.spec.ts.md +8 -7
- package/src/utils/__tests__/__snapshots__/version.spec.ts.snap +0 -0
- package/src/utils/__tests__/config.spec.ts +81 -0
- package/src/utils/__tests__/typegen.spec.ts +18 -3
- package/src/utils/cargo.ts +1 -1
- package/src/utils/config.ts +114 -12
- package/src/utils/index.ts +0 -1
- package/src/utils/metadata.ts +2 -2
- package/src/utils/misc.ts +11 -3
- package/src/utils/target.ts +22 -4
- package/src/utils/typegen.ts +37 -8
- package/src/utils/version.ts +10 -8
- package/dist/api/load-wasi-template.d.ts +0 -1
- package/dist/api/load-wasi-template.js +0 -63
- package/dist/api/load-wasi-template.js.map +0 -1
- package/dist/api/wasi-worker-template.d.ts +0 -1
- package/dist/api/wasi-worker-template.js +0 -53
- package/dist/api/wasi-worker-template.js.map +0 -1
- package/dist/utils/ci.d.ts +0 -11
- package/dist/utils/ci.js +0 -96
- package/dist/utils/ci.js.map +0 -1
- package/src/api/load-wasi-template.ts +0 -65
- package/src/api/wasi-worker-template.ts +0 -52
- package/src/utils/ci.ts +0 -111
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { join, resolve } from 'path';
|
|
1
|
+
import { join, resolve } from 'node:path';
|
|
2
|
+
import { parse } from 'semver';
|
|
2
3
|
import { applyDefaultCreateNpmDirsOptions, } from '../def/create-npm-dirs.js';
|
|
3
4
|
import { debugFactory, readNapiConfig, mkdirAsync as rawMkdirAsync, pick, writeFileAsync as rawWriteFileAsync, } from '../utils/index.js';
|
|
4
5
|
const debug = debugFactory('create-npm-dirs');
|
|
@@ -23,23 +24,59 @@ export async function createNpmDirs(userOptions) {
|
|
|
23
24
|
}
|
|
24
25
|
const packageJsonPath = resolve(options.cwd, options.packageJsonPath);
|
|
25
26
|
const npmPath = resolve(options.cwd, options.npmDir);
|
|
26
|
-
debug(`Read content from [${packageJsonPath}]`);
|
|
27
|
-
const { targets, binaryName, packageName, packageJson } = await readNapiConfig(packageJsonPath);
|
|
27
|
+
debug(`Read content from [${options.configPath ?? packageJsonPath}]`);
|
|
28
|
+
const { targets, binaryName, packageName, packageJson } = await readNapiConfig(packageJsonPath, options.configPath ? resolve(options.cwd, options.configPath) : undefined);
|
|
28
29
|
for (const target of targets) {
|
|
29
30
|
const targetDir = join(npmPath, `${target.platformArchABI}`);
|
|
30
31
|
await mkdirAsync(targetDir);
|
|
31
|
-
const binaryFileName =
|
|
32
|
+
const binaryFileName = target.arch === 'wasm32'
|
|
33
|
+
? `${binaryName}.${target.platformArchABI}.wasm`
|
|
34
|
+
: `${binaryName}.${target.platformArchABI}.node`;
|
|
32
35
|
const scopedPackageJson = {
|
|
33
36
|
name: `${packageName}-${target.platformArchABI}`,
|
|
34
37
|
version: packageJson.version,
|
|
35
|
-
os: [target.platform],
|
|
36
38
|
cpu: target.arch !== 'universal' ? [target.arch] : undefined,
|
|
37
39
|
main: binaryFileName,
|
|
38
40
|
files: [binaryFileName],
|
|
39
41
|
...pick(packageJson, 'description', 'keywords', 'author', 'authors', 'homepage', 'license', 'engines', 'publishConfig', 'repository', 'bugs'),
|
|
40
42
|
};
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
if (target.arch !== 'wasm32') {
|
|
44
|
+
// @ts-expect-error
|
|
45
|
+
scopedPackageJson.os = [target.platform];
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
const entry = `${binaryName}.wasi.cjs`;
|
|
49
|
+
scopedPackageJson.main = entry;
|
|
50
|
+
// @ts-expect-error
|
|
51
|
+
scopedPackageJson.browser = `${binaryName}.wasi-browser.js`;
|
|
52
|
+
scopedPackageJson.files.push(entry,
|
|
53
|
+
// @ts-expect-error
|
|
54
|
+
scopedPackageJson.browser, `wasi-worker.mjs`, `wasi-worker-browser.mjs`);
|
|
55
|
+
let needRestrictNodeVersion = true;
|
|
56
|
+
if (scopedPackageJson.engines?.node) {
|
|
57
|
+
try {
|
|
58
|
+
const { major } = parse(scopedPackageJson.engines.node) ?? {
|
|
59
|
+
major: 0,
|
|
60
|
+
};
|
|
61
|
+
if (major >= 14) {
|
|
62
|
+
needRestrictNodeVersion = false;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
// ignore
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (needRestrictNodeVersion) {
|
|
70
|
+
scopedPackageJson.engines = {
|
|
71
|
+
node: '>=14.0.0',
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
const wasmRuntime = await fetch(`https://registry.npmjs.org/@napi-rs/wasm-runtime`).then((res) => res.json());
|
|
75
|
+
// @ts-expect-error
|
|
76
|
+
scopedPackageJson.dependencies = {
|
|
77
|
+
'@napi-rs/wasm-runtime': `^${wasmRuntime['dist-tags'].latest}`,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
43
80
|
if (target.abi === 'gnu') {
|
|
44
81
|
// @ts-expect-error
|
|
45
82
|
scopedPackageJson.libc = ['glibc'];
|
|
@@ -52,7 +89,7 @@ export async function createNpmDirs(userOptions) {
|
|
|
52
89
|
await writeFileAsync(targetPackageJson, JSON.stringify(scopedPackageJson, null, 2));
|
|
53
90
|
const targetReadme = join(targetDir, 'README.md');
|
|
54
91
|
await writeFileAsync(targetReadme, readme(packageName, target));
|
|
55
|
-
debug.info(`${packageName}-${target.platformArchABI} created`);
|
|
92
|
+
debug.info(`${packageName} -${target.platformArchABI} created`);
|
|
56
93
|
}
|
|
57
94
|
}
|
|
58
95
|
function readme(packageName, target) {
|
|
@@ -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,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"create-npm-dirs.js","sourceRoot":"","sources":["../../src/api/create-npm-dirs.ts"],"names":[],"mappings":"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"}
|
package/dist/api/new.js
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { execSync } from 'node:child_process';
|
|
2
|
+
import path from 'node:path';
|
|
2
3
|
import { applyDefaultNewOptions, } from '../def/new.js';
|
|
3
|
-
import { AVAILABLE_TARGETS, CLI_VERSION, debugFactory, DEFAULT_TARGETS, mkdirAsync, writeFileAsync, } from '../utils/index.js';
|
|
4
|
+
import { AVAILABLE_TARGETS, CLI_VERSION, debugFactory, DEFAULT_TARGETS, mkdirAsync, readdirAsync, statAsync, writeFileAsync, } from '../utils/index.js';
|
|
4
5
|
import { napiEngineRequirement } from '../utils/version.js';
|
|
5
6
|
import { createBuildRs, createCargoToml, createGithubActionsCIYml, createLibRs, createPackageJson, gitIgnore, npmIgnore, } from './templates/index.js';
|
|
6
7
|
const debug = debugFactory('new');
|
|
7
8
|
function processOptions(options) {
|
|
8
9
|
debug('Processing options...');
|
|
10
|
+
if (!options.path) {
|
|
11
|
+
throw new Error('Please provide the path as the argument');
|
|
12
|
+
}
|
|
9
13
|
options.path = path.resolve(process.cwd(), options.path);
|
|
10
14
|
debug(`Resolved target path to: ${options.path}`);
|
|
11
15
|
if (!options.name) {
|
|
@@ -25,6 +29,16 @@ function processOptions(options) {
|
|
|
25
29
|
throw new Error('At least one target must be enabled');
|
|
26
30
|
}
|
|
27
31
|
}
|
|
32
|
+
if (options.targets.some((target) => target === 'wasm32-wasi-preview1-threads')) {
|
|
33
|
+
const out = execSync(`rustup target list`, {
|
|
34
|
+
encoding: 'utf8',
|
|
35
|
+
});
|
|
36
|
+
if (out.includes('wasm32-wasip1-threads')) {
|
|
37
|
+
options.targets.map((target) => target === 'wasm32-wasi-preview1-threads'
|
|
38
|
+
? 'wasm32-wasip1-threads'
|
|
39
|
+
: target);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
28
42
|
return applyDefaultNewOptions(options);
|
|
29
43
|
}
|
|
30
44
|
export async function newProject(userOptions) {
|
|
@@ -33,30 +47,49 @@ export async function newProject(userOptions) {
|
|
|
33
47
|
const options = processOptions(userOptions);
|
|
34
48
|
debug('Targets to be enabled:');
|
|
35
49
|
debug(options.targets);
|
|
36
|
-
const outputs = generateFiles(options);
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
50
|
+
const outputs = await generateFiles(options);
|
|
51
|
+
await ensurePath(options.path, options.dryRun);
|
|
52
|
+
await dumpOutputs(outputs, options.dryRun);
|
|
53
|
+
debug(`Project created at: ${options.path}`);
|
|
54
|
+
}
|
|
55
|
+
async function ensurePath(path, dryRun = false) {
|
|
56
|
+
const stat = await statAsync(path, {}).catch(() => undefined);
|
|
57
|
+
// file descriptor exists
|
|
58
|
+
if (stat) {
|
|
59
|
+
if (stat.isFile()) {
|
|
60
|
+
throw new Error(`Path ${path} for creating new napi-rs project already exists and it's not a directory.`);
|
|
61
|
+
}
|
|
62
|
+
else if (stat.isDirectory()) {
|
|
63
|
+
const files = await readdirAsync(path);
|
|
64
|
+
if (files.length) {
|
|
65
|
+
throw new Error(`Path ${path} for creating new napi-rs project already exists and it's not empty.`);
|
|
66
|
+
}
|
|
41
67
|
}
|
|
42
68
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
69
|
+
if (!dryRun) {
|
|
70
|
+
try {
|
|
71
|
+
debug(`Try to create target directory: ${path}`);
|
|
72
|
+
if (!dryRun) {
|
|
73
|
+
await mkdirAsync(path, { recursive: true });
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
throw new Error(`Failed to create target directory: ${path}`, {
|
|
78
|
+
cause: e,
|
|
79
|
+
});
|
|
80
|
+
}
|
|
47
81
|
}
|
|
48
|
-
await dumpOutputs(outputs, options.dryRun);
|
|
49
|
-
debug(`Project created at: ${options.path}`);
|
|
50
82
|
}
|
|
51
|
-
function generateFiles(options) {
|
|
83
|
+
async function generateFiles(options) {
|
|
84
|
+
const packageJson = await generatePackageJson(options);
|
|
52
85
|
return [
|
|
53
86
|
generateCargoToml,
|
|
54
87
|
generateLibRs,
|
|
55
88
|
generateBuildRs,
|
|
56
|
-
generatePackageJson,
|
|
57
89
|
generateGithubWorkflow,
|
|
58
90
|
generateIgnoreFiles,
|
|
59
|
-
]
|
|
91
|
+
]
|
|
92
|
+
.flatMap((generator) => {
|
|
60
93
|
const output = generator(options);
|
|
61
94
|
if (!output) {
|
|
62
95
|
return [];
|
|
@@ -70,7 +103,10 @@ function generateFiles(options) {
|
|
|
70
103
|
else {
|
|
71
104
|
return [{ ...output, target: path.join(options.path, output.target) }];
|
|
72
105
|
}
|
|
73
|
-
})
|
|
106
|
+
})
|
|
107
|
+
.concat([
|
|
108
|
+
{ ...packageJson, target: path.join(options.path, packageJson.target) },
|
|
109
|
+
]);
|
|
74
110
|
}
|
|
75
111
|
function generateCargoToml(options) {
|
|
76
112
|
return {
|
|
@@ -95,16 +131,17 @@ function generateBuildRs(_options) {
|
|
|
95
131
|
content: createBuildRs(),
|
|
96
132
|
};
|
|
97
133
|
}
|
|
98
|
-
function generatePackageJson(options) {
|
|
134
|
+
async function generatePackageJson(options) {
|
|
99
135
|
return {
|
|
100
136
|
target: './package.json',
|
|
101
|
-
content: createPackageJson({
|
|
137
|
+
content: await createPackageJson({
|
|
102
138
|
name: options.name,
|
|
103
139
|
binaryName: getBinaryName(options.name),
|
|
104
140
|
targets: options.targets,
|
|
105
141
|
license: options.license,
|
|
106
142
|
engineRequirement: napiEngineRequirement(options.minNodeApiVersion),
|
|
107
143
|
cliVersion: CLI_VERSION,
|
|
144
|
+
testFramework: options.testFramework,
|
|
108
145
|
}),
|
|
109
146
|
};
|
|
110
147
|
}
|
|
@@ -114,7 +151,7 @@ function generateGithubWorkflow(options) {
|
|
|
114
151
|
}
|
|
115
152
|
return {
|
|
116
153
|
target: './.github/workflows/ci.yml',
|
|
117
|
-
content: createGithubActionsCIYml(options.targets),
|
|
154
|
+
content: createGithubActionsCIYml(options.targets, options.packageManager, options.targets.find((t) => t.includes('wasm32-wasi')) ?? 'wasm32-wasi-preview1-threads'),
|
|
118
155
|
};
|
|
119
156
|
}
|
|
120
157
|
function generateIgnoreFiles(_options) {
|
package/dist/api/new.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/api/new.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/api/new.ts"],"names":[],"mappings":"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"}
|
package/dist/api/pre-publish.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { execSync } from 'child_process';
|
|
2
|
-
import { existsSync, statSync } from 'fs';
|
|
3
|
-
import { join,
|
|
1
|
+
import { execSync } from 'node:child_process';
|
|
2
|
+
import { existsSync, statSync } from 'node:fs';
|
|
3
|
+
import { join, resolve } from 'node:path';
|
|
4
4
|
import { Octokit } from '@octokit/rest';
|
|
5
5
|
import { applyDefaultPrePublishOptions, } from '../def/pre-publish.js';
|
|
6
6
|
import { readFileAsync, readNapiConfig, debugFactory, updatePackageJson, } from '../utils/index.js';
|
|
@@ -10,8 +10,8 @@ export async function prePublish(userOptions) {
|
|
|
10
10
|
debug('Receive pre-publish options:');
|
|
11
11
|
debug(' %O', userOptions);
|
|
12
12
|
const options = applyDefaultPrePublishOptions(userOptions);
|
|
13
|
-
const packageJsonPath =
|
|
14
|
-
const { packageJson, targets, packageName, binaryName, npmClient } = await readNapiConfig(packageJsonPath);
|
|
13
|
+
const packageJsonPath = resolve(options.cwd, options.packageJsonPath);
|
|
14
|
+
const { packageJson, targets, packageName, binaryName, npmClient } = await readNapiConfig(packageJsonPath, options.configPath ? resolve(options.cwd, options.configPath) : undefined);
|
|
15
15
|
async function createGhRelease(packageName, version) {
|
|
16
16
|
if (!options.ghRelease) {
|
|
17
17
|
return {
|
|
@@ -100,7 +100,8 @@ export async function prePublish(userOptions) {
|
|
|
100
100
|
: await createGhRelease(packageName, packageJson.version);
|
|
101
101
|
for (const target of targets) {
|
|
102
102
|
const pkgDir = resolve(options.cwd, options.npmDir, `${target.platformArchABI}`);
|
|
103
|
-
const
|
|
103
|
+
const ext = target.platform === 'wasi' || target.platform === 'wasm' ? 'wasm' : 'node';
|
|
104
|
+
const filename = `${binaryName}.${target.platformArchABI}.${ext}`;
|
|
104
105
|
const dstPath = join(pkgDir, filename);
|
|
105
106
|
if (!options.dryRun) {
|
|
106
107
|
if (!existsSync(dstPath)) {
|
|
@@ -132,7 +133,8 @@ export async function prePublish(userOptions) {
|
|
|
132
133
|
'content-length': dstFileStats.size,
|
|
133
134
|
'content-type': 'application/octet-stream',
|
|
134
135
|
},
|
|
135
|
-
|
|
136
|
+
// @ts-expect-error octokit types are wrong
|
|
137
|
+
data: await readFileAsync(dstPath),
|
|
136
138
|
});
|
|
137
139
|
debug.info(`GitHub release created`);
|
|
138
140
|
debug.info(`Download URL: %s`, assetInfo.data.browser_download_url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pre-publish.js","sourceRoot":"","sources":["../../src/api/pre-publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pre-publish.js","sourceRoot":"","sources":["../../src/api/pre-publish.ts"],"names":[],"mappings":"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"}
|
package/dist/api/rename.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve } from 'path';
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
2
|
import { isNil, merge, omitBy, pick } from 'lodash-es';
|
|
3
3
|
import { applyDefaultRenameOptions } from '../def/rename.js';
|
|
4
4
|
import { readFileAsync, writeFileAsync } from '../utils/index.js';
|
|
@@ -15,6 +15,14 @@ export async function renameProject(userOptions) {
|
|
|
15
15
|
packageName: options.packageName,
|
|
16
16
|
}, isNil),
|
|
17
17
|
});
|
|
18
|
+
if (options.configPath) {
|
|
19
|
+
const configPath = resolve(options.cwd, options.configPath);
|
|
20
|
+
const configContent = await readFileAsync(configPath, 'utf8');
|
|
21
|
+
const configData = JSON.parse(configContent);
|
|
22
|
+
configData.binaryName = options.binaryName;
|
|
23
|
+
configData.packageName = options.packageName;
|
|
24
|
+
await writeFileAsync(configPath, JSON.stringify(configData, null, 2));
|
|
25
|
+
}
|
|
18
26
|
await writeFileAsync(packageJsonPath, JSON.stringify(packageJsonData, null, 2));
|
|
19
27
|
let tomlContent = await readFileAsync(cargoTomlPath, 'utf8');
|
|
20
28
|
tomlContent = tomlContent.replace(/name\s?=\s?"([\w+])"/, `name = "${options.binaryName}"`);
|
package/dist/api/rename.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/api/rename.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"rename.js","sourceRoot":"","sources":["../../src/api/rename.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEtD,OAAO,EAAE,yBAAyB,EAAiB,MAAM,kBAAkB,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,WAA0B;IAC5D,MAAM,OAAO,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAA;IAEtD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IACrE,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IAEhE,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;IACvE,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAEtD,KAAK,CACH,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,EAC1E;QACE,IAAI,EAAE,MAAM,CACV;YACE,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,EACD,KAAK,CACN;KACF,CACF,CAAA;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QAC3D,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QAC5C,UAAU,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QAC1C,UAAU,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAA;QAC5C,MAAM,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,MAAM,cAAc,CAClB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CACzC,CAAA;IAED,IAAI,WAAW,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAC5D,WAAW,GAAG,WAAW,CAAC,OAAO,CAC/B,sBAAsB,EACtB,WAAW,OAAO,CAAC,UAAU,GAAG,CACjC,CAAA;IACD,MAAM,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAA;IAEhD,MAAM,aAAa,CAAC;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,KAAK;KACd,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
import type { SupportedPackageManager } from '../../utils/config.js';
|
|
2
|
+
export type WasiTargetName = 'wasm32-wasi-preview1-threads' | 'wasm32-wasip1-threads' | 'wasm32-wasip2';
|
|
3
|
+
export declare const YAML: (packageManager: SupportedPackageManager, wasiTargetName: WasiTargetName) => string;
|