@storm-software/workspace-tools 1.208.0 → 1.209.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.209.1 (2024-12-23)
+
+### Bug Fixes
+
+- **workspace-tools:** Resolved logging issue in `tsup` plugin
+  ([0b6bfc9e](https://github.com/storm-software/storm-ops/commit/0b6bfc9e))
+
+## 1.209.0 (2024-12-23)
+
+### Features
+
+- **pulumi-tools:** Initial check-in of the `pulumi-tools` package
+  ([6b03c2ae](https://github.com/storm-software/storm-ops/commit/6b03c2ae))
+
 ## 1.208.0 (2024-12-23)
 
 ### Features

package/meta.json

@@ -24797,7 +24797,7 @@
       "format": "esm"
     },
     "packages/workspace-tools/src/plugins/typescript/tsup.ts": {
-      "bytes": 4668,
+      "bytes": 5163,
       "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": 4402
+          "bytesInOutput": 4899
         },
         "packages/workspace-tools/src/utils/project-tags.ts": {
           "bytesInOutput": 2559
         }
       },
-      "bytes": 8039
+      "bytes": 8536
     },
     "dist/packages/workspace-tools/src/utils/index.js": {
       "imports": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.208.0",
+  "version": "1.209.1",
   "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.js

@@ -126,82 +126,95 @@ var createNodesV2 = [
   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}`
+        try {
+          console.log(`Processing tsup.config.ts file: ${configFile}`);
+          const projectRoot = createProjectRoot(
+            configFile,
+            context2.workspaceRoot
           );
-          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)(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
+          if (!projectRoot) {
+            console.error(
+              `tsup.config.ts file must be location in the project root directory: ${configFile}`
+            );
+            return {};
           }
-        };
-        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`
-            ]
+          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 {};
           }
-        };
-        targets.clean = {
-          executor: "nx:run-commands",
-          inputs: [configFile, "typescript", "^production"],
-          options: {
-            commands: [
-              `pnpm exec rimraf dist/${relativeRoot}`,
-              `pnpm exec rimraf ${relativeRoot}/dist`
-            ]
+          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}"`
+            );
           }
-        };
-        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: [
+              `{workspaceRoot}/${configFile}`,
+              "typescript",
+              "^production"
+            ],
+            executor: "nx:run-commands",
+            dependsOn: ["clean", "^build"],
+            options: {
+              command: `tsup --config="${configFile}"`,
+              cwd: relativeRoot
+            }
+          };
+          targets.build ??= {
+            cache: true,
+            inputs: ["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: [
+              `{workspaceRoot}/${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
+              }
+            }
+          } : {};
+        } catch (e) {
+          console.error(e);
+          return {};
+        }
       },
       configFiles,
       options,
@@ -212,11 +225,14 @@ Please add it to your dependencies by running "pnpm add tsup -D --filter="${pack
 function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, packageJson) {
   const { nx, name: name2 } = packageJson;
   const root = (0, import_node_path.dirname)(projectJsonPath);
+  const projectJson = (0, import_devkit.readJsonFile)(projectJsonPath);
   return {
+    targets: {},
+    tags: [],
     ...nx,
+    ...projectJson,
     name: name2,
-    root,
-    targets: {}
+    root
   };
 }
 function createProjectRoot(configPath, workspaceRoot) {