From 31728353feeeb2bceda3040ad1c3efff38e51390 Mon Sep 17 00:00:00 2001 From: David Herman Date: Sun, 25 Aug 2024 08:08:28 -0700 Subject: [PATCH] Allow mixing platforms and platform presets in a list (e.g. `["desktop", "linux-arm64-musl"]`) --- dist/cli/index.js | 30 +++++-- dist/cli/package.json | 20 ++--- dist/package-lock.json | 92 ++++++++++++-------- src/cli/package.json | 24 +++--- src/cli/src/commands/add.ts | 2 +- src/manifest/package.json | 2 +- src/manifest/src/platform.cts | 7 +- src/package-lock.json | 152 ++++++++++++++++++++-------------- 8 files changed, 201 insertions(+), 128 deletions(-) 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 ]] [-o ] [-b ]'; } + static syntax() { return 'neon add [

| --os --arch [--abi ]] [-o ]'; } static options() { return [ { name: '

', 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 ]] [-o ] [-b ]'; } + static syntax(): string { return 'neon add [

| --os --arch [--abi ]] [-o ]'; } static options(): CommandDetail[] { return [ { name: '

', summary: 'A Node platform or platform preset.' }, diff --git a/src/manifest/package.json b/src/manifest/package.json index 10d57b73..1fdeb485 100644 --- a/src/manifest/package.json +++ b/src/manifest/package.json @@ -1,7 +1,7 @@ { "name": "@neon-rs/manifest", "private": false, - "version": "0.1.1", + "version": "0.1.2", "description": "Library for working with Neon package configuration.", "exports": { ".": { diff --git a/src/manifest/src/platform.cts b/src/manifest/src/platform.cts index 82ae5e1a..7f31f9d0 100644 --- a/src/manifest/src/platform.cts +++ b/src/manifest/src/platform.cts @@ -71,10 +71,11 @@ export function assertIsPlatformFamily(json: unknown, path: string): asserts jso export type TargetPair = { node: NodePlatform, rust: RustTarget }; export type PlatformMap = { [key in NodePlatform]?: RustTarget }; +export type PlatformName = NodePlatform | PlatformPreset; export type PlatformFamily = - PlatformPreset - | PlatformPreset[] + PlatformName + | PlatformName[] | PlatformMap; function lookupPlatformPreset(key: PlatformPreset): PlatformFamily { @@ -96,6 +97,8 @@ export function expandPlatformPreset(preset: PlatformPreset): PlatformMap { export function expandPlatformFamily(family: PlatformFamily): PlatformMap { return isPlatformPreset(family) ? expandPlatformPreset(family) + : isNodePlatform(family) + ? { [family]: node2Rust(family)[0] } : Array.isArray(family) ? merge(family.map(expandPlatformFamily)) : family; diff --git a/src/package-lock.json b/src/package-lock.json index 968fba99..5fb9f3ff 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -31,8 +31,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", @@ -62,22 +62,22 @@ "typescript": "^5.0.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" } }, "cli/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" ], @@ -87,9 +87,9 @@ ] }, "cli/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" ], @@ -99,9 +99,9 @@ ] }, "cli/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" ], @@ -111,9 +111,9 @@ ] }, "cli/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" ], @@ -122,22 +122,10 @@ "linux" ] }, - "cli/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==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ] - }, "cli/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" ], @@ -147,9 +135,9 @@ ] }, "cli/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" ], @@ -159,9 +147,9 @@ ] }, "cli/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" ], @@ -176,27 +164,29 @@ "integrity": "sha512-teRPDgstiKQE91WsvnW4mAdTSEPUdi9a8b98IPVhm2R5MT1elzxeTFidP56JfqtzocZFYDetCwEcPB3xCIR4pg==" }, "cli/node_modules/cargo-messages": { - "version": "0.1.78", - "resolved": "https://registry.npmjs.org/cargo-messages/-/cargo-messages-0.1.78.tgz", - "integrity": "sha512-OUVtLsLtC12vYYtSBdxrhj/xOkeu+uaAQf3Ijow3UlvSnMXcqMiVk9LN/iEm94jUIPSVBBl+xklzIheSA1m/vQ==", + "version": "0.1.79", + "resolved": "https://registry.npmjs.org/cargo-messages/-/cargo-messages-0.1.79.tgz", + "integrity": "sha512-/DMfU3bUC+MXTkz3ghxqxKycKfXXlVRZ0IFtMO30LDAwSsy6eAZN49O1V7ywrzOUx5Osjn/J6cuBYLp+emRtHg==", "dependencies": { - "@neon-rs/load": "^0.1.76" + "@neon-rs/load": "^0.1.78" }, "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-x64-gnu": "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" } }, "cli/node_modules/cargo-messages/node_modules/@neon-rs/load": { - "version": "0.1.77", - "resolved": "https://registry.npmjs.org/@neon-rs/load/-/load-0.1.77.tgz", - "integrity": "sha512-UmHRBmOK4HQz6CAzAAAZ0K7nc313XnN0yJLzSKGrhuL37oFSv6adL7VvA/bRfn15tnBLb3TBjWrjfiBM9wZElQ==" + "version": "0.1.79", + "resolved": "https://registry.npmjs.org/@neon-rs/load/-/load-0.1.79.tgz", + "integrity": "sha512-bh7KixeMd/ISDj35wU99Ic3UAXtv4iKDkKSfVvz891WksV7Oal2TJJs1nsxcBGZWnRyKCtQKqB8zjYDCNGLRaw==" }, "install": { "version": "0.1.79", @@ -986,6 +976,30 @@ "linux" ] }, + "node_modules/@cargo-messages/linux-arm64-gnu": { + "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" + ], + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@cargo-messages/linux-x64-gnu": { "version": "0.0.168", "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.0.168.tgz", @@ -998,6 +1012,18 @@ "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" + ], + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@cargo-messages/win32-arm64-msvc": { "version": "0.0.168", "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.0.168.tgz", @@ -1080,9 +1106,9 @@ "integrity": "sha512-zRkipoCMyu5eFdusb5DOcId/8zC/6xtM9+cM1E93AWAQvlEX2+PqFiltz6Fk57f6iZ6ASWrpdyqlzzGUHS9pbw==" }, "node_modules/@neon-rs/manifest": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@neon-rs/manifest/-/manifest-0.1.1.tgz", - "integrity": "sha512-QER7nG/yQYg/dOPTVyj++d35AUpsmaifm4jWxFYjT6jRzUfXC2XfaDdoJ0S2TrtoHN5Qvog232nxtzycYtRucA==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@neon-rs/manifest/-/manifest-0.1.2.tgz", + "integrity": "sha512-M06ueWcAJzj6obThwFtImJcl/AZZaqt5LlRQIgRPLiILPr5aMV0H29RqQDb0I0sO7rkciCXuoaKw3j6nFKS3wg==", "dependencies": { "jscodeshift": "^0.15.1" }