@storm-software/workspace-tools 1.62.0 → 1.62.1

package/package.json

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

@@ -462433,7 +462433,14 @@ var _isFunction = (value) => {
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var removeExtension = (filePath) => {
-  return !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  const result = !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  if (result.startsWith("./")) {
+    return result.substring(2);
+  }
+  if (result.startsWith(".") || result.startsWith("/")) {
+    return result.substring(1);
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/utils/get-project-configurations.ts
@@ -462669,6 +462676,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -462676,7 +462684,7 @@ var runTsupBuild = async (context, config, options8) => {
   options8.plugins?.push(
     (0, import_esbuild_decorators.esbuildDecorators)({
       tsconfig: options8.tsConfig,
-      cwd: config.workspaceRoot
+      cwd: workspaceRoot
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
@@ -462696,8 +462704,7 @@ var runTsupBuild = async (context, config, options8) => {
       ...stormEnv
     },
     dtsTsConfig: getNormalizedTsConfig(
-      context,
-      config.workspaceRoot ?? ".",
+      workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
         (0, import_normalize_options.normalizeOptions)(
@@ -462707,9 +462714,9 @@ var runTsupBuild = async (context, config, options8) => {
             main: context.main,
             transformers: []
           },
-          config.workspaceRoot ?? ".",
+          workspaceRoot,
           context.sourceRoot,
-          config.workspaceRoot ?? "."
+          workspaceRoot
         ),
         context.projectName
       )
@@ -462732,7 +462739,7 @@ ${options8.banner}
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
-        (getConfigFn) => getConfig(config.workspaceRoot ?? ".", context.projectRoot, getConfigFn, getConfigOptions)
+        (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction2(tsupConfig)) {
@@ -462748,19 +462755,15 @@ ${options8.banner}
     );
   }
 };
-function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
+function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   const config = (0, import_typescript.readConfigFile)(options8.tsConfig, import_typescript.sys.readFile).config;
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
       compilerOptions: {
         ...config?.compilerOptions,
-        entry: {
-          [removeExtension(context.main).replace(workspaceRoot, "").replace(context.sourceRoot, "")]: context.main
-        },
+        include: ["**/*"],
         outDir: outputPath,
-        rootDir: workspaceRoot,
-        baseUrl: workspaceRoot,
         noEmit: false,
         esModuleInterop: true,
         downlevelIteration: true,

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

@@ -456441,7 +456441,14 @@ var outExtension = ({ format: format3 }) => {
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var removeExtension = (filePath) => {
-  return !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  const result = !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  if (result.startsWith("./")) {
+    return result.substring(2);
+  }
+  if (result.startsWith(".") || result.startsWith("/")) {
+    return result.substring(1);
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
@@ -456479,6 +456486,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -456486,7 +456494,7 @@ var runTsupBuild = async (context, config, options8) => {
   options8.plugins?.push(
     (0, import_esbuild_decorators.esbuildDecorators)({
       tsconfig: options8.tsConfig,
-      cwd: config.workspaceRoot
+      cwd: workspaceRoot
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
@@ -456506,8 +456514,7 @@ var runTsupBuild = async (context, config, options8) => {
       ...stormEnv
     },
     dtsTsConfig: getNormalizedTsConfig(
-      context,
-      config.workspaceRoot ?? ".",
+      workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
         (0, import_normalize_options.normalizeOptions)(
@@ -456517,9 +456524,9 @@ var runTsupBuild = async (context, config, options8) => {
             main: context.main,
             transformers: []
           },
-          config.workspaceRoot ?? ".",
+          workspaceRoot,
           context.sourceRoot,
-          config.workspaceRoot ?? "."
+          workspaceRoot
         ),
         context.projectName
       )
@@ -456542,7 +456549,7 @@ ${options8.banner}
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
-        (getConfigFn) => getConfig(config.workspaceRoot ?? ".", context.projectRoot, getConfigFn, getConfigOptions)
+        (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction2(tsupConfig)) {
@@ -456558,19 +456565,15 @@ ${options8.banner}
     );
   }
 };
-function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
+function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   const config = (0, import_typescript.readConfigFile)(options8.tsConfig, import_typescript.sys.readFile).config;
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
       compilerOptions: {
         ...config?.compilerOptions,
-        entry: {
-          [removeExtension(context.main).replace(workspaceRoot, "").replace(context.sourceRoot, "")]: context.main
-        },
+        include: ["**/*"],
         outDir: outputPath,
-        rootDir: workspaceRoot,
-        baseUrl: workspaceRoot,
         noEmit: false,
         esModuleInterop: true,
         downlevelIteration: true,

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

@@ -456441,7 +456441,14 @@ var outExtension = ({ format: format3 }) => {
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var removeExtension = (filePath) => {
-  return !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  const result = !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  if (result.startsWith("./")) {
+    return result.substring(2);
+  }
+  if (result.startsWith(".") || result.startsWith("/")) {
+    return result.substring(1);
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
@@ -456479,6 +456486,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -456486,7 +456494,7 @@ var runTsupBuild = async (context, config, options8) => {
   options8.plugins?.push(
     (0, import_esbuild_decorators.esbuildDecorators)({
       tsconfig: options8.tsConfig,
-      cwd: config.workspaceRoot
+      cwd: workspaceRoot
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
@@ -456506,8 +456514,7 @@ var runTsupBuild = async (context, config, options8) => {
       ...stormEnv
     },
     dtsTsConfig: getNormalizedTsConfig(
-      context,
-      config.workspaceRoot ?? ".",
+      workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
         (0, import_normalize_options.normalizeOptions)(
@@ -456517,9 +456524,9 @@ var runTsupBuild = async (context, config, options8) => {
             main: context.main,
             transformers: []
           },
-          config.workspaceRoot ?? ".",
+          workspaceRoot,
           context.sourceRoot,
-          config.workspaceRoot ?? "."
+          workspaceRoot
         ),
         context.projectName
       )
@@ -456542,7 +456549,7 @@ ${options8.banner}
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
-        (getConfigFn) => getConfig(config.workspaceRoot ?? ".", context.projectRoot, getConfigFn, getConfigOptions)
+        (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction2(tsupConfig)) {
@@ -456558,19 +456565,15 @@ ${options8.banner}
     );
   }
 };
-function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
+function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   const config = (0, import_typescript.readConfigFile)(options8.tsConfig, import_typescript.sys.readFile).config;
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
       compilerOptions: {
         ...config?.compilerOptions,
-        entry: {
-          [removeExtension(context.main).replace(workspaceRoot, "").replace(context.sourceRoot, "")]: context.main
-        },
+        include: ["**/*"],
         outDir: outputPath,
-        rootDir: workspaceRoot,
-        baseUrl: workspaceRoot,
         noEmit: false,
         esModuleInterop: true,
         downlevelIteration: true,

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

@@ -456441,7 +456441,14 @@ var outExtension = ({ format: format3 }) => {
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var removeExtension = (filePath) => {
-  return !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  const result = !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  if (result.startsWith("./")) {
+    return result.substring(2);
+  }
+  if (result.startsWith(".") || result.startsWith("/")) {
+    return result.substring(1);
+  }
+  return result;
 };
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
@@ -456479,6 +456486,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -456486,7 +456494,7 @@ var runTsupBuild = async (context, config, options8) => {
   options8.plugins?.push(
     (0, import_esbuild_decorators.esbuildDecorators)({
       tsconfig: options8.tsConfig,
-      cwd: config.workspaceRoot
+      cwd: workspaceRoot
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
@@ -456506,8 +456514,7 @@ var runTsupBuild = async (context, config, options8) => {
       ...stormEnv
     },
     dtsTsConfig: getNormalizedTsConfig(
-      context,
-      config.workspaceRoot ?? ".",
+      workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
         (0, import_normalize_options.normalizeOptions)(
@@ -456517,9 +456524,9 @@ var runTsupBuild = async (context, config, options8) => {
             main: context.main,
             transformers: []
           },
-          config.workspaceRoot ?? ".",
+          workspaceRoot,
           context.sourceRoot,
-          config.workspaceRoot ?? "."
+          workspaceRoot
         ),
         context.projectName
       )
@@ -456542,7 +456549,7 @@ ${options8.banner}
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
-        (getConfigFn) => getConfig(config.workspaceRoot ?? ".", context.projectRoot, getConfigFn, getConfigOptions)
+        (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction2(tsupConfig)) {
@@ -456558,19 +456565,15 @@ ${options8.banner}
     );
   }
 };
-function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
+function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   const config = (0, import_typescript.readConfigFile)(options8.tsConfig, import_typescript.sys.readFile).config;
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
       compilerOptions: {
         ...config?.compilerOptions,
-        entry: {
-          [removeExtension(context.main).replace(workspaceRoot, "").replace(context.sourceRoot, "")]: context.main
-        },
+        include: ["**/*"],
         outDir: outputPath,
-        rootDir: workspaceRoot,
-        baseUrl: workspaceRoot,
         noEmit: false,
         esModuleInterop: true,
         downlevelIteration: true,

package/src/utils/index.js

@@ -460954,7 +460954,14 @@ var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var import_node_path2 = require("node:path");
 var removeExtension = (filePath) => {
-  return !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  const result = !filePath || (filePath.match(/./g) || []).length <= 1 ? "." : filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
+  if (result.startsWith("./")) {
+    return result.substring(2);
+  }
+  if (result.startsWith(".") || result.startsWith("/")) {
+    return result.substring(1);
+  }
+  return result;
 };
 function findFileName(filePath) {
   return filePath?.split(filePath?.includes(import_node_path2.sep) ? import_node_path2.sep : filePath?.includes("/") ? "/" : "\\")?.pop() ?? "";
@@ -461268,6 +461275,7 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -461275,7 +461283,7 @@ var runTsupBuild = async (context, config, options8) => {
   options8.plugins?.push(
     (0, import_esbuild_decorators.esbuildDecorators)({
       tsconfig: options8.tsConfig,
-      cwd: config.workspaceRoot
+      cwd: workspaceRoot
     })
   );
   options8.plugins?.push(environmentPlugin(stormEnv));
@@ -461295,8 +461303,7 @@ var runTsupBuild = async (context, config, options8) => {
       ...stormEnv
     },
     dtsTsConfig: getNormalizedTsConfig(
-      context,
-      config.workspaceRoot ?? ".",
+      workspaceRoot,
       options8.outputPath,
       createTypeScriptCompilationOptions(
         (0, import_normalize_options.normalizeOptions)(
@@ -461306,9 +461313,9 @@ var runTsupBuild = async (context, config, options8) => {
             main: context.main,
             transformers: []
           },
-          config.workspaceRoot ?? ".",
+          workspaceRoot,
           context.sourceRoot,
-          config.workspaceRoot ?? "."
+          workspaceRoot
         ),
         context.projectName
       )
@@ -461331,7 +461338,7 @@ ${options8.banner}
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
-        (getConfigFn) => getConfig(config.workspaceRoot ?? ".", context.projectRoot, getConfigFn, getConfigOptions)
+        (getConfigFn) => getConfig(workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
     if (_isFunction(tsupConfig)) {
@@ -461347,19 +461354,15 @@ ${options8.banner}
     );
   }
 };
-function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
+function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   const config = (0, import_typescript.readConfigFile)(options8.tsConfig, import_typescript.sys.readFile).config;
   const tsConfig = (0, import_typescript.parseJsonConfigFileContent)(
     {
       ...config,
       compilerOptions: {
         ...config?.compilerOptions,
-        entry: {
-          [removeExtension(context.main).replace(workspaceRoot, "").replace(context.sourceRoot, "")]: context.main
-        },
+        include: ["**/*"],
         outDir: outputPath,
-        rootDir: workspaceRoot,
-        baseUrl: workspaceRoot,
         noEmit: false,
         esModuleInterop: true,
         downlevelIteration: true,