diff --git a/dist/cli/index.js b/dist/cli/index.js index d11086bf..b356ff6d 100755 --- a/dist/cli/index.js +++ b/dist/cli/index.js @@ -42113,7 +42113,7 @@ const add_OPTIONS = [ ]; class Add { static summary() { return 'Add a platform or platform preset to a Neon project.'; } - static syntax() { return 'neon add [
| --os --arch [--abi | --os --arch [--abi ', summary: 'A Node platform or platform preset.' },
@@ -46093,6 +46093,14 @@ module.exports = eval("require")("@cargo-messages/linux-arm-gnueabihf");
module.exports = eval("require")("@cargo-messages/linux-arm64-gnu");
+/***/ }),
+
+/***/ 4134:
+/***/ ((module) => {
+
+module.exports = eval("require")("@cargo-messages/linux-arm64-musl");
+
+
/***/ }),
/***/ 1316:
@@ -46101,6 +46109,14 @@ module.exports = eval("require")("@cargo-messages/linux-arm64-gnu");
module.exports = eval("require")("@cargo-messages/linux-x64-gnu");
+/***/ }),
+
+/***/ 6469:
+/***/ ((module) => {
+
+module.exports = eval("require")("@cargo-messages/linux-x64-musl");
+
+
/***/ }),
/***/ 7894:
@@ -60877,7 +60893,9 @@ module.exports = (__nccwpck_require__(8372)/* .proxy */ .sj)({
'linux-x64-gnu': () => __nccwpck_require__(1316),
'linux-arm-gnueabihf': () => __nccwpck_require__(5379),
'android-arm-eabi': () => __nccwpck_require__(1738),
- 'linux-arm64-gnu': () => __nccwpck_require__(1713)
+ 'linux-arm64-gnu': () => __nccwpck_require__(1713),
+ 'linux-arm64-musl': () => __nccwpck_require__(4134),
+ 'linux-x64-musl': () => __nccwpck_require__(6469)
});
@@ -61829,9 +61847,11 @@ exports.expandPlatformPreset = expandPlatformPreset;
function expandPlatformFamily(family) {
return isPlatformPreset(family)
? expandPlatformPreset(family)
- : Array.isArray(family)
- ? merge(family.map(expandPlatformFamily))
- : family;
+ : isNodePlatform(family)
+ ? { [family]: node2Rust(family)[0] }
+ : Array.isArray(family)
+ ? merge(family.map(expandPlatformFamily))
+ : family;
}
exports.expandPlatformFamily = expandPlatformFamily;
function describeTarget(target) {
diff --git a/dist/cli/package.json b/dist/cli/package.json
index 5f423888..8b781b9b 100644
--- a/dist/cli/package.json
+++ b/dist/cli/package.json
@@ -27,15 +27,15 @@
},
"homepage": "https://github.com/dherman/neon-rs#readme",
"optionalDependencies": {
- "@cargo-messages/android-arm-eabi": "0.1.78",
- "@cargo-messages/darwin-arm64": "0.1.78",
- "@cargo-messages/darwin-x64": "0.1.78",
- "@cargo-messages/linux-arm-gnueabihf": "0.1.78",
- "@cargo-messages/linux-arm64-gnu": "0.1.78",
- "@cargo-messages/linux-arm64-musl": "0.1.78",
- "@cargo-messages/linux-x64-gnu": "0.1.78",
- "@cargo-messages/linux-x64-musl": "0.1.78",
- "@cargo-messages/win32-arm64-msvc": "0.1.78",
- "@cargo-messages/win32-x64-msvc": "0.1.78"
+ "@cargo-messages/android-arm-eabi": "0.1.79",
+ "@cargo-messages/darwin-arm64": "0.1.79",
+ "@cargo-messages/darwin-x64": "0.1.79",
+ "@cargo-messages/linux-arm-gnueabihf": "0.1.79",
+ "@cargo-messages/linux-arm64-gnu": "0.1.79",
+ "@cargo-messages/linux-arm64-musl": "0.1.79",
+ "@cargo-messages/linux-x64-gnu": "0.1.79",
+ "@cargo-messages/linux-x64-musl": "0.1.79",
+ "@cargo-messages/win32-arm64-msvc": "0.1.79",
+ "@cargo-messages/win32-x64-msvc": "0.1.79"
}
}
diff --git a/dist/package-lock.json b/dist/package-lock.json
index 8fad7afb..f0d6722a 100644
--- a/dist/package-lock.json
+++ b/dist/package-lock.json
@@ -20,25 +20,25 @@
"neon": "index.js"
},
"optionalDependencies": {
- "@cargo-messages/android-arm-eabi": "0.1.78",
- "@cargo-messages/darwin-arm64": "0.1.78",
- "@cargo-messages/darwin-x64": "0.1.78",
- "@cargo-messages/linux-arm-gnueabihf": "0.1.78",
- "@cargo-messages/linux-arm64-gnu": "0.1.78",
- "@cargo-messages/linux-arm64-musl": "0.1.78",
- "@cargo-messages/linux-x64-gnu": "0.1.78",
- "@cargo-messages/linux-x64-musl": "0.1.78",
- "@cargo-messages/win32-arm64-msvc": "0.1.78",
- "@cargo-messages/win32-x64-msvc": "0.1.78"
+ "@cargo-messages/android-arm-eabi": "0.1.79",
+ "@cargo-messages/darwin-arm64": "0.1.79",
+ "@cargo-messages/darwin-x64": "0.1.79",
+ "@cargo-messages/linux-arm-gnueabihf": "0.1.79",
+ "@cargo-messages/linux-arm64-gnu": "0.1.79",
+ "@cargo-messages/linux-arm64-musl": "0.1.79",
+ "@cargo-messages/linux-x64-gnu": "0.1.79",
+ "@cargo-messages/linux-x64-musl": "0.1.79",
+ "@cargo-messages/win32-arm64-msvc": "0.1.79",
+ "@cargo-messages/win32-x64-msvc": "0.1.79"
}
},
"install": {
"version": "0.1.79"
},
"node_modules/@cargo-messages/android-arm-eabi": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.78.tgz",
- "integrity": "sha512-8tJipA3LSHIlG8LPY+mrbAmk6+fhywjgw+p0YLefHjyJv4SzT1VdTlhWVVuw0/F5WQTBiKmcS++76cGj0PCxSg==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.79.tgz",
+ "integrity": "sha512-/oeN1yDs7WRmCgPV/t+z6eVvRUtLLgDFHOhRlwGMl4w4T3tIouHk+0eZ/VrWiF0axraQbhoFQjKWEipF3dZ2Sw==",
"cpu": [
"arm"
],
@@ -48,9 +48,9 @@
]
},
"node_modules/@cargo-messages/darwin-arm64": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.78.tgz",
- "integrity": "sha512-AXismc3EnNKV4lxOkg23k91pyVE6rD6LTTqoFXt+BZ0JtLEIZoEUsP/xU+JTsQd0EZ6LEMlU4/hJzB4UI8uC0w==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.79.tgz",
+ "integrity": "sha512-n/AKNo+Omn7C/aCtT0TalysAugmr+JNFKj+aATGyhPyyhXyz+Dp8IFxlxRGwDHddh/vDmPTXEkf/JZ5zG4jH0Q==",
"cpu": [
"arm64"
],
@@ -60,9 +60,9 @@
]
},
"node_modules/@cargo-messages/darwin-x64": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.78.tgz",
- "integrity": "sha512-6KFzHua2CBof+Ndw6CfgnDStt6Z2U+ZgLYf5h6ZdhP0tMymzI7V5F3u/PSB9gShNNILRZd1gRwSk1YMQlIetAA==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.79.tgz",
+ "integrity": "sha512-RYbDMbwHGXqRCZQZ1/LJ6hj8SomJmq0LGsg9risAVPWtsNZOzlM//svUacVK/BP5lht3whqNI+i3AKhW4ZyDXA==",
"cpu": [
"x64"
],
@@ -72,9 +72,9 @@
]
},
"node_modules/@cargo-messages/linux-arm-gnueabihf": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.78.tgz",
- "integrity": "sha512-QIm7JQwTjX8FHLx+s0qUsCfroKLJQcBT4d4+ZsVEGTD5LQsBhhpAxZJVKjxU8hd6pvnOz9YweEHBKBwJUpzS+Q==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.79.tgz",
+ "integrity": "sha512-/pv9x72szwzssjpNGJeVlneGAHRw7iiw0xyASqfdlCxwk22nQZhyWDaXNbDa0fzt9QGB4WAiUgXuB/ndQkdsOA==",
"cpu": [
"arm"
],
@@ -84,9 +84,21 @@
]
},
"node_modules/@cargo-messages/linux-arm64-gnu": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm64-gnu/-/linux-arm64-gnu-0.1.78.tgz",
- "integrity": "sha512-OZ/eyM+Abp/N+l6dawBnm5W/32T+yZ51BM4mz8I0aXaACVQueiHkal+K/ZuqcIUK2blhDRJKD7HNshSK3PPmgA==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm64-gnu/-/linux-arm64-gnu-0.1.79.tgz",
+ "integrity": "sha512-CGtVi8oCjLvNhXBA/HlSXaCUQbsZg5r+7WC/0OG5OKeTnyXycQNRsICgoQjvY6E1GVc5Xq/jFWFsHovEdurPXA==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@cargo-messages/linux-arm64-musl": {
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm64-musl/-/linux-arm64-musl-0.1.79.tgz",
+ "integrity": "sha512-rD0rwn6QXgldFkCr7G+8rFGXCohuPVNZ1w44gtGjm1+hP82XLDl4P/o2V0d7z6QbU9mYLzlV/krKUX9qT0QfmQ==",
"cpu": [
"arm64"
],
@@ -96,9 +108,21 @@
]
},
"node_modules/@cargo-messages/linux-x64-gnu": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.78.tgz",
- "integrity": "sha512-OIz58kwu5X6F7+svgEWqccN/vDLQtOEff0ALdmDQ41eNBR0gCI1UOl4egOoH7aUs8ecX7KRTQaM+zrc2KPAM4w==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.79.tgz",
+ "integrity": "sha512-5LbuSXPUg1MC8udA1JyPvZCdw1qKal/H8TVvzQD2Xjuy4opO9VAHhHuX+CXOGnRccifoqRqqpoYNdet/Vvr17g==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@cargo-messages/linux-x64-musl": {
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-musl/-/linux-x64-musl-0.1.79.tgz",
+ "integrity": "sha512-X534cnyLAtgUQaNptK1fKbB8gBVGmAvLfLkJnhrT7hlBz065VLngzLojIjQqardanfl5WLJmV33SN8F8OiBITw==",
"cpu": [
"x64"
],
@@ -108,9 +132,9 @@
]
},
"node_modules/@cargo-messages/win32-arm64-msvc": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.78.tgz",
- "integrity": "sha512-00ClCoBo8rZvqqbzwjX1+/pg9o1ph6KAJklcJZLEMtdVd4WSAeYafIjdtVBNDnpWxAGgBfBHVF16CO+artpbaA==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.79.tgz",
+ "integrity": "sha512-yB3H3ApH7STFMacrjouUFH3OvIszFQI7gNMmML0EBrRoRcBfIEBW0/FWQPWpTSQE0HQV7Jr/EKgaSdnudC4NRA==",
"cpu": [
"arm64"
],
@@ -120,9 +144,9 @@
]
},
"node_modules/@cargo-messages/win32-x64-msvc": {
- "version": "0.1.78",
- "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.78.tgz",
- "integrity": "sha512-RGmn7EaULjCPK+rNjz6B6PFTm8zpPRlPxFudBh4UYFXdQEJ+8bkI0h1qmaWhwRmKmrWo1mng1VSivdrReKJ8Sw==",
+ "version": "0.1.79",
+ "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.79.tgz",
+ "integrity": "sha512-x0qT4QIaGfOiFpotN1ysuv8VK7JXAqUjc47wgKPkTHfCNPqnapkqD2pTrzpWhSkwNGYc6a53JQqHO/M0NwSJsw==",
"cpu": [
"x64"
],
diff --git a/src/cli/package.json b/src/cli/package.json
index 7df85db2..ee2cc9f1 100644
--- a/src/cli/package.json
+++ b/src/cli/package.json
@@ -58,8 +58,8 @@
"dependencies": {
"@neon-rs/artifact": "^0.1.0",
"@neon-rs/load": "^0.0.181",
- "@neon-rs/manifest": "^0.1.1",
- "cargo-messages": "^0.1.78",
+ "@neon-rs/manifest": "^0.1.2",
+ "cargo-messages": "^0.1.79",
"chalk": "^5.2.0",
"command-line-args": "^5.2.1",
"command-line-commands": "^3.0.2",
@@ -70,15 +70,15 @@
"temp": "^0.9.4"
},
"optionalDependencies": {
- "@cargo-messages/android-arm-eabi": "0.1.78",
- "@cargo-messages/darwin-arm64": "0.1.78",
- "@cargo-messages/darwin-x64": "0.1.78",
- "@cargo-messages/linux-arm-gnueabihf": "0.1.78",
- "@cargo-messages/linux-arm64-gnu": "0.1.78",
- "@cargo-messages/linux-arm64-musl": "0.1.78",
- "@cargo-messages/linux-x64-gnu": "0.1.78",
- "@cargo-messages/linux-x64-musl": "0.1.78",
- "@cargo-messages/win32-arm64-msvc": "0.1.78",
- "@cargo-messages/win32-x64-msvc": "0.1.78"
+ "@cargo-messages/android-arm-eabi": "0.1.79",
+ "@cargo-messages/darwin-arm64": "0.1.79",
+ "@cargo-messages/darwin-x64": "0.1.79",
+ "@cargo-messages/linux-arm-gnueabihf": "0.1.79",
+ "@cargo-messages/linux-arm64-gnu": "0.1.79",
+ "@cargo-messages/linux-arm64-musl": "0.1.79",
+ "@cargo-messages/linux-x64-gnu": "0.1.79",
+ "@cargo-messages/linux-x64-musl": "0.1.79",
+ "@cargo-messages/win32-arm64-msvc": "0.1.79",
+ "@cargo-messages/win32-x64-msvc": "0.1.79"
}
}
diff --git a/src/cli/src/commands/add.ts b/src/cli/src/commands/add.ts
index 1a6751dc..f3cd30ff 100644
--- a/src/cli/src/commands/add.ts
+++ b/src/cli/src/commands/add.ts
@@ -20,7 +20,7 @@ const OPTIONS = [
export default class Add implements Command {
static summary(): string { return 'Add a platform or platform preset to a Neon project.'; }
- static syntax(): string { return 'neon add [ | --os --arch [--abi