@storm-software/workspace-tools 1.80.0 → 1.82.0

package/src/executors/cargo-publish/executor.js

@@ -2929,10 +2929,13 @@ async function runExecutor(options, context) {
   if (!context.projectName) {
     throw new Error("The executor requires a projectName.");
   }
-  console.info(`\u{1F680}  Running Storm Crates.io Publish executor on the ${context.projectName} crate`);
+  console.info(
+    `\u{1F680}  Running Storm Cargo Publish executor on the ${context.projectName} crate`
+  );
   if (!context.projectName || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
     throw new Error("The executor requires projectsConfigurations.");
   }
+  const registry = options.registry ? options.registry : process.env.STORM_REGISTRY_CARGO ? process.env.STORM_REGISTRY_CARGO : "https://crates.io";
   const root = context.projectsConfigurations.projects[context.projectName]?.root;
   const packageRoot = (0, import_devkit2.joinPathFragments)(
     context.root,
@@ -2942,10 +2945,14 @@ async function runExecutor(options, context) {
     (0, import_node_fs.readFileSync)((0, import_devkit2.joinPathFragments)(packageRoot, "Cargo.toml"), "utf-8")
   );
   try {
-    const result = await getRegistryVersion(cargoToml.package.name, cargoToml.package.version);
+    const result = await getRegistryVersion(
+      cargoToml.package.name,
+      cargoToml.package.version,
+      registry
+    );
     if (result) {
       console.warn(
-        `Skipped package "${cargoToml.package.name}" from project "${context.projectName}" because v${cargoToml.package.version} already exists in https://crates.io with tag "latest"`
+        `Skipped package "${cargoToml.package.name}" from project "${context.projectName}" because v${cargoToml.package.version} already exists in ${registry} with tag "latest"`
       );
       return {
         success: true
@@ -2953,16 +2960,18 @@ async function runExecutor(options, context) {
     }
   } catch (_) {
   }
-  const cargoPublishCommandSegments = [`cargo publish --allow-dirty -p ${cargoToml.package.name}`];
+  const cargoPublishCommandSegments = [
+    `cargo publish --allow-dirty -p ${cargoToml.package.name}`
+  ];
   if (isDryRun) {
     cargoPublishCommandSegments.push("--dry-run");
   }
   try {
-    const command = cargoPublishCommandSegments.join(" ");
+    const cargoPublishCommand = cargoPublishCommandSegments.join(" ");
     console.log("");
-    console.log(`Running "${command}"...`);
+    console.log(`Running "${cargoPublishCommand}"...`);
     console.log("");
-    (0, import_node_child_process.execSync)(command, {
+    (0, import_node_child_process.execSync)(cargoPublishCommand, {
       maxBuffer: LARGE_BUFFER,
       env: {
         ...process.env,
@@ -2973,15 +2982,15 @@ async function runExecutor(options, context) {
     });
     console.log("");
     if (isDryRun) {
-      console.log("Would publish to https://crates.io, but [dry-run] was set");
+      console.log(`Would publish to ${registry}, but [dry-run] was set`);
     } else {
-      console.log("Published to https://crates.io");
+      console.log(`Published to ${registry}`);
     }
     return {
       success: true
     };
   } catch (error) {
-    console.error("Failed to publish to https://crates.io");
+    console.error(`Failed to publish to ${registry}`);
     console.error(error);
     console.log("");
     return {
@@ -2989,10 +2998,10 @@ async function runExecutor(options, context) {
     };
   }
 }
-var getRegistryVersion = (name, version2) => {
+var getRegistryVersion = (name, version2, registry) => {
   return new Promise(
     (resolve) => import_node_https.default.get(
-      `https://crates.io/api/v1/crates/${encodeURIComponent(name)}/${encodeURIComponent(
+      `${registry}/api/v1/crates/${encodeURIComponent(name)}/${encodeURIComponent(
         version2
       )}`,
       (res) => {

package/src/executors/cargo-publish/schema.d.ts

@@ -1,4 +1,5 @@
 export interface CargoPublishExecutorSchema {
+  registry?: string;
   packageRoot?: string;
   dryRun?: boolean;
 }

package/src/executors/cargo-publish/schema.json

@@ -5,6 +5,11 @@
   "description": "Publish a package to the crates.io registry - DO NOT INVOKE DIRECTLY WITH `nx run`. Use `nx release publish` instead.",
   "type": "object",
   "properties": {
+    "registry": {
+      "type": "string",
+      "description": "The Cargo registry URL to publish the package to.",
+      "format": "uri"
+    },
     "packageRoot": {
       "type": "string",
       "description": "The root directory of the directory (containing a manifest file at its root) to publish. Defaults to the project root."
@@ -15,4 +20,4 @@
     }
   },
   "required": []
-}
+}

package/src/executors/npm-publish/executor.js

@@ -32,7 +32,9 @@ async function npmPublishExecutorFn(options, context) {
   }
   const projectConfig = context.projectsConfigurations?.projects?.[context.projectName];
   if (!projectConfig) {
-    throw new Error(`Could not find project configuration for ${context.projectName}`);
+    throw new Error(
+      `Could not find project configuration for ${context.projectName}`
+    );
   }
   const packageRoot = (0, import_devkit.joinPathFragments)(
     context.root,
@@ -41,17 +43,24 @@ async function npmPublishExecutorFn(options, context) {
   const packageJsonPath = (0, import_devkit.joinPathFragments)(packageRoot, "package.json");
   const projectPackageJson = (0, import_devkit.readJsonFile)(packageJsonPath);
   const packageName = projectPackageJson.name;
-  console.info(`\u{1F680}  Running Storm NPM Publish executor on the ${packageName} package`);
+  console.info(
+    `\u{1F680}  Running Storm NPM Publish executor on the ${packageName} package`
+  );
   const packageTxt = packageName === context.projectName ? `package "${packageName}"` : `package "${packageName}" from project "${context.projectName}"`;
   if (projectPackageJson.private === true) {
-    console.warn(`Skipped ${packageTxt}, because it has \`"private": true\` in ${packageJsonPath}`);
+    console.warn(
+      `Skipped ${packageTxt}, because it has \`"private": true\` in ${packageJsonPath}`
+    );
     return new Promise((resolve) => resolve({ success: true }));
   }
   const npmPublishCommandSegments = ["npm publish --json"];
-  const npmViewCommandSegments = [`npm view ${packageName} versions dist-tags --json`];
+  const npmViewCommandSegments = [
+    `npm view ${packageName} versions dist-tags --json`
+  ];
+  const registry = options.registry ? options.registry : (0, import_node_child_process.execSync)("npm config get registry").toString().trim();
   if (options.registry) {
-    npmPublishCommandSegments.push(`--registry=${options.registry}`);
-    npmViewCommandSegments.push(`--registry=${options.registry}`);
+    npmPublishCommandSegments.push(`--registry=${registry}`);
+    npmViewCommandSegments.push(`--registry=${registry}`);
   }
   if (options.tag) {
     npmPublishCommandSegments.push(`--tag=${options.tag}`);
@@ -63,9 +72,8 @@ async function npmPublishExecutorFn(options, context) {
     npmPublishCommandSegments.push("--dry-run");
   }
   npmPublishCommandSegments.push("--provenance --access public");
-  const registry = options.registry ?? (0, import_node_child_process.execSync)("npm config get registry").toString().trim();
   const tag = options.tag ?? (0, import_node_child_process.execSync)("npm config get tag").toString().trim();
-  if (!isDryRun && !options.firstRelease) {
+  if (!isDryRun) {
     const currentVersion = projectPackageJson.version;
     try {
       try {
@@ -103,16 +111,16 @@ Note: If this is the first time this package has been published to NPM, this can
                 FORCE_COLOR: "true"
               },
               cwd: packageRoot,
-              stdio: "ignore"
+              stdio: ["ignore", "pipe", "pipe"]
             }
           );
           console.info(
-            `Added the dist-tag ${tag} to v${currentVersion} for registry ${registry}.
+            `Added the dist-tag ${tag} to v${currentVersion} for registries "${registry}".
 `
           );
         } else {
           console.info(
-            `Would add the dist-tag ${tag} to v${currentVersion} for registry ${registry}, but [dry-run] was set.
+            `Would add the dist-tag ${tag} to v${currentVersion} for registries "${registry}", but [dry-run] was set.
 `
           );
         }
@@ -121,7 +129,9 @@ Note: If this is the first time this package has been published to NPM, this can
         try {
           const stdoutData = JSON.parse(err.stdout?.toString() || "{}");
           if (stdoutData?.error && !(stdoutData.error?.code?.includes("E404") && stdoutData.error?.summary?.includes("no such package available")) && !(err.stderr?.toString().includes("E404") && err.stderr?.toString().includes("no such package available"))) {
-            console.error("npm dist-tag add error please see below for more information:");
+            console.error(
+              "npm dist-tag add error please see below for more information:"
+            );
             if (stdoutData.error.summary) {
               console.error(stdoutData.error?.summary);
             }
@@ -129,7 +139,9 @@ Note: If this is the first time this package has been published to NPM, this can
               console.error(stdoutData.error?.detail);
             }
             if (context.isVerbose) {
-              console.error(`npm dist-tag add stdout: ${JSON.stringify(stdoutData, null, 2)}`);
+              console.error(
+                `npm dist-tag add stdout: ${JSON.stringify(stdoutData, null, 2)}`
+              );
             }
             return new Promise((resolve) => resolve({ success: false }));
           }
@@ -152,9 +164,6 @@ ${err}`
       }
     }
   }
-  if (options.firstRelease && context.isVerbose) {
-    console.info("Skipped npm view because --first-release was set");
-  }
   try {
     const output = (0, import_node_child_process.execSync)(npmPublishCommandSegments.join(" "), {
       maxBuffer: LARGE_BUFFER,
@@ -167,7 +176,9 @@ ${err}`
     });
     console.info(output.toString());
     if (isDryRun) {
-      console.info(`Would publish to ${registry} with tag "${tag}", but [dry-run] was set`);
+      console.info(
+        `Would publish to ${registry} with tag "${tag}", but [dry-run] was set`
+      );
     } else {
       console.info(`Published to ${registry} with tag "${tag}"`);
     }
@@ -184,8 +195,10 @@ ${err}`
         console.error(stdoutData.error.detail);
       }
       if (context.isVerbose) {
-        console.error(`npm publish stdout:
-${JSON.stringify(stdoutData, null, 2)}`);
+        console.error(
+          `npm publish stdout:
+${JSON.stringify(stdoutData, null, 2)}`
+        );
       }
       return new Promise((resolve) => resolve({ success: false }));
     } catch (err2) {

package/src/executors/npm-publish/schema.json

@@ -11,9 +11,8 @@
     },
     "registry": {
       "type": "string",
-      "description": "The registry to publish the package to.",
-      "format": "uri",
-      "default": "https://registry.npmjs.org/"
+      "description": "The NPM registry URL to publish the package to.",
+      "format": "uri"
     },
     "tag": {
       "type": "string",
@@ -24,5 +23,5 @@
       "description": "Whether to run the command without actually publishing the package to the registry."
     }
   },
-  "required": ["registry"]
+  "required": []
 }