@storm-software/workspace-tools 1.66.21 → 1.66.23

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 1.66.23 (2024-03-29)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Resolved issues with declaring local Storm nx-plugins ([a5eed1f0](https://github.com/storm-software/storm-ops/commit/a5eed1f0))
+
+- **workspace-tools:** Resolved issue with generating local Nx plugins prior to build ([68ef2815](https://github.com/storm-software/storm-ops/commit/68ef2815))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 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)
 
 

package/config/nx.json

@@ -13,8 +13,7 @@
           "e2e",
           "docs"
         ],
-        "parallel": 3,
-        "cacheDirectory": "node_modules/.cache/nx"
+        "parallel": 3
       }
     }
   },
@@ -198,6 +197,13 @@
         "^lint"
       ]
     },
+    "clean": {
+      "cache": false,
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "pnpm exec rimraf dist/{projectRoot}"
+      }
+    },
     "build": {
       "cache": true,
       "inputs": [
@@ -249,6 +255,19 @@
         "test",
         "^e2e"
       ]
+    },
+    "nx-release-publish": {
+      "cache": false,
+      "inputs": [
+        "default",
+        "^production"
+      ],
+      "outputs": [
+        "{options.outputPath}"
+      ],
+      "dependsOn": [
+        "^nx-release-publish"
+      ]
     }
   },
   "release": {
@@ -274,17 +293,7 @@
       }
     }
   },
-  "plugins": [
-    "@nx/eslint/plugin",
-    "@storm-software/workspace-tools/plugins/rust",
-    "@storm-software/workspace-tools/plugins/typescript"
-  ],
-  "pluginsConfig": {
-    "@nx/js": {
-      "analyzeSourceFiles": true,
-      "analyzeLockfile": true,
-      "analyzePackageJson": true
-    }
-  },
+  "parallel": 3,
+  "cacheDirectory": "tmp/nx-cache",
   "defaultBase": "main"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.21",
+  "version": "1.66.23",
   "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,17 @@
   "targets": {
     "build": {
       "executor": "@nx/esbuild:esbuild",
-      "outputs": ["{options.outputPath}"],
+      "inputs": [
+        "default",
+        "^production"
+      ],
+      "dependsOn": [
+        "clean",
+        "^build"
+      ],
+      "outputs": [
+        "{options.outputPath}"
+      ],
       "options": {
         "outputPath": "dist/packages/workspace-tools",
         "tsConfig": "packages/workspace-tools/tsconfig.lib.json",
@@ -39,13 +49,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 +76,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 +119,5 @@
         ]
       }
     }
-  },
-  "tags": ["type:util", "scope:tools"]
-}
+  }
+}

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,8 +74,7 @@ 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,
@@ -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/index.ts

@@ -1,2 +1 @@
-// export * from "./package-lock-file";
 export * from "./project-config";

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) => {
@@ -76,7 +77,7 @@ export const createNodes = [
       ? {
           projects: {
             [project.name]: {
-              tags: ["typescript", "npm"],
+              tags: ["lang:typescript"],
               ...project,
               targets,
               release: {

package/src/plugins/typescript/package-lock-file.ts

@@ -1,125 +0,0 @@
-import { readFileSync, writeFileSync } from "node:fs";
-import { ensureDirSync } from "fs-extra";
-import { dirname, join } from "node:path";
-import { performance } from "node:perf_hooks";
-import { combineGlobPatterns } from "nx/src/utils/globs";
-import type { CreateDependenciesContext, NxPluginV2 } from "nx/src/utils/nx-plugin";
-import {
-  getLockFileDependencies,
-  getLockFileName,
-  getLockFileNodes,
-  lockFileExists,
-  LOCK_FILES
-} from "../../utils/lock-file";
-import type { RawProjectGraphDependency } from "nx/src/project-graph/project-graph-builder";
-import { detectPackageManager } from "nx/src/utils/package-manager";
-import { hashArray } from "nx/src/hasher/file-hasher";
-import { projectGraphCacheDirectory } from "nx/src/utils/cache-directory";
-import type { ProjectGraph } from "nx/src/devkit-exports";
-import { buildExplicitDependencies } from "nx/src/plugins/js/project-graph/build-dependencies/build-dependencies";
-
-interface ParsedLockFile {
-  externalNodes?: ProjectGraph["externalNodes"];
-  dependencies?: RawProjectGraphDependency[];
-}
-
-const parsedLockFile: ParsedLockFile = {};
-
-export const packageLockFilePlugin: NxPluginV2 = {
-  name: "storm-software/typescript/package-lock-file",
-  createNodes: [
-    combineGlobPatterns(LOCK_FILES),
-    (lockFile, _opts, ctx) => {
-      const packageManager = detectPackageManager(ctx.workspaceRoot);
-      // Only process the correct lockfile
-      if (lockFile !== getLockFileName(packageManager)) {
-        return {};
-      }
-
-      const lockFilePath = join(ctx.workspaceRoot, lockFile);
-      const lockFileContents = readFileSync(lockFilePath).toString();
-      const lockFileHash = getLockFileHash(lockFileContents);
-
-      if (!lockFileNeedsReprocessing(lockFileHash)) {
-        const nodes = readCachedParsedLockFile().externalNodes;
-        parsedLockFile.externalNodes = nodes;
-        return {
-          externalNodes: nodes
-        };
-      }
-
-      const externalNodes = getLockFileNodes(packageManager, lockFileContents, lockFileHash, ctx);
-      parsedLockFile.externalNodes = externalNodes;
-
-      return {
-        externalNodes
-      };
-    }
-  ],
-  createDependencies: (_, ctx: CreateDependenciesContext) => {
-    const packageManager = detectPackageManager(ctx.workspaceRoot);
-
-    let lockfileDependencies: RawProjectGraphDependency[] = [];
-    // lockfile may not exist yet
-    if (lockFileExists(packageManager) && parsedLockFile) {
-      const lockFilePath = join(ctx.workspaceRoot, getLockFileName(packageManager));
-      const lockFileContents = readFileSync(lockFilePath).toString();
-      const lockFileHash = getLockFileHash(lockFileContents);
-
-      if (!lockFileNeedsReprocessing(lockFileHash)) {
-        lockfileDependencies = readCachedParsedLockFile().dependencies ?? [];
-      } else {
-        lockfileDependencies = getLockFileDependencies(
-          packageManager,
-          lockFileContents,
-          lockFileHash,
-          ctx
-        );
-
-        parsedLockFile.dependencies = lockfileDependencies;
-        writeLastProcessedLockfileHash(lockFileHash, parsedLockFile);
-      }
-    }
-
-    performance.mark("build typescript dependencies - start");
-    const explicitProjectDependencies = buildExplicitDependencies(
-      {
-        analyzeSourceFiles: true,
-        analyzePackageJson: true
-      },
-      ctx
-    );
-    performance.mark("build typescript dependencies - end");
-    performance.measure(
-      "build typescript dependencies",
-      "build typescript dependencies - start",
-      "build typescript dependencies - end"
-    );
-    return lockfileDependencies.concat(explicitProjectDependencies);
-  }
-};
-
-function getLockFileHash(lockFileContents: string) {
-  return hashArray([lockFileContents]);
-}
-
-function lockFileNeedsReprocessing(lockHash: string) {
-  try {
-    return readFileSync(lockFileHashFile).toString() !== lockHash;
-  } catch {
-    return true;
-  }
-}
-
-function writeLastProcessedLockfileHash(hash: string, lockFile: ParsedLockFile) {
-  ensureDirSync(dirname(lockFileHashFile));
-  writeFileSync(cachedParsedLockFile, JSON.stringify(lockFile, null, 2));
-  writeFileSync(lockFileHashFile, hash);
-}
-
-function readCachedParsedLockFile(): ParsedLockFile {
-  return JSON.parse(readFileSync(cachedParsedLockFile).toString());
-}
-
-const lockFileHashFile = join(projectGraphCacheDirectory, "lockfile.hash");
-const cachedParsedLockFile = join(projectGraphCacheDirectory, "parsed-lock-file.json");