@storm-software/workspace-tools 1.24.1 → 1.25.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.24.2](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.24.1...workspace-tools-v1.24.2) (2023-12-11)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Update tsup build to not include `src` folder by default ([d400c33](https://github.com/storm-software/storm-ops/commit/d400c338e29ddfbe4c3288f1015db972849c7181))
+
+## [1.24.1](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.24.0...workspace-tools-v1.24.1) (2023-12-11)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issue with bad nx.json config ([1753feb](https://github.com/storm-software/storm-ops/commit/1753febc615fa341af86d49981905221153dbcfb))
+
 # [1.24.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.23.1...workspace-tools-v1.24.0) (2023-12-09)
 
 

package/index.js

@@ -117194,6 +117194,7 @@ function modernConfig({
   define: define2,
   env: env2,
   plugins,
+  generatePackageJson,
   dtsTsConfig
 }) {
   let outputPath = (0, import_path3.join)(outDir, "dist", "modern");
@@ -117212,6 +117213,7 @@ function modernConfig({
     ] : ["esnext", "node18"],
     tsconfig,
     splitting,
+    generatePackageJson,
     treeshake: treeshake ? {
       preset: "recommended"
     } : false,
@@ -117270,6 +117272,7 @@ function legacyConfig({
   define: define2,
   env: env2,
   plugins,
+  generatePackageJson,
   dtsTsConfig
 }) {
   let outputPath = (0, import_path3.join)(outDir, "dist", "legacy");
@@ -117280,6 +117283,7 @@ function legacyConfig({
     target: ["es2022", "node18"],
     tsconfig,
     splitting,
+    generatePackageJson,
     treeshake: treeshake ? {
       preset: "recommended"
     } : false,
@@ -117340,6 +117344,7 @@ function workerConfig({
   define: define2,
   env: env2,
   plugins,
+  generatePackageJson,
   dtsTsConfig
 }) {
   let outputPath = (0, import_path3.join)(outDir, "dist");
@@ -117351,6 +117356,7 @@ function workerConfig({
     bundle: true,
     tsconfig,
     splitting,
+    generatePackageJson,
     treeshake: treeshake ? {
       preset: "recommended"
     } : false,
@@ -117489,6 +117495,13 @@ ${Object.keys(options).map(
       glob: "LICENSE",
       output: "."
     });
+    if (options.generatePackageJson === false) {
+      assets.push({
+        input: projectRoot,
+        glob: "**/package.json",
+        output: "."
+      });
+    }
     if (options.includeSrc !== false) {
       assets.push({
         input: sourceRoot,
@@ -117554,84 +117567,6 @@ ${externalDependencies.map((dep) => {
         }
       }
     }
-    const projectGraph = (0, import_devkit.readCachedProjectGraph)();
-    const pathToPackageJson = (0, import_path4.join)(context.root, projectRoot, "package.json");
-    const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
-    delete packageJson.dependencies;
-    externalDependencies.forEach((entry) => {
-      const packageConfig = entry.node.data;
-      if (packageConfig?.packageName && (!!(projectGraph.externalNodes[entry.node.name]?.type === "npm") || !!projectGraph.nodes[entry.node.name])) {
-        const { packageName, version } = packageConfig;
-        if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
-          return;
-        }
-        packageJson.dependencies ??= {};
-        packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
-      }
-    });
-    packageJson.type = "module";
-    packageJson.exports ??= {
-      ".": {
-        import: {
-          types: "./dist/modern/index.d.ts",
-          default: "./dist/modern/index.js"
-        },
-        require: {
-          types: "./dist/modern/index.d.cts",
-          default: "./dist/modern/index.cjs"
-        },
-        ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
-          [removeExtension(entryPoint).replace(sourceRoot, "")]: {
-            types: (0, import_path4.join)(
-              "./dist/modern",
-              `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
-            ),
-            default: (0, import_path4.join)(
-              "./dist/modern",
-              `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
-            )
-          }
-        }))
-      },
-      "./package.json": "./package.json"
-    };
-    packageJson.funding ??= workspacePackageJson.funding;
-    packageJson.types ??= "dist/legacy/index.d.ts";
-    packageJson.main ??= "dist/legacy/index.cjs";
-    packageJson.module ??= "dist/legacy/index.js";
-    options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
-    if (options.includeSrc !== false) {
-      let distSrc = sourceRoot.replace(projectRoot, "");
-      if (distSrc.startsWith("/")) {
-        distSrc = distSrc.substring(1);
-      }
-      packageJson.source ??= `${(0, import_path4.join)(distSrc, "index.ts").replaceAll(
-        "\\",
-        "/"
-      )}`;
-    }
-    packageJson.sideEffects ??= false;
-    packageJson.files ??= ["dist"];
-    if (options.includeSrc !== false && !packageJson.files.includes("src")) {
-      packageJson.files.push("src");
-    }
-    packageJson.publishConfig ??= {
-      access: "public"
-    };
-    packageJson.description ??= workspacePackageJson.description;
-    packageJson.homepage ??= workspacePackageJson.homepage;
-    packageJson.bugs ??= workspacePackageJson.bugs;
-    packageJson.author ??= workspacePackageJson.author;
-    packageJson.license ??= workspacePackageJson.license;
-    packageJson.keywords ??= workspacePackageJson.keywords;
-    packageJson.repository ??= workspacePackageJson.repository;
-    packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path4.join)("packages", context.projectName);
-    const packageJsonPath = (0, import_path4.join)(
-      context.root,
-      options.outputPath,
-      "package.json"
-    );
-    console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
     const prettierOptions = {
       plugins: ["prettier-plugin-packagejson"],
       trailingComma: "none",
@@ -117646,13 +117581,93 @@ ${externalDependencies.map((dep) => {
       arrowParens: "avoid",
       endOfLine: "lf"
     };
-    (0, import_fs3.writeFileSync)(
-      packageJsonPath,
-      await (0, import_prettier.format)(JSON.stringify(packageJson), {
-        ...prettierOptions,
-        parser: "json"
-      })
-    );
+    if (options.generatePackageJson !== false) {
+      const projectGraph = (0, import_devkit.readCachedProjectGraph)();
+      const pathToPackageJson = (0, import_path4.join)(context.root, projectRoot, "package.json");
+      const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
+      delete packageJson.dependencies;
+      externalDependencies.forEach((entry) => {
+        const packageConfig = entry.node.data;
+        if (packageConfig?.packageName && (!!(projectGraph.externalNodes[entry.node.name]?.type === "npm") || !!projectGraph.nodes[entry.node.name])) {
+          const { packageName, version } = packageConfig;
+          if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
+            return;
+          }
+          packageJson.dependencies ??= {};
+          packageJson.dependencies[packageName] = !!projectGraph.nodes[entry.node.name] ? "latest" : version;
+        }
+      });
+      packageJson.type = "module";
+      packageJson.exports ??= {
+        ".": {
+          import: {
+            types: "./dist/modern/index.d.ts",
+            default: "./dist/modern/index.js"
+          },
+          require: {
+            types: "./dist/modern/index.d.cts",
+            default: "./dist/modern/index.cjs"
+          },
+          ...(options.additionalEntryPoints ?? []).map((entryPoint) => ({
+            [removeExtension(entryPoint).replace(sourceRoot, "")]: {
+              types: (0, import_path4.join)(
+                "./dist/modern",
+                `${removeExtension(entryPoint.replace(sourceRoot, ""))}.d.ts`
+              ),
+              default: (0, import_path4.join)(
+                "./dist/modern",
+                `${removeExtension(entryPoint.replace(sourceRoot, ""))}.js`
+              )
+            }
+          }))
+        },
+        "./package.json": "./package.json"
+      };
+      packageJson.funding ??= workspacePackageJson.funding;
+      packageJson.types ??= "dist/legacy/index.d.ts";
+      packageJson.main ??= "dist/legacy/index.cjs";
+      packageJson.module ??= "dist/legacy/index.js";
+      options.platform && options.platform !== "node" && (packageJson.browser ??= "dist/modern/index.global.js");
+      if (options.includeSrc !== false) {
+        let distSrc = sourceRoot.replace(projectRoot, "");
+        if (distSrc.startsWith("/")) {
+          distSrc = distSrc.substring(1);
+        }
+        packageJson.source ??= `${(0, import_path4.join)(distSrc, "index.ts").replaceAll(
+          "\\",
+          "/"
+        )}`;
+      }
+      packageJson.sideEffects ??= false;
+      packageJson.files ??= ["dist"];
+      if (options.includeSrc !== false && !packageJson.files.includes("src")) {
+        packageJson.files.push("src");
+      }
+      packageJson.publishConfig ??= {
+        access: "public"
+      };
+      packageJson.description ??= workspacePackageJson.description;
+      packageJson.homepage ??= workspacePackageJson.homepage;
+      packageJson.bugs ??= workspacePackageJson.bugs;
+      packageJson.author ??= workspacePackageJson.author;
+      packageJson.license ??= workspacePackageJson.license;
+      packageJson.keywords ??= workspacePackageJson.keywords;
+      packageJson.repository ??= workspacePackageJson.repository;
+      packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path4.join)("packages", context.projectName);
+      const packageJsonPath = (0, import_path4.join)(
+        context.root,
+        options.outputPath,
+        "package.json"
+      );
+      console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
+      (0, import_fs3.writeFileSync)(
+        packageJsonPath,
+        await (0, import_prettier.format)(JSON.stringify(packageJson), {
+          ...prettierOptions,
+          parser: "json"
+        })
+      );
+    }
     if (options.includeSrc !== false) {
       const files = globSync([
         (0, import_devkit.joinPathFragments)(context.root, options.outputPath, "src/**/*.ts"),
@@ -117794,6 +117809,7 @@ var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
   options.outputPath ??= "dist/{projectRoot}";
   options.tsConfig ??= "tsconfig.json";
+  options.generatePackageJson ??= true;
   options.splitting ??= true;
   options.treeshake ??= true;
   options.platform ??= "neutral";