@storm-software/workspace-tools 1.22.2 → 1.23.0

package/package.json

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

package/src/executors/tsup/executor.js

@@ -115357,6 +115357,8 @@ function modernConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115385,6 +115387,10 @@ function modernConfig({
       "esnext"
     ] : ["esnext", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -115430,6 +115436,8 @@ function legacyConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115447,6 +115455,10 @@ function legacyConfig({
     format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
     target: ["es2022", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -115492,6 +115504,8 @@ function workerConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115504,6 +115518,7 @@ function workerConfig({
   plugins,
   dtsTsConfig
 }) {
+  let outputPath = (0, import_path3.join)(outDir, "dist");
   return {
     name: "worker",
     entry,
@@ -115511,9 +115526,13 @@ function workerConfig({
     target: ["chrome95"],
     bundle: true,
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_path3.join)(outDir, "dist"),
+    outDir: outputPath,
     silent: !verbose,
     metafile: true,
     shims: false,
@@ -115529,7 +115548,7 @@ function workerConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: (0, import_path3.join)(outDir, "dist")
+          outDir: outputPath
         }
       }
     },
@@ -115553,20 +115572,8 @@ function workerConfig({
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   outputPath,
   tsConfig,
-  debug,
-  banner,
-  platform,
-  external,
-  options,
   additionalEntryPoints,
-  apiReport,
-  docModel,
-  tsdocMetadata,
-  define: define2,
-  env,
-  verbose,
-  dtsTsConfig,
-  plugins,
+  platform,
   ...rest
 }) {
   const entry = globSync(
@@ -115590,24 +115597,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     return ret;
   }, {});
   const params = {
+    ...rest,
     entry,
     outDir: outputPath,
-    projectRoot,
-    workspaceRoot,
     tsconfig: tsConfig,
-    debug,
-    banner,
-    platform,
-    external,
-    verbose,
-    apiReport,
-    docModel,
-    tsdocMetadata,
-    define: define2,
-    env,
-    options,
-    plugins,
-    dtsTsConfig
+    workspaceRoot,
+    projectRoot,
+    sourceRoot,
+    platform
   };
   if (platform === "worker") {
     return (0, import_tsup.defineConfig)(workerConfig(params));
@@ -115811,22 +115808,25 @@ ${externalDependencies.map((dep) => {
       "package.json"
     );
     console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
+    const prettierOptions = {
+      plugins: ["prettier-plugin-packagejson"],
+      trailingComma: "none",
+      tabWidth: 2,
+      semi: true,
+      singleQuote: false,
+      quoteProps: "preserve",
+      insertPragma: false,
+      bracketSameLine: true,
+      printWidth: 80,
+      bracketSpacing: true,
+      arrowParens: "avoid",
+      endOfLine: "lf"
+    };
     (0, import_fs3.writeFileSync)(
       packageJsonPath,
       await (0, import_prettier.format)(JSON.stringify(packageJson), {
-        plugins: ["prettier-plugin-packagejson"],
-        parser: "json",
-        trailingComma: "none",
-        tabWidth: 2,
-        semi: true,
-        singleQuote: false,
-        quoteProps: "preserve",
-        insertPragma: false,
-        bracketSameLine: true,
-        printWidth: 80,
-        bracketSpacing: true,
-        arrowParens: "avoid",
-        endOfLine: "lf"
+        ...prettierOptions,
+        parser: "json"
       })
     );
     if (options.includeSrc !== false) {
@@ -115838,11 +115838,17 @@ ${externalDependencies.map((dep) => {
       ]);
       await Promise.allSettled(
         files.map(
-          (file) => (0, import_promises2.writeFile)(
+          async (file) => (0, import_promises2.writeFile)(
             file,
-            `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
+            await (0, import_prettier.format)(
+              `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
 
 ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
+              {
+                ...prettierOptions,
+                parser: "typescript"
+              }
+            ),
             "utf-8"
           )
         )
@@ -115964,6 +115970,8 @@ var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
   options.outputPath ??= "dist/{projectRoot}";
   options.tsConfig ??= "tsconfig.json";
+  options.splitting ??= true;
+  options.treeshake ??= true;
   options.platform ??= "neutral";
   options.verbose ??= false;
   options.external ??= [];

package/src/executors/tsup/get-config.js

@@ -70615,6 +70615,8 @@ function modernConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -70643,6 +70645,10 @@ function modernConfig({
       "esnext"
     ] : ["esnext", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -70688,6 +70694,8 @@ function legacyConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -70705,6 +70713,10 @@ function legacyConfig({
     format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
     target: ["es2022", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -70750,6 +70762,8 @@ function workerConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -70762,6 +70776,7 @@ function workerConfig({
   plugins,
   dtsTsConfig
 }) {
+  let outputPath = (0, import_path2.join)(outDir, "dist");
   return {
     name: "worker",
     entry,
@@ -70769,9 +70784,13 @@ function workerConfig({
     target: ["chrome95"],
     bundle: true,
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_path2.join)(outDir, "dist"),
+    outDir: outputPath,
     silent: !verbose,
     metafile: true,
     shims: false,
@@ -70787,7 +70806,7 @@ function workerConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: (0, import_path2.join)(outDir, "dist")
+          outDir: outputPath
         }
       }
     },
@@ -70811,20 +70830,8 @@ function workerConfig({
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   outputPath,
   tsConfig,
-  debug,
-  banner,
-  platform,
-  external,
-  options,
   additionalEntryPoints,
-  apiReport,
-  docModel,
-  tsdocMetadata,
-  define: define2,
-  env,
-  verbose,
-  dtsTsConfig,
-  plugins,
+  platform,
   ...rest
 }) {
   const entry = globSync(
@@ -70848,24 +70855,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     return ret;
   }, {});
   const params = {
+    ...rest,
     entry,
     outDir: outputPath,
-    projectRoot,
-    workspaceRoot,
     tsconfig: tsConfig,
-    debug,
-    banner,
-    platform,
-    external,
-    verbose,
-    apiReport,
-    docModel,
-    tsdocMetadata,
-    define: define2,
-    env,
-    options,
-    plugins,
-    dtsTsConfig
+    workspaceRoot,
+    projectRoot,
+    sourceRoot,
+    platform
   };
   if (platform === "worker") {
     return (0, import_tsup.defineConfig)(workerConfig(params));

package/src/executors/tsup/schema.d.ts

@@ -33,4 +33,6 @@ export type TsupExecutorSchema = Omit<
   includeSrc?: boolean;
   platform?: Platform;
   plugins?: any[];
+  splitting?: boolean;
+  treeshake?: boolean;
 };

package/src/executors/tsup/schema.json

@@ -69,7 +69,17 @@
     "includeSrc": {
       "type": "boolean",
       "description": "Should the source files be added to the distribution folder in an `src` directory.",
-      "default": false
+      "default": true
+    },
+    "splitting": {
+      "type": "boolean",
+      "description": "Should the build process preform *code-splitting*?",
+      "default": true
+    },
+    "treeshake": {
+      "type": "boolean",
+      "description": "Should the build process *tree-shake* to remove unused code?",
+      "default": true
     },
     "debug": {
       "type": "boolean",

package/src/executors/tsup-neutral/executor.js

@@ -109110,7 +109110,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
 // packages/workspace-tools/src/utils/get-file-banner.ts
 var getFileBanner = (name, commentStart = "//") => {
   let padding = "";
-  while (name.length + padding.length < 18) {
+  while (name.length + padding.length < 12) {
     padding += " ";
   }
   return `
@@ -115388,6 +115388,8 @@ function modernConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115416,6 +115418,10 @@ function modernConfig({
       "esnext"
     ] : ["esnext", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -115461,6 +115467,8 @@ function legacyConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115478,6 +115486,10 @@ function legacyConfig({
     format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
     target: ["es2022", "node18"],
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
     outDir: outputPath,
@@ -115523,6 +115535,8 @@ function workerConfig({
   projectRoot,
   workspaceRoot,
   tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
   debug = false,
   external,
   banner = {},
@@ -115535,6 +115549,7 @@ function workerConfig({
   plugins,
   dtsTsConfig
 }) {
+  let outputPath = (0, import_path3.join)(outDir, "dist");
   return {
     name: "worker",
     entry,
@@ -115542,9 +115557,13 @@ function workerConfig({
     target: ["chrome95"],
     bundle: true,
     tsconfig,
+    splitting,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
     projectRoot,
     workspaceRoot,
-    outDir: (0, import_path3.join)(outDir, "dist"),
+    outDir: outputPath,
     silent: !verbose,
     metafile: true,
     shims: false,
@@ -115560,7 +115579,7 @@ function workerConfig({
         ...dtsTsConfig,
         options: {
           ...dtsTsConfig.options,
-          outDir: (0, import_path3.join)(outDir, "dist")
+          outDir: outputPath
         }
       }
     },
@@ -115584,20 +115603,8 @@ function workerConfig({
 function getConfig(workspaceRoot, projectRoot, sourceRoot, {
   outputPath,
   tsConfig,
-  debug,
-  banner,
-  platform,
-  external,
-  options,
   additionalEntryPoints,
-  apiReport,
-  docModel,
-  tsdocMetadata,
-  define: define2,
-  env,
-  verbose,
-  dtsTsConfig,
-  plugins,
+  platform,
   ...rest
 }) {
   const entry = globSync(
@@ -115621,24 +115628,14 @@ function getConfig(workspaceRoot, projectRoot, sourceRoot, {
     return ret;
   }, {});
   const params = {
+    ...rest,
     entry,
     outDir: outputPath,
-    projectRoot,
-    workspaceRoot,
     tsconfig: tsConfig,
-    debug,
-    banner,
-    platform,
-    external,
-    verbose,
-    apiReport,
-    docModel,
-    tsdocMetadata,
-    define: define2,
-    env,
-    options,
-    plugins,
-    dtsTsConfig
+    workspaceRoot,
+    projectRoot,
+    sourceRoot,
+    platform
   };
   if (platform === "worker") {
     return (0, import_tsup.defineConfig)(workerConfig(params));
@@ -115842,22 +115839,25 @@ ${externalDependencies.map((dep) => {
       "package.json"
     );
     console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
+    const prettierOptions = {
+      plugins: ["prettier-plugin-packagejson"],
+      trailingComma: "none",
+      tabWidth: 2,
+      semi: true,
+      singleQuote: false,
+      quoteProps: "preserve",
+      insertPragma: false,
+      bracketSameLine: true,
+      printWidth: 80,
+      bracketSpacing: true,
+      arrowParens: "avoid",
+      endOfLine: "lf"
+    };
     (0, import_fs3.writeFileSync)(
       packageJsonPath,
       await (0, import_prettier.format)(JSON.stringify(packageJson), {
-        plugins: ["prettier-plugin-packagejson"],
-        parser: "json",
-        trailingComma: "none",
-        tabWidth: 2,
-        semi: true,
-        singleQuote: false,
-        quoteProps: "preserve",
-        insertPragma: false,
-        bracketSameLine: true,
-        printWidth: 80,
-        bracketSpacing: true,
-        arrowParens: "avoid",
-        endOfLine: "lf"
+        ...prettierOptions,
+        parser: "json"
       })
     );
     if (options.includeSrc !== false) {
@@ -115869,11 +115869,17 @@ ${externalDependencies.map((dep) => {
       ]);
       await Promise.allSettled(
         files.map(
-          (file) => (0, import_promises2.writeFile)(
+          async (file) => (0, import_promises2.writeFile)(
             file,
-            `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
+            await (0, import_prettier.format)(
+              `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
 
 ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
+              {
+                ...prettierOptions,
+                parser: "typescript"
+              }
+            ),
             "utf-8"
           )
         )
@@ -115995,6 +116001,8 @@ var applyDefaultOptions = (options) => {
   options.entry ??= "{sourceRoot}/index.ts";
   options.outputPath ??= "dist/{projectRoot}";
   options.tsConfig ??= "tsconfig.json";
+  options.splitting ??= true;
+  options.treeshake ??= true;
   options.platform ??= "neutral";
   options.verbose ??= false;
   options.external ??= [];