@neon-rs/cli 0.0.155 → 0.0.157

package/index.js

@@ -12022,6 +12022,23 @@ function lookup(target) {
     }
     return { node, ...node_namespaceObject[node] };
 }
+function extractPackageNameV1(targets, target) {
+    return targets[target];
+}
+function extractPackageNameV2(manifest, target) {
+    for (const key in manifest.neon.targets) {
+        if (key === target) {
+            return `${manifest.neon.org}/${manifest.neon.targets[key]}`;
+        }
+    }
+    return undefined;
+}
+function extractPackageName(manifest, target) {
+    if (manifest.neon.org) {
+        return extractPackageNameV2(manifest, target);
+    }
+    return extractPackageNameV1(manifest.neon.targets, target);
+}
 class PackBuild {
     static summary() { return 'Create an npm tarball from a prebuild.'; }
     static syntax() { return 'neon pack-build [-f <addon>] [-t <target>] [-d <dir>]'; }
@@ -12076,7 +12093,7 @@ class PackBuild {
         if (!isRustTarget(target)) {
             throw new Error(`Rust target ${target} not supported.`);
         }
-        const name = targets[target];
+        const name = extractPackageName(manifest, target);
         if (!name) {
             throw new Error(`Rust target ${target} not found in package.json.`);
         }
@@ -12192,6 +12209,18 @@ const install_builds_OPTIONS = [
     { name: 'bundle', alias: 'b', type: String, defaultValue: null },
     { name: 'verbose', alias: 'v', type: Boolean, defaultValue: false }
 ];
+function lookupBinaryPackagesV1(targets) {
+    return Object.values(targets);
+}
+function lookupBinaryPackagesV2(org, targets) {
+    return Object.keys(targets).map(key => `${org}/${key}`);
+}
+function lookupBinaryPackages(manifest) {
+    if (manifest.neon.org) {
+        return lookupBinaryPackagesV2(manifest.neon.org, manifest.neon.targets);
+    }
+    return lookupBinaryPackagesV1(manifest.neon.targets);
+}
 class InstallBuilds {
     static summary() { return 'Install dependencies on prebuilds in package.json.'; }
     static syntax() { return 'neon install-builds [-b <file>]'; }
@@ -12226,8 +12255,8 @@ class InstallBuilds {
         const version = manifest.version;
         this.log(`package.json before: ${JSON.stringify(manifest)}`);
         this.log(`determined version: ${version}`);
-        const targets = Object.values(manifest.neon.targets);
-        const specs = targets.map(name => `${name}@${version}`);
+        const packages = lookupBinaryPackages(manifest);
+        const specs = packages.map(name => `${name}@${version}`);
         this.log(`npm install --save-exact -O ${specs.join(' ')}`);
         const result = await execa('npm', ['install', '--save-exact', '-O', ...specs], { shell: true });
         if (result.exitCode !== 0) {
@@ -12249,7 +12278,7 @@ class InstallBuilds {
 
 if (0) {
 `;
-        const requires = targets.map(name => `  require('${name}');`).join('\n');
+        const requires = packages.map(name => `  require('${name}');`).join('\n');
         this.log(`generating bundler compatibility module at ${this._bundle}`);
         await promises_namespaceObject.writeFile(this._bundle, PREAMBLE + requires + '\n}\n');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neon-rs/cli",
-  "version": "0.0.155",
+  "version": "0.0.157",
   "description": "Command-line build tool for Neon modules.",
   "type": "module",
   "exports": "./index.js",
@@ -27,12 +27,12 @@
   },
   "homepage": "https://github.com/dherman/neon-rs#readme",
   "optionalDependencies": {
-    "@cargo-messages/android-arm-eabi": "0.0.154",
-    "@cargo-messages/darwin-arm64": "0.0.154",
-    "@cargo-messages/darwin-x64": "0.0.155",
-    "@cargo-messages/linux-arm-gnueabihf": "0.0.155",
-    "@cargo-messages/linux-x64-gnu": "0.0.155",
-    "@cargo-messages/win32-arm64-msvc": "0.0.155",
-    "@cargo-messages/win32-x64-msvc": "0.0.155"
+    "@cargo-messages/android-arm-eabi": "0.0.157",
+    "@cargo-messages/darwin-arm64": "0.0.157",
+    "@cargo-messages/darwin-x64": "0.0.157",
+    "@cargo-messages/linux-arm-gnueabihf": "0.0.157",
+    "@cargo-messages/linux-x64-gnu": "0.0.157",
+    "@cargo-messages/win32-arm64-msvc": "0.0.157",
+    "@cargo-messages/win32-x64-msvc": "0.0.157"
   }
 }