@storm-software/workspace-tools 1.66.20 → 1.66.22

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.66.22 (2024-03-29)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Further updates to Nx plugin modules ([82b6ab01](https://github.com/storm-software/storm-ops/commit/82b6ab01))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.66.21 (2024-03-29)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Resolve issues applying Nx plugins ([7dd277e6](https://github.com/storm-software/storm-ops/commit/7dd277e6))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.66.20 (2024-03-29)
 
 

package/config/nx.json

@@ -13,8 +13,7 @@
           "e2e",
           "docs"
         ],
-        "parallel": 3,
-        "cacheDirectory": "node_modules/.cache/nx"
+        "parallel": 3
       }
     }
   },
@@ -297,7 +296,7 @@
     "@nx/js": {
       "analyzeSourceFiles": true,
       "analyzeLockfile": true,
-      "analyzePackageJson": true
+      "analyzePackageJson": false
     }
   },
   "defaultBase": "main"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.20",
+  "version": "1.66.22",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

package/project.json

@@ -6,7 +6,9 @@
   "targets": {
     "build": {
       "executor": "@nx/esbuild:esbuild",
-      "outputs": ["{options.outputPath}"],
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "outputPath": "dist/packages/workspace-tools",
         "tsConfig": "packages/workspace-tools/tsconfig.lib.json",
@@ -39,13 +41,19 @@
         "skipTypeCheck": false,
         "metafile": true,
         "minify": false,
-        "format": ["cjs"],
+        "format": [
+          "cjs"
+        ],
         "esbuildOptions": {
           "outExtension": {
             ".js": ".js"
           }
         },
-        "external": ["nx", "@storm-software/*"],
+        "external": [
+          "nx",
+          "@nx/devkit",
+          "esbuild"
+        ],
         "assets": [
           {
             "input": "packages/workspace-tools",
@@ -60,13 +68,19 @@
           {
             "input": "packages/workspace-tools",
             "glob": "**/*.json",
-            "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
+            "ignore": [
+              "**/tsconfig*.json",
+              "project.json",
+              ".eslintrc.json"
+            ],
             "output": "."
           },
           {
             "input": "packages/workspace-tools",
             "glob": "**/*.js",
-            "ignore": ["**/jest.config.js"],
+            "ignore": [
+              "**/jest.config.js"
+            ],
             "output": "."
           },
           {
@@ -97,6 +111,5 @@
         ]
       }
     }
-  },
-  "tags": ["type:util", "scope:tools"]
-}
+  }
+}

package/src/generators/release-version/generator.ts

@@ -339,8 +339,6 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
             break;
           }
 
-          // TODO: reevaluate this logic/workflow for independent projects
-          //
           // Always assume that if the current version is a prerelease, then the next version should be a prerelease.
           // Users must manually graduate from a prerelease to a release by providing an explicit specifier.
           if (prerelease(currentVersion)) {

package/src/plugins/rust/cargo-toml.ts

@@ -32,9 +32,8 @@ export const createNodes: CreateNodes = [
       return acc;
     }, new Map<string, Package>());
 
-    for (const pkg of cargoPackages) {
-      if (!isExternal(pkg, ctx.workspaceRoot)) {
-        // const root = normalizePath(dirname(relative(ctx.workspaceRoot, pkg.manifest_path)));
+    for (const cargoPackage of cargoPackages) {
+      if (!isExternal(cargoPackage, ctx.workspaceRoot)) {
         const root = dirname(cargoFile);
 
         const targets: ProjectConfiguration["targets"] = {
@@ -45,7 +44,7 @@ export const createNodes: CreateNodes = [
             executor: "@monodon/rust:lint",
             outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${pkg.name}`
+              "target-dir": `dist/target/${cargoPackage.name}`
             }
           },
           build: {
@@ -55,7 +54,7 @@ export const createNodes: CreateNodes = [
             executor: "@monodon/rust:check",
             outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${pkg.name}`
+              "target-dir": `dist/target/${cargoPackage.name}`
             }
           },
           test: {
@@ -65,7 +64,7 @@ export const createNodes: CreateNodes = [
             executor: "@monodon/rust:test",
             outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${pkg.name}`
+              "target-dir": `dist/target/${cargoPackage.name}`
             },
             configurations: {
               production: {
@@ -75,13 +74,12 @@ export const createNodes: CreateNodes = [
           }
         };
 
-        // Apply nx-release-publish target for non-private projects
-        const isPrivate = pkg.publish?.length === 0;
+        const isPrivate = cargoPackage.publish?.length === 0;
         if (!isPrivate) {
           targets["nx-release-publish"] = {
             cache: false,
             inputs: ["default", "^production"],
-            dependsOn: ["test", "^nx-release-publish"],
+            dependsOn: ["test", "build", "^nx-release-publish"],
             executor: "@storm-software/workspace-tools:cargo-publish",
             options: {
               packageRoot: root
@@ -91,17 +89,17 @@ export const createNodes: CreateNodes = [
 
         projects[root] = {
           root,
-          name: pkg.name,
+          name: cargoPackage.name,
           targets,
           release: {
             version: {
               generator: "@storm-software/workspace-tools:release-version"
             }
           },
-          tags: ["rust", "cargo"]
+          tags: ["lang:rust"]
         };
       }
-      for (const dep of pkg.dependencies) {
+      for (const dep of cargoPackage.dependencies) {
         if (isExternal(dep, ctx.workspaceRoot)) {
           const externalDepName = `cargo:${dep.name}`;
           if (!externalNodes?.[externalDepName]) {
@@ -132,7 +130,6 @@ export const createDependencies: CreateDependencies = (_, { projects, externalNo
   }
 
   const { packages: cargoPackages } = metadata;
-
   const dependencies: RawProjectGraphDependency[] = [];
 
   for (const pkg of cargoPackages) {

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

@@ -5,6 +5,7 @@ import { readJsonFile } from "nx/src/utils/fileutils";
 import { type PackageJson, readTargetsFromPackageJson } from "nx/src/utils/package-json";
 
 export const name = "storm-software/typescript/project-config";
+
 export const createNodes = [
   "{project.json,**/project.json}",
   (file, _, ctx) => {
@@ -64,7 +65,7 @@ export const createNodes = [
       targets["nx-release-publish"] = {
         cache: false,
         inputs: ["default", "^production"],
-        dependsOn: ["build", "^nx-release-publish"],
+        dependsOn: ["test", "build", "^nx-release-publish"],
         executor: "@storm-software/workspace-tools:npm-publish",
         options: {
           registry: "https://registry.npmjs.org/"
@@ -76,7 +77,7 @@ export const createNodes = [
       ? {
           projects: {
             [project.name]: {
-              tags: ["typescript", "npm"],
+              tags: ["lang:typescript"],
               ...project,
               targets,
               release: {