@storm-software/workspace-tools 1.66.10 → 1.66.12

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.66.12 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Resolved `axios` module import issue ([a2bf92c2](https://github.com/storm-software/storm-ops/commit/a2bf92c2))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.66.11 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Enhance code to check crates.io version through API ([1cec1ccd](https://github.com/storm-software/storm-ops/commit/1cec1ccd))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.66.10 (2024-03-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.10",
+  "version": "1.66.12",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [
@@ -52,8 +52,8 @@
     "@nx/devkit": "18.0.4",
     "@nx/esbuild": "18.0.4",
     "@rollup/plugin-json": "6.1.0",
+    "axios": "1.6.7",
     "bundle-require": "^4.0.2",
-    "crates.io": "^2.2.7",
     "decky": "1.1.1",
     "esbuild-plugin-environment": "0.3.0",
     "esbuild-plugin-handlebars": "1.0.2",

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

@@ -3,7 +3,7 @@ import { execSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { parseCargoToml } from "../../utils/toml";
 import type { CargoPublishExecutorSchema } from "./schema.d";
-import { CratesIO } from "crates.io";
+import { encode } from "node:querystring";
 
 const LARGE_BUFFER = 1024 * 1000000;
 
@@ -11,6 +11,16 @@ export default async function runExecutor(
   options: CargoPublishExecutorSchema,
   context: ExecutorContext
 ) {
+  const axios = await import("axios");
+  const registryApi = axios.default.create({
+    baseURL: "https://crates.io/api/v1/crates",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: process.env.CARGO_REGISTRY_TOKEN
+    },
+    timeout: 8000
+  });
+
   /**
    * We need to check both the env var and the option because the executor may have been triggered
    * indirectly via dependsOn, in which case the env var will be set, but the option will not.
@@ -41,23 +51,19 @@ export default async function runExecutor(
   );
 
   try {
-    const currentVersion = cargoToml.package.version;
-    const packageName = cargoToml.package.name;
-
-    const result = await new CratesIO().api.crates.getVersion(packageName, currentVersion);
-    if (result) {
+    const result = await registryApi.get(
+      `/${encode(cargoToml.package.name)}/${encode(cargoToml.package.version)}`
+    );
+    if (result?.data) {
       console.warn(
-        `Skipped package "${packageName}" from project "${context.projectName}" because v${currentVersion} 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 https://crates.io with tag "latest"`
       );
 
       return {
         success: true
       };
     }
-  } catch (error: any) {
-    console.log("No results returned while checking the crate version in https://crates.io");
-    console.warn(error);
-  }
+  } catch (_: any) {}
 
   const cargoPublishCommandSegments = [`cargo publish --allow-dirty -p ${cargoToml.package.name}`];
   if (isDryRun) {