@storm-software/workspace-tools 1.30.9 → 1.30.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.30.9",
+  "version": "1.30.11",
   "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

@@ -117041,12 +117041,82 @@ function modernConfig({
     outExtension
   };
 }
+function legacyConfig({
+  entry,
+  outDir,
+  projectRoot,
+  workspaceRoot,
+  tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
+  debug = false,
+  external,
+  banner = {},
+  platform = "neutral",
+  verbose = false,
+  shims = true,
+  define: define2,
+  env,
+  plugins,
+  generatePackageJson,
+  dtsTsConfig
+}) {
+  let outputPath = (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy");
+  return {
+    name: "legacy",
+    entry,
+    format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
+    target: ["es2022", "node18"],
+    tsconfig,
+    splitting,
+    generatePackageJson,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
+    projectRoot,
+    workspaceRoot,
+    outDir: outputPath,
+    silent: !verbose,
+    metafile: true,
+    shims,
+    external,
+    platform,
+    banner,
+    define: define2,
+    env,
+    dts: false,
+    experimentalDts: {
+      entry,
+      compilerOptions: {
+        ...dtsTsConfig,
+        options: {
+          ...dtsTsConfig.options,
+          outDir: outputPath
+        }
+      }
+    },
+    /*minify: debug ? false : "terser",
+    terserOptions: {
+      compress: true,
+      ecma: 2020,
+      keep_classnames: true,
+      keep_fnames: true
+    },*/
+    apiReport: false,
+    docModel: false,
+    tsdocMetadata: false,
+    sourcemap: debug,
+    clean: false,
+    tsconfigDecoratorMetadata: true,
+    plugins,
+    outExtension
+  };
+}
 function getConfig(workspaceRoot, projectRoot, getConfigFn, {
   outputPath,
   tsConfig,
   additionalEntryPoints,
   platform,
-  emitOnAll = true,
   ...rest
 }) {
   return getConfigFn({
@@ -117255,15 +117325,15 @@ ${externalDependencies.map((dep) => {
       const pathToPackageJson = (0, import_path3.join)(context.root, projectRoot, "package.json");
       const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
       delete packageJson.dependencies;
-      externalDependencies.forEach((entry2) => {
-        const packageConfig = entry2.node.data;
-        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry2.node.name]?.type === "npm")) {
+      externalDependencies.forEach((externalDependency) => {
+        const packageConfig = externalDependency.node.data;
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
           }
           packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = !!projectGraph.nodes[entry2.node.name] ? "latest" : version;
+          packageJson.dependencies[packageName] = !!projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
       });
       internalDependencies.forEach((packageName) => {
@@ -117302,7 +117372,8 @@ ${externalDependencies.map((dep) => {
       };
       packageJson.exports = Object.keys(entry).reduce(
         (ret, key) => {
-          const packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          packageJsonKey = packageJsonKey.replaceAll("/index", "");
           if (!ret[packageJsonKey]) {
             ret[packageJsonKey] = {
               import: {
@@ -117409,53 +117480,58 @@ ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
       })
     );
     options.plugins.push(environmentPlugin(stormEnv));
-    const config = (0, import_tsup.defineConfig)([
-      ...Object.keys(entry).reduce((ret, key) => {
-        ret.push(
-          getConfig(context.root, projectRoot, modernConfig, {
-            ...options,
-            define: {
-              __STORM_CONFIG: JSON.stringify(stormEnv)
-            },
-            env: {
-              __STORM_CONFIG: JSON.stringify(stormEnv),
-              ...stormEnv
-            },
-            dtsTsConfig: getNormalizedTsConfig(
-              context.root,
-              options.outputPath,
-              (0, import_tsc.createTypeScriptCompilationOptions)(
-                (0, import_normalize_options.normalizeOptions)(
-                  {
-                    ...options,
-                    watch: false,
-                    main: key,
-                    transformers: []
-                  },
-                  context.root,
-                  sourceRoot,
-                  workspaceRoot
-                ),
-                context
-              )
-            ),
-            banner: options.banner ? {
-              js: `${options.banner}
+    console.log("\u26A1 Building with the following entry points: ", entry);
+    const config = (0, import_tsup.defineConfig)(
+      Object.keys(entry).reduce((ret, key) => {
+        const getConfigOptions = {
+          ...options,
+          define: {
+            __STORM_CONFIG: JSON.stringify(stormEnv)
+          },
+          env: {
+            __STORM_CONFIG: JSON.stringify(stormEnv),
+            ...stormEnv
+          },
+          dtsTsConfig: getNormalizedTsConfig(
+            context.root,
+            options.outputPath,
+            (0, import_tsc.createTypeScriptCompilationOptions)(
+              (0, import_normalize_options.normalizeOptions)(
+                {
+                  ...options,
+                  watch: false,
+                  main: entry[key],
+                  transformers: []
+                },
+                context.root,
+                sourceRoot,
+                workspaceRoot
+              ),
+              context
+            )
+          ),
+          banner: options.banner ? {
+            js: `${options.banner}
 
 `,
-              css: `/* 
+            css: `/* 
 ${options.banner}
  */
 
 `
-            } : void 0,
-            outputPath: options.outputPath,
-            entry: key
-          })
+          } : void 0,
+          outputPath: options.outputPath,
+          entry: entry[key]
+        };
+        ret.push(
+          getConfig(context.root, projectRoot, legacyConfig, getConfigOptions)
+        );
+        ret.push(
+          getConfig(context.root, projectRoot, modernConfig, getConfigOptions)
         );
         return ret;
       }, [])
-    ]);
+    );
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
     } else {

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

@@ -18474,7 +18474,6 @@ function getConfig(workspaceRoot, projectRoot, getConfigFn, {
   tsConfig,
   additionalEntryPoints,
   platform,
-  emitOnAll = true,
   ...rest
 }) {
   return getConfigFn({

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

@@ -117072,12 +117072,82 @@ function modernConfig({
     outExtension
   };
 }
+function legacyConfig({
+  entry,
+  outDir,
+  projectRoot,
+  workspaceRoot,
+  tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
+  debug = false,
+  external,
+  banner = {},
+  platform = "neutral",
+  verbose = false,
+  shims = true,
+  define: define2,
+  env,
+  plugins,
+  generatePackageJson,
+  dtsTsConfig
+}) {
+  let outputPath = (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy");
+  return {
+    name: "legacy",
+    entry,
+    format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
+    target: ["es2022", "node18"],
+    tsconfig,
+    splitting,
+    generatePackageJson,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
+    projectRoot,
+    workspaceRoot,
+    outDir: outputPath,
+    silent: !verbose,
+    metafile: true,
+    shims,
+    external,
+    platform,
+    banner,
+    define: define2,
+    env,
+    dts: false,
+    experimentalDts: {
+      entry,
+      compilerOptions: {
+        ...dtsTsConfig,
+        options: {
+          ...dtsTsConfig.options,
+          outDir: outputPath
+        }
+      }
+    },
+    /*minify: debug ? false : "terser",
+    terserOptions: {
+      compress: true,
+      ecma: 2020,
+      keep_classnames: true,
+      keep_fnames: true
+    },*/
+    apiReport: false,
+    docModel: false,
+    tsdocMetadata: false,
+    sourcemap: debug,
+    clean: false,
+    tsconfigDecoratorMetadata: true,
+    plugins,
+    outExtension
+  };
+}
 function getConfig(workspaceRoot, projectRoot, getConfigFn, {
   outputPath,
   tsConfig,
   additionalEntryPoints,
   platform,
-  emitOnAll = true,
   ...rest
 }) {
   return getConfigFn({
@@ -117286,15 +117356,15 @@ ${externalDependencies.map((dep) => {
       const pathToPackageJson = (0, import_path3.join)(context.root, projectRoot, "package.json");
       const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
       delete packageJson.dependencies;
-      externalDependencies.forEach((entry2) => {
-        const packageConfig = entry2.node.data;
-        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry2.node.name]?.type === "npm")) {
+      externalDependencies.forEach((externalDependency) => {
+        const packageConfig = externalDependency.node.data;
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
           }
           packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = !!projectGraph.nodes[entry2.node.name] ? "latest" : version;
+          packageJson.dependencies[packageName] = !!projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
       });
       internalDependencies.forEach((packageName) => {
@@ -117333,7 +117403,8 @@ ${externalDependencies.map((dep) => {
       };
       packageJson.exports = Object.keys(entry).reduce(
         (ret, key) => {
-          const packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          packageJsonKey = packageJsonKey.replaceAll("/index", "");
           if (!ret[packageJsonKey]) {
             ret[packageJsonKey] = {
               import: {
@@ -117440,53 +117511,58 @@ ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
       })
     );
     options.plugins.push(environmentPlugin(stormEnv));
-    const config = (0, import_tsup.defineConfig)([
-      ...Object.keys(entry).reduce((ret, key) => {
-        ret.push(
-          getConfig(context.root, projectRoot, modernConfig, {
-            ...options,
-            define: {
-              __STORM_CONFIG: JSON.stringify(stormEnv)
-            },
-            env: {
-              __STORM_CONFIG: JSON.stringify(stormEnv),
-              ...stormEnv
-            },
-            dtsTsConfig: getNormalizedTsConfig(
-              context.root,
-              options.outputPath,
-              (0, import_tsc.createTypeScriptCompilationOptions)(
-                (0, import_normalize_options.normalizeOptions)(
-                  {
-                    ...options,
-                    watch: false,
-                    main: key,
-                    transformers: []
-                  },
-                  context.root,
-                  sourceRoot,
-                  workspaceRoot
-                ),
-                context
-              )
-            ),
-            banner: options.banner ? {
-              js: `${options.banner}
+    console.log("\u26A1 Building with the following entry points: ", entry);
+    const config = (0, import_tsup.defineConfig)(
+      Object.keys(entry).reduce((ret, key) => {
+        const getConfigOptions = {
+          ...options,
+          define: {
+            __STORM_CONFIG: JSON.stringify(stormEnv)
+          },
+          env: {
+            __STORM_CONFIG: JSON.stringify(stormEnv),
+            ...stormEnv
+          },
+          dtsTsConfig: getNormalizedTsConfig(
+            context.root,
+            options.outputPath,
+            (0, import_tsc.createTypeScriptCompilationOptions)(
+              (0, import_normalize_options.normalizeOptions)(
+                {
+                  ...options,
+                  watch: false,
+                  main: entry[key],
+                  transformers: []
+                },
+                context.root,
+                sourceRoot,
+                workspaceRoot
+              ),
+              context
+            )
+          ),
+          banner: options.banner ? {
+            js: `${options.banner}
 
 `,
-              css: `/* 
+            css: `/* 
 ${options.banner}
  */
 
 `
-            } : void 0,
-            outputPath: options.outputPath,
-            entry: key
-          })
+          } : void 0,
+          outputPath: options.outputPath,
+          entry: entry[key]
+        };
+        ret.push(
+          getConfig(context.root, projectRoot, legacyConfig, getConfigOptions)
+        );
+        ret.push(
+          getConfig(context.root, projectRoot, modernConfig, getConfigOptions)
         );
         return ret;
       }, [])
-    ]);
+    );
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
     } else {

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

@@ -117072,12 +117072,82 @@ function modernConfig({
     outExtension
   };
 }
+function legacyConfig({
+  entry,
+  outDir,
+  projectRoot,
+  workspaceRoot,
+  tsconfig = "tsconfig.json",
+  splitting,
+  treeshake,
+  debug = false,
+  external,
+  banner = {},
+  platform = "neutral",
+  verbose = false,
+  shims = true,
+  define: define2,
+  env,
+  plugins,
+  generatePackageJson,
+  dtsTsConfig
+}) {
+  let outputPath = (0, import_devkit.joinPathFragments)(outDir, "dist", "legacy");
+  return {
+    name: "legacy",
+    entry,
+    format: platform !== "node" ? ["cjs", "esm", "iife"] : ["cjs", "esm"],
+    target: ["es2022", "node18"],
+    tsconfig,
+    splitting,
+    generatePackageJson,
+    treeshake: treeshake ? {
+      preset: "recommended"
+    } : false,
+    projectRoot,
+    workspaceRoot,
+    outDir: outputPath,
+    silent: !verbose,
+    metafile: true,
+    shims,
+    external,
+    platform,
+    banner,
+    define: define2,
+    env,
+    dts: false,
+    experimentalDts: {
+      entry,
+      compilerOptions: {
+        ...dtsTsConfig,
+        options: {
+          ...dtsTsConfig.options,
+          outDir: outputPath
+        }
+      }
+    },
+    /*minify: debug ? false : "terser",
+    terserOptions: {
+      compress: true,
+      ecma: 2020,
+      keep_classnames: true,
+      keep_fnames: true
+    },*/
+    apiReport: false,
+    docModel: false,
+    tsdocMetadata: false,
+    sourcemap: debug,
+    clean: false,
+    tsconfigDecoratorMetadata: true,
+    plugins,
+    outExtension
+  };
+}
 function getConfig(workspaceRoot, projectRoot, getConfigFn, {
   outputPath,
   tsConfig,
   additionalEntryPoints,
   platform,
-  emitOnAll = true,
   ...rest
 }) {
   return getConfigFn({
@@ -117286,15 +117356,15 @@ ${externalDependencies.map((dep) => {
       const pathToPackageJson = (0, import_path3.join)(context.root, projectRoot, "package.json");
       const packageJson = (0, import_fileutils.fileExists)(pathToPackageJson) ? (0, import_devkit2.readJsonFile)(pathToPackageJson) : { name: context.projectName, version: "0.0.1" };
       delete packageJson.dependencies;
-      externalDependencies.forEach((entry2) => {
-        const packageConfig = entry2.node.data;
-        if (packageConfig?.packageName && !!(projectGraph.externalNodes[entry2.node.name]?.type === "npm")) {
+      externalDependencies.forEach((externalDependency) => {
+        const packageConfig = externalDependency.node.data;
+        if (packageConfig?.packageName && !!(projectGraph.externalNodes[externalDependency.node.name]?.type === "npm")) {
           const { packageName, version } = packageConfig;
           if (workspacePackageJson.dependencies?.[packageName] || workspacePackageJson.devDependencies?.[packageName]) {
             return;
           }
           packageJson.dependencies ??= {};
-          packageJson.dependencies[packageName] = !!projectGraph.nodes[entry2.node.name] ? "latest" : version;
+          packageJson.dependencies[packageName] = !!projectGraph.nodes[externalDependency.node.name] ? "latest" : version;
         }
       });
       internalDependencies.forEach((packageName) => {
@@ -117333,7 +117403,8 @@ ${externalDependencies.map((dep) => {
       };
       packageJson.exports = Object.keys(entry).reduce(
         (ret, key) => {
-          const packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          let packageJsonKey = key.startsWith("./") ? key : `./${key}`;
+          packageJsonKey = packageJsonKey.replaceAll("/index", "");
           if (!ret[packageJsonKey]) {
             ret[packageJsonKey] = {
               import: {
@@ -117440,53 +117511,58 @@ ${(0, import_fs3.readFileSync)(file, "utf-8")}`,
       })
     );
     options.plugins.push(environmentPlugin(stormEnv));
-    const config = (0, import_tsup.defineConfig)([
-      ...Object.keys(entry).reduce((ret, key) => {
-        ret.push(
-          getConfig(context.root, projectRoot, modernConfig, {
-            ...options,
-            define: {
-              __STORM_CONFIG: JSON.stringify(stormEnv)
-            },
-            env: {
-              __STORM_CONFIG: JSON.stringify(stormEnv),
-              ...stormEnv
-            },
-            dtsTsConfig: getNormalizedTsConfig(
-              context.root,
-              options.outputPath,
-              (0, import_tsc.createTypeScriptCompilationOptions)(
-                (0, import_normalize_options.normalizeOptions)(
-                  {
-                    ...options,
-                    watch: false,
-                    main: key,
-                    transformers: []
-                  },
-                  context.root,
-                  sourceRoot,
-                  workspaceRoot
-                ),
-                context
-              )
-            ),
-            banner: options.banner ? {
-              js: `${options.banner}
+    console.log("\u26A1 Building with the following entry points: ", entry);
+    const config = (0, import_tsup.defineConfig)(
+      Object.keys(entry).reduce((ret, key) => {
+        const getConfigOptions = {
+          ...options,
+          define: {
+            __STORM_CONFIG: JSON.stringify(stormEnv)
+          },
+          env: {
+            __STORM_CONFIG: JSON.stringify(stormEnv),
+            ...stormEnv
+          },
+          dtsTsConfig: getNormalizedTsConfig(
+            context.root,
+            options.outputPath,
+            (0, import_tsc.createTypeScriptCompilationOptions)(
+              (0, import_normalize_options.normalizeOptions)(
+                {
+                  ...options,
+                  watch: false,
+                  main: entry[key],
+                  transformers: []
+                },
+                context.root,
+                sourceRoot,
+                workspaceRoot
+              ),
+              context
+            )
+          ),
+          banner: options.banner ? {
+            js: `${options.banner}
 
 `,
-              css: `/* 
+            css: `/* 
 ${options.banner}
  */
 
 `
-            } : void 0,
-            outputPath: options.outputPath,
-            entry: key
-          })
+          } : void 0,
+          outputPath: options.outputPath,
+          entry: entry[key]
+        };
+        ret.push(
+          getConfig(context.root, projectRoot, legacyConfig, getConfigOptions)
+        );
+        ret.push(
+          getConfig(context.root, projectRoot, modernConfig, getConfigOptions)
         );
         return ret;
       }, [])
-    ]);
+    );
     if (typeof config === "function") {
       await build(await Promise.resolve(config({})));
     } else {