@storm-software/workspace-tools 1.207.3 → 1.207.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.207.4 (2024-12-23)
+
+### Bug Fixes
+
+- **workspace-tools:** Add wildcards to `tsup` plugin
+  ([dbcb6385](https://github.com/storm-software/storm-ops/commit/dbcb6385))
+
 ## 1.207.3 (2024-12-23)
 
 ### Bug Fixes

package/meta.json

@@ -24797,7 +24797,7 @@
       "format": "esm"
     },
     "packages/workspace-tools/src/plugins/typescript/tsup.ts": {
-      "bytes": 3896,
+      "bytes": 4668,
       "imports": [
         {
           "path": "@nx/devkit",
@@ -68548,13 +68548,13 @@
       "entryPoint": "packages/workspace-tools/src/plugins/typescript/tsup.ts",
       "inputs": {
         "packages/workspace-tools/src/plugins/typescript/tsup.ts": {
-          "bytesInOutput": 3863
+          "bytesInOutput": 4402
         },
         "packages/workspace-tools/src/utils/project-tags.ts": {
           "bytesInOutput": 2559
         }
       },
-      "bytes": 7498
+      "bytes": 8039
     },
     "dist/packages/workspace-tools/src/utils/index.js": {
       "imports": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.207.3",
+  "version": "1.207.4",
   "type": "commonjs",
   "description": "Tools for managing a Storm workspace, including various Nx generators and executors for common development tasks.",
   "repository": {

package/src/plugins/typescript/tsup.d.ts

@@ -1,3 +1,5 @@
-import { CreateNodes } from "@nx/devkit";
+import { CreateNodesV2 } from "@nx/devkit";
 export declare const name = "storm-software/typescript/tsup";
-export declare const createNodes: CreateNodes<any>;
+export interface TsupPluginOptions {
+}
+export declare const createNodesV2: CreateNodesV2<TsupPluginOptions>;

package/src/plugins/typescript/tsup.js

@@ -19,7 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // packages/workspace-tools/src/plugins/typescript/tsup.ts
 var tsup_exports = {};
 __export(tsup_exports, {
-  createNodes: () => createNodes,
+  createNodesV2: () => createNodesV2,
   name: () => name
 });
 module.exports = __toCommonJS(tsup_exports);
@@ -121,84 +121,92 @@ var setDefaultProjectTags = (project, plugin) => {
 
 // packages/workspace-tools/src/plugins/typescript/tsup.ts
 var name = "storm-software/typescript/tsup";
-var createNodes = [
+var createNodesV2 = [
   "**/tsup.config.ts",
-  (file, opts, ctx) => {
-    const projectRoot = createProjectRoot(file, ctx.workspaceRoot);
-    if (!projectRoot) {
-      console.error(
-        `tsup.config.ts file must be location in the project root directory: ${file}`
-      );
-      return {};
-    }
-    const packageJson = (0, import_devkit.readJsonFile)((0, import_node_path.join)(projectRoot, "package.json"));
-    if (!packageJson) {
-      console.error(`No package.json found in project root: ${projectRoot}`);
-      return {};
-    }
-    if (!packageJson.devDependencies?.tsup && !packageJson.dependencies?.tsup) {
-      console.warn(
-        `No "tsup" dependency or devDependency found in package.json: ${file}
+  async (configFiles, options, context) => {
+    return await (0, import_devkit.createNodesFromFiles)(
+      (configFile, options2, context2) => {
+        console.log(`Processing tsup.config.ts file: ${configFile}`);
+        const projectRoot = createProjectRoot(
+          configFile,
+          context2.workspaceRoot
+        );
+        if (!projectRoot) {
+          console.error(
+            `tsup.config.ts file must be location in the project root directory: ${configFile}`
+          );
+          return {};
+        }
+        const packageJson = (0, import_devkit.readJsonFile)((0, import_node_path.join)(projectRoot, "package.json"));
+        if (!packageJson) {
+          console.error(
+            `No package.json found in project root: ${projectRoot}`
+          );
+          return {};
+        }
+        if (!packageJson.devDependencies?.tsup && !packageJson.dependencies?.tsup) {
+          console.warn(
+            `No "tsup" dependency or devDependency found in package.json: ${configFile}
 Please add it to your dependencies by running "pnpm add tsup -D --filter="${packageJson.name}"`
-      );
-    }
-    const project = createProjectFromPackageJsonNextToProjectJson(
-      (0, import_node_path.join)(projectRoot, "project.json"),
-      packageJson
-    );
-    const nxJson = (0, import_nx_json.readNxJson)(ctx.workspaceRoot);
-    const targets = (0, import_package_json.readTargetsFromPackageJson)(
-      packageJson,
-      nxJson
-    );
-    let relativeRoot = projectRoot.replace(ctx.workspaceRoot, "").replaceAll("\\", "/");
-    if (relativeRoot.startsWith("/")) {
-      relativeRoot = relativeRoot.slice(1);
-    }
-    targets["build-base"] = {
-      cache: true,
-      inputs: [file, "typescript", "^production"],
-      outputs: [`${relativeRoot}/dist/**/*`],
-      executor: "nx:run-commands",
-      dependsOn: ["clean", "^build"],
-      options: {
-        command: `tsup --config="${file}"`,
-        cwd: relativeRoot
-      }
-    };
-    targets.build = {
-      cache: true,
-      inputs: [file, "typescript", "^production"],
-      outputs: [`dist/${relativeRoot}/**/*`],
-      executor: "nx:run-commands",
-      dependsOn: ["build-base"],
-      options: {
-        commands: [
-          `pnpm copyfiles LICENSE dist/${relativeRoot}`,
-          `pnpm copyfiles --up=2 ./${relativeRoot}/README.md ./${relativeRoot}/package.json dist/${relativeRoot}`,
-          `pnpm copyfiles --up=3 ./${relativeRoot}/dist/* dist/${relativeRoot}/dist`
-        ]
-      }
-    };
-    targets.clean = {
-      executor: "nx:run-commands",
-      inputs: [file, "typescript", "^production"],
-      options: {
-        commands: [
-          `pnpm exec rimraf dist/${relativeRoot}`,
-          `pnpm exec rimraf ${relativeRoot}/dist`
-        ]
-      }
-    };
-    setDefaultProjectTags(project, name);
-    return project?.name ? {
-      projects: {
-        [project.name]: {
-          ...project,
-          targets
+          );
         }
-      }
-    } : {};
+        const project = createProjectFromPackageJsonNextToProjectJson(
+          (0, import_node_path.join)(projectRoot, "project.json"),
+          packageJson
+        );
+        const nxJson = (0, import_nx_json.readNxJson)(context2.workspaceRoot);
+        const targets = (0, import_package_json.readTargetsFromPackageJson)(packageJson, nxJson);
+        let relativeRoot = projectRoot.replace(context2.workspaceRoot, "").replaceAll("\\", "/");
+        if (relativeRoot.startsWith("/")) {
+          relativeRoot = relativeRoot.slice(1);
+        }
+        targets["build-base"] = {
+          cache: true,
+          inputs: [configFile, "typescript", "^production"],
+          executor: "nx:run-commands",
+          dependsOn: ["clean", "^build"],
+          options: {
+            command: `tsup --config="${configFile}"`,
+            cwd: relativeRoot
+          }
+        };
+        targets.build = {
+          cache: true,
+          inputs: [configFile, "typescript", "^production"],
+          executor: "nx:run-commands",
+          dependsOn: ["build-base"],
+          options: {
+            commands: [
+              `pnpm copyfiles LICENSE dist/${relativeRoot}`,
+              `pnpm copyfiles --up=2 ./${relativeRoot}/README.md ./${relativeRoot}/package.json dist/${relativeRoot}`,
+              `pnpm copyfiles --up=3 ./${relativeRoot}/dist/* dist/${relativeRoot}/dist`
+            ]
+          }
+        };
+        targets.clean = {
+          executor: "nx:run-commands",
+          inputs: [configFile, "typescript", "^production"],
+          options: {
+            commands: [
+              `pnpm exec rimraf dist/${relativeRoot}`,
+              `pnpm exec rimraf ${relativeRoot}/dist`
+            ]
+          }
+        };
+        setDefaultProjectTags(project, name);
+        return project?.name ? {
+          projects: {
+            [project.name]: {
+              ...project,
+              targets
+            }
+          }
+        } : {};
+      },
+      configFiles,
+      options,
+      context
+    );
   }
 ];
 function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, packageJson) {
@@ -226,6 +234,6 @@ function createProjectRoot(configPath, workspaceRoot) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createNodes,
+  createNodesV2,
   name
 });