From 80e361974dd7cbc3529368d6e802632bfbae7428 Mon Sep 17 00:00:00 2001 From: David Herman Date: Sun, 24 Mar 2024 17:48:15 -0700 Subject: [PATCH] npm run dist && npm i --- dist/cli/index.js | 15 ------- dist/cli/package.json | 14 +++---- dist/package-lock.json | 56 +++++++++++++------------- src/cli/package.json | 16 ++++---- src/cli/src/commands/dist.ts | 18 --------- src/package-lock.json | 78 ++++++++++++++++++------------------ 6 files changed, 82 insertions(+), 115 deletions(-) diff --git a/dist/cli/index.js b/dist/cli/index.js index cab07478..283398b6 100755 --- a/dist/cli/index.js +++ b/dist/cli/index.js @@ -40414,21 +40414,6 @@ class Dist { throw new Error(`No artifacts were generated for crate ${this._crateName}`); } return file; - // const messages: CargoMessages = new CargoMessages({ - // mount: this._mount || undefined, - // manifestPath: this._manifestPath || undefined, - // file: this._log || undefined, - // verbose: this._verbose - // }); - // const artifact = messages.findArtifact(this._crateName); - // if (!artifact) { - // throw new Error(`No artifacts were generated for crate ${this._crateName}`); - // } - // const file = artifact.findFileByCrateType('cdylib'); - // if (!file) { - // throw new Error(`No cdylib artifact found for crate ${this._crateName}`); - // } - // return file; } log(msg) { if (this._verbose) { diff --git a/dist/cli/package.json b/dist/cli/package.json index dc38a23b..4977c0a0 100644 --- a/dist/cli/package.json +++ b/dist/cli/package.json @@ -27,12 +27,12 @@ }, "homepage": "https://github.com/dherman/neon-rs#readme", "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.52", - "@cargo-messages/darwin-arm64": "0.1.52", - "@cargo-messages/darwin-x64": "0.1.52", - "@cargo-messages/linux-arm-gnueabihf": "0.1.52", - "@cargo-messages/linux-x64-gnu": "0.1.52", - "@cargo-messages/win32-arm64-msvc": "0.1.52", - "@cargo-messages/win32-x64-msvc": "0.1.52" + "@cargo-messages/android-arm-eabi": "0.1.54", + "@cargo-messages/darwin-arm64": "0.1.54", + "@cargo-messages/darwin-x64": "0.1.54", + "@cargo-messages/linux-arm-gnueabihf": "0.1.54", + "@cargo-messages/linux-x64-gnu": "0.1.54", + "@cargo-messages/win32-arm64-msvc": "0.1.54", + "@cargo-messages/win32-x64-msvc": "0.1.54" } } diff --git a/dist/package-lock.json b/dist/package-lock.json index 01cb269b..f29877a5 100644 --- a/dist/package-lock.json +++ b/dist/package-lock.json @@ -20,22 +20,22 @@ "neon": "index.js" }, "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.52", - "@cargo-messages/darwin-arm64": "0.1.52", - "@cargo-messages/darwin-x64": "0.1.52", - "@cargo-messages/linux-arm-gnueabihf": "0.1.52", - "@cargo-messages/linux-x64-gnu": "0.1.52", - "@cargo-messages/win32-arm64-msvc": "0.1.52", - "@cargo-messages/win32-x64-msvc": "0.1.52" + "@cargo-messages/android-arm-eabi": "0.1.54", + "@cargo-messages/darwin-arm64": "0.1.54", + "@cargo-messages/darwin-x64": "0.1.54", + "@cargo-messages/linux-arm-gnueabihf": "0.1.54", + "@cargo-messages/linux-x64-gnu": "0.1.54", + "@cargo-messages/win32-arm64-msvc": "0.1.54", + "@cargo-messages/win32-x64-msvc": "0.1.54" } }, "install": { "version": "0.1.54" }, "node_modules/@cargo-messages/android-arm-eabi": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.52.tgz", - "integrity": "sha512-tv2diNs0jtjvQwmfya09N3XuUSw0SeqJ1IJYt/AOl2A5UmZ7nsVtJGRxXd8LedPL5SM0CdQpNToQ2N5msfCJiw==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.54.tgz", + "integrity": "sha512-xZujTWtQopEV6GVxnv/hRoVrQ289TxXCJ+FO2lRR0w9HhR6A/5wQmkOm8bG6/W5Brj3NRL206GSwCfPF14nmJQ==", "cpu": [ "arm" ], @@ -45,9 +45,9 @@ ] }, "node_modules/@cargo-messages/darwin-arm64": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.52.tgz", - "integrity": "sha512-/OBXiwtsutRHPaCT8esWOkRlEjDFIkX9w18Oads36GpNiomRApxp6iDHueGEAczSdCHpZn3xRFxfOSvCRUC88A==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.54.tgz", + "integrity": "sha512-I8kZk5htgmyB0tpwEtmrwqoij1wjfWVy6e0ks3QPv5k4Vt9xzgZ6jphalExPNdunbXEuCJOEYoR7uQ/5k+Y67A==", "cpu": [ "arm64" ], @@ -57,9 +57,9 @@ ] }, "node_modules/@cargo-messages/darwin-x64": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.52.tgz", - "integrity": "sha512-nxgGBQAfS8iUH4z38MC5FD/PjcW+4v/dwyguco9XcerDJaed8IJ4SxYP6gCq2na+zsYgvVDGzwXYkvUzAvT5yQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.54.tgz", + "integrity": "sha512-WMqvFQ7B3Mh71tl5U9IRRglD73HvGJLjll+4pO/vnLmoPEdSIayFWMOn/LSGSJITA9EEIdujAbWQb8BaEV5xbg==", "cpu": [ "x64" ], @@ -69,9 +69,9 @@ ] }, "node_modules/@cargo-messages/linux-arm-gnueabihf": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.52.tgz", - "integrity": "sha512-tnxZbyaGSx1ZvO+R9Ri6xeRzYu33duFUgdvqH8kEhD17kLDodWOqvYrzrbkxvsqrt94p7+wya1EY4VEII7GIYA==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.54.tgz", + "integrity": "sha512-HD4KlmbFRsYmRPhdxa8XOD2UWSGW0Ck2z2dzOU625bqJsu6WsQvNWEFT+AkZj9Ci217Jdg1BulVMYYUouYeqvA==", "cpu": [ "arm" ], @@ -81,9 +81,9 @@ ] }, "node_modules/@cargo-messages/linux-x64-gnu": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.52.tgz", - "integrity": "sha512-sw89GDTXueAbvDceCpX0I30mgVOGbNBPva+tPzhMPV3s+IXOJLMKm35yfVgl98Xe/4h1M8JV1QawKuAbf94cuQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.54.tgz", + "integrity": "sha512-LQ/oYYsmsAzjxP9B/hNNXYYHJrTJ418GwcF/CwjptYSiP8tLbkg0pM0rkHOlaAA4PbwcwY5j0Oo+prajsL1f5g==", "cpu": [ "x64" ], @@ -93,9 +93,9 @@ ] }, "node_modules/@cargo-messages/win32-arm64-msvc": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.52.tgz", - "integrity": "sha512-WbG7QcD04clo68wW2f4GMeyKPdgrMaFROb33YwBCzdr9tFm+417FhIBPSiOjlz+85kbHiMOLu1MM0HQhwpWldQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.54.tgz", + "integrity": "sha512-oROIhiW4a/XzJ8ERRQ5otL8W2SPiyqspWiwIP1MEH84Qn0qgE2FQkLuyJLydLAOTlalmAlNY7Me5VLH9tkt3wA==", "cpu": [ "arm64" ], @@ -105,9 +105,9 @@ ] }, "node_modules/@cargo-messages/win32-x64-msvc": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.52.tgz", - "integrity": "sha512-kGPtxijctIykvk969U3CA0KgNJkybkHaulDRgSxWbxnpJWz7QIp/x9+DwGHeHnR4Id2nowGSrYIaP//leE9xUA==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.54.tgz", + "integrity": "sha512-jRJjj1CYqFWSPuVr23yIHoptA/YDVKHmK1uz6evvv/vZw4bdlTF3obyv4FtrtLzDc/IPoTpFFvxFonpggHB0JQ==", "cpu": [ "x64" ], diff --git a/src/cli/package.json b/src/cli/package.json index 17a2a941..8698cc05 100644 --- a/src/cli/package.json +++ b/src/cli/package.json @@ -54,7 +54,7 @@ "dependencies": { "@neon-rs/load": "^0.0.181", "@neon-rs/manifest": "^0.0.5", - "cargo-messages": "^0.1.52", + "cargo-messages": "^0.1.54", "chalk": "^5.2.0", "command-line-args": "^5.2.1", "command-line-commands": "^3.0.2", @@ -65,12 +65,12 @@ "temp": "^0.9.4" }, "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.52", - "@cargo-messages/darwin-arm64": "0.1.52", - "@cargo-messages/darwin-x64": "0.1.52", - "@cargo-messages/linux-arm-gnueabihf": "0.1.52", - "@cargo-messages/linux-x64-gnu": "0.1.52", - "@cargo-messages/win32-arm64-msvc": "0.1.52", - "@cargo-messages/win32-x64-msvc": "0.1.52" + "@cargo-messages/android-arm-eabi": "0.1.54", + "@cargo-messages/darwin-arm64": "0.1.54", + "@cargo-messages/darwin-x64": "0.1.54", + "@cargo-messages/linux-arm-gnueabihf": "0.1.54", + "@cargo-messages/linux-x64-gnu": "0.1.54", + "@cargo-messages/win32-arm64-msvc": "0.1.54", + "@cargo-messages/win32-x64-msvc": "0.1.54" } } diff --git a/src/cli/src/commands/dist.ts b/src/cli/src/commands/dist.ts index 43e649cc..5f44fa15 100644 --- a/src/cli/src/commands/dist.ts +++ b/src/cli/src/commands/dist.ts @@ -157,24 +157,6 @@ export default class Dist implements Command { } return file; - // const messages: CargoMessages = new CargoMessages({ - // mount: this._mount || undefined, - // manifestPath: this._manifestPath || undefined, - // file: this._log || undefined, - // verbose: this._verbose - // }); - - // const artifact = messages.findArtifact(this._crateName); - // if (!artifact) { - // throw new Error(`No artifacts were generated for crate ${this._crateName}`); - // } - - // const file = artifact.findFileByCrateType('cdylib'); - // if (!file) { - // throw new Error(`No cdylib artifact found for crate ${this._crateName}`); - // } - - // return file; } log(msg: string) { diff --git a/src/package-lock.json b/src/package-lock.json index 23b2726f..f8ef2d96 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -31,7 +31,7 @@ "dependencies": { "@neon-rs/load": "^0.0.181", "@neon-rs/manifest": "^0.0.5", - "cargo-messages": "^0.1.52", + "cargo-messages": "^0.1.54", "chalk": "^5.2.0", "command-line-args": "^5.2.1", "command-line-commands": "^3.0.2", @@ -57,19 +57,19 @@ "typescript": "^5.0.4" }, "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.52", - "@cargo-messages/darwin-arm64": "0.1.52", - "@cargo-messages/darwin-x64": "0.1.52", - "@cargo-messages/linux-arm-gnueabihf": "0.1.52", - "@cargo-messages/linux-x64-gnu": "0.1.52", - "@cargo-messages/win32-arm64-msvc": "0.1.52", - "@cargo-messages/win32-x64-msvc": "0.1.52" + "@cargo-messages/android-arm-eabi": "0.1.54", + "@cargo-messages/darwin-arm64": "0.1.54", + "@cargo-messages/darwin-x64": "0.1.54", + "@cargo-messages/linux-arm-gnueabihf": "0.1.54", + "@cargo-messages/linux-x64-gnu": "0.1.54", + "@cargo-messages/win32-arm64-msvc": "0.1.54", + "@cargo-messages/win32-x64-msvc": "0.1.54" } }, "cli/node_modules/@cargo-messages/android-arm-eabi": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.52.tgz", - "integrity": "sha512-tv2diNs0jtjvQwmfya09N3XuUSw0SeqJ1IJYt/AOl2A5UmZ7nsVtJGRxXd8LedPL5SM0CdQpNToQ2N5msfCJiw==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.54.tgz", + "integrity": "sha512-xZujTWtQopEV6GVxnv/hRoVrQ289TxXCJ+FO2lRR0w9HhR6A/5wQmkOm8bG6/W5Brj3NRL206GSwCfPF14nmJQ==", "cpu": [ "arm" ], @@ -79,9 +79,9 @@ ] }, "cli/node_modules/@cargo-messages/darwin-arm64": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.52.tgz", - "integrity": "sha512-/OBXiwtsutRHPaCT8esWOkRlEjDFIkX9w18Oads36GpNiomRApxp6iDHueGEAczSdCHpZn3xRFxfOSvCRUC88A==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.54.tgz", + "integrity": "sha512-I8kZk5htgmyB0tpwEtmrwqoij1wjfWVy6e0ks3QPv5k4Vt9xzgZ6jphalExPNdunbXEuCJOEYoR7uQ/5k+Y67A==", "cpu": [ "arm64" ], @@ -91,9 +91,9 @@ ] }, "cli/node_modules/@cargo-messages/darwin-x64": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.52.tgz", - "integrity": "sha512-nxgGBQAfS8iUH4z38MC5FD/PjcW+4v/dwyguco9XcerDJaed8IJ4SxYP6gCq2na+zsYgvVDGzwXYkvUzAvT5yQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.54.tgz", + "integrity": "sha512-WMqvFQ7B3Mh71tl5U9IRRglD73HvGJLjll+4pO/vnLmoPEdSIayFWMOn/LSGSJITA9EEIdujAbWQb8BaEV5xbg==", "cpu": [ "x64" ], @@ -103,9 +103,9 @@ ] }, "cli/node_modules/@cargo-messages/linux-arm-gnueabihf": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.52.tgz", - "integrity": "sha512-tnxZbyaGSx1ZvO+R9Ri6xeRzYu33duFUgdvqH8kEhD17kLDodWOqvYrzrbkxvsqrt94p7+wya1EY4VEII7GIYA==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.54.tgz", + "integrity": "sha512-HD4KlmbFRsYmRPhdxa8XOD2UWSGW0Ck2z2dzOU625bqJsu6WsQvNWEFT+AkZj9Ci217Jdg1BulVMYYUouYeqvA==", "cpu": [ "arm" ], @@ -115,9 +115,9 @@ ] }, "cli/node_modules/@cargo-messages/linux-x64-gnu": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.52.tgz", - "integrity": "sha512-sw89GDTXueAbvDceCpX0I30mgVOGbNBPva+tPzhMPV3s+IXOJLMKm35yfVgl98Xe/4h1M8JV1QawKuAbf94cuQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.54.tgz", + "integrity": "sha512-LQ/oYYsmsAzjxP9B/hNNXYYHJrTJ418GwcF/CwjptYSiP8tLbkg0pM0rkHOlaAA4PbwcwY5j0Oo+prajsL1f5g==", "cpu": [ "x64" ], @@ -127,9 +127,9 @@ ] }, "cli/node_modules/@cargo-messages/win32-arm64-msvc": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.52.tgz", - "integrity": "sha512-WbG7QcD04clo68wW2f4GMeyKPdgrMaFROb33YwBCzdr9tFm+417FhIBPSiOjlz+85kbHiMOLu1MM0HQhwpWldQ==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.54.tgz", + "integrity": "sha512-oROIhiW4a/XzJ8ERRQ5otL8W2SPiyqspWiwIP1MEH84Qn0qgE2FQkLuyJLydLAOTlalmAlNY7Me5VLH9tkt3wA==", "cpu": [ "arm64" ], @@ -139,9 +139,9 @@ ] }, "cli/node_modules/@cargo-messages/win32-x64-msvc": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.52.tgz", - "integrity": "sha512-kGPtxijctIykvk969U3CA0KgNJkybkHaulDRgSxWbxnpJWz7QIp/x9+DwGHeHnR4Id2nowGSrYIaP//leE9xUA==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.54.tgz", + "integrity": "sha512-jRJjj1CYqFWSPuVr23yIHoptA/YDVKHmK1uz6evvv/vZw4bdlTF3obyv4FtrtLzDc/IPoTpFFvxFonpggHB0JQ==", "cpu": [ "x64" ], @@ -156,20 +156,20 @@ "integrity": "sha512-teRPDgstiKQE91WsvnW4mAdTSEPUdi9a8b98IPVhm2R5MT1elzxeTFidP56JfqtzocZFYDetCwEcPB3xCIR4pg==" }, "cli/node_modules/cargo-messages": { - "version": "0.1.52", - "resolved": "https://registry.npmjs.org/cargo-messages/-/cargo-messages-0.1.52.tgz", - "integrity": "sha512-FvzW3nBtv1xLdnq3afu4sLCTuw3iLSoYoOtAyMLS9GjX9PU/j/hyGfpE0MGT1YfQW9lhjxb86ogEVYpYrAo5ng==", + "version": "0.1.54", + "resolved": "https://registry.npmjs.org/cargo-messages/-/cargo-messages-0.1.54.tgz", + "integrity": "sha512-NglplpDdJQkkXOTUz2f2SkxLUGOCVMx5HZV1KweRXQpPsX6tHOYv/LLivYS/p3IlWcsGMKKNb/7CPmU0Hn02yA==", "dependencies": { "@neon-rs/load": "^0.1.49" }, "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.52", - "@cargo-messages/darwin-arm64": "0.1.52", - "@cargo-messages/darwin-x64": "0.1.52", - "@cargo-messages/linux-arm-gnueabihf": "0.1.52", - "@cargo-messages/linux-x64-gnu": "0.1.52", - "@cargo-messages/win32-arm64-msvc": "0.1.52", - "@cargo-messages/win32-x64-msvc": "0.1.52" + "@cargo-messages/android-arm-eabi": "0.1.54", + "@cargo-messages/darwin-arm64": "0.1.54", + "@cargo-messages/darwin-x64": "0.1.54", + "@cargo-messages/linux-arm-gnueabihf": "0.1.54", + "@cargo-messages/linux-x64-gnu": "0.1.54", + "@cargo-messages/win32-arm64-msvc": "0.1.54", + "@cargo-messages/win32-x64-msvc": "0.1.54" } }, "cli/node_modules/cargo-messages/node_modules/@neon-rs/load": {