@storm-software/workspace-tools 1.66.17 → 1.66.19

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 1.66.19 (2024-03-29)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Update the package root during publish ([ec87434f](https://github.com/storm-software/storm-ops/commit/ec87434f))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.66.18 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **git-tools:** Added code to add ts plugin transpilers ([ec514d57](https://github.com/storm-software/storm-ops/commit/ec514d57))
+
+- **workspace-tools:** Remove `axios` reference from `cargo-publish` executor ([7a2e3570](https://github.com/storm-software/storm-ops/commit/7a2e3570))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.66.17 (2024-03-28)
 
 

package/README.md

@@ -16,7 +16,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.65.6-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
+[![Version](https://img.shields.io/badge/version-1.66.15-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
 [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 > [!IMPORTANT]

package/package.json

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

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

@@ -3,8 +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 { encode } from "node:querystring";
-import axios from "axios";
+import https from "node:https";
 
 const LARGE_BUFFER = 1024 * 1000000;
 
@@ -22,7 +21,7 @@ export default async function runExecutor(
     throw new Error("The executor requires a projectName.");
   }
 
-  console.info(`🚀  Running Storm Crate.io Publish executor on the ${context.projectName} crate`);
+  console.info(`🚀  Running Storm Crates.io Publish executor on the ${context.projectName} crate`);
 
   if (
     !context.projectName ||
@@ -44,18 +43,8 @@ export default async function runExecutor(
   );
 
   try {
-    const result = await axios.request({
-      method: "get",
-      url: `https://crates.io/api/v1/crates/${encode(cargoToml.package.name)}/${encode(
-        cargoToml.package.version
-      )}`,
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: process.env.CARGO_REGISTRY_TOKEN
-      },
-      timeout: 8000
-    });
-    if (result?.data) {
+    const result = await getRegistryVersion(cargoToml.package.name, cargoToml.package.version);
+    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"`
       );
@@ -107,3 +96,22 @@ export default async function runExecutor(
     };
   }
 }
+
+export const getRegistryVersion = (name: string, version: string): Promise<string> => {
+  return new Promise((resolve: (value: string) => void) =>
+    https
+      .get(
+        `https://crates.io/api/v1/crates/${encodeURIComponent(name)}/${encodeURIComponent(
+          version
+        )}`,
+        (res) => {
+          res.on("data", (d) => {
+            resolve(d);
+          });
+        }
+      )
+      .on("error", (e) => {
+        throw e;
+      })
+  );
+};

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

@@ -22,7 +22,10 @@ export default async function npmPublishExecutorFn(
   if (!projectConfig) {
     throw new Error(`Could not find project configuration for ${context.projectName}`);
   }
-  const packageRoot = joinPathFragments(context.root, options.packageRoot ?? projectConfig.root);
+  const packageRoot = joinPathFragments(
+    context.root,
+    options.packageRoot ? options.packageRoot : joinPathFragments("dist", projectConfig.root)
+  );
 
   const packageJsonPath = joinPathFragments(packageRoot, "package.json");
   const projectPackageJson = readJsonFile(packageJsonPath);

package/src/plugins/typescript/project-config.ts

@@ -67,7 +67,6 @@ export const createNodes = [
         dependsOn: ["build", "^nx-release-publish"],
         executor: "@storm-software/workspace-tools:npm-publish",
         options: {
-          packageRoot: `dist/${project.root}`,
           registry: "https://registry.npmjs.org/"
         }
       };