@storm-software/workspace-tools 1.180.10 → 1.181.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.180.10",
+  "version": "1.181.1",
   "type": "commonjs",
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "repository": {

package/src/executors/rollup/executor.js

@@ -94143,9 +94143,9 @@ var init_get_default_config = __esm({
       let repository = "https://github.com/storm-software/storm-ops";
       let license = DEFAULT_STORM_CONFIG.license;
       let homepage = DEFAULT_STORM_CONFIG.homepage;
-      const workspaceRoot3 = findWorkspaceRoot(root);
-      if ((0, import_node_fs10.existsSync)((0, import_node_path11.join)(workspaceRoot3, "package.json"))) {
-        const file = (0, import_node_fs10.readFileSync)((0, import_node_path11.join)(workspaceRoot3, "package.json"), {
+      const workspaceRoot2 = findWorkspaceRoot(root);
+      if ((0, import_node_fs10.existsSync)((0, import_node_path11.join)(workspaceRoot2, "package.json"))) {
+        const file = (0, import_node_fs10.readFileSync)((0, import_node_path11.join)(workspaceRoot2, "package.json"), {
           encoding: "utf-8"
         });
         if (file) {
@@ -94178,7 +94178,7 @@ var init_get_default_config = __esm({
           return ret;
         }, {}),
         colors: { ...DEFAULT_COLOR_CONFIG, ...config.colors },
-        workspaceRoot: workspaceRoot3,
+        workspaceRoot: workspaceRoot2,
         name,
         namespace,
         repository,
@@ -95024,14 +95024,14 @@ var init_create_storm_config = __esm({
     init_get_default_config();
     _extension_cache = /* @__PURE__ */ new WeakMap();
     _static_cache = void 0;
-    createConfig = (workspaceRoot3) => {
-      return createStormConfig(void 0, void 0, workspaceRoot3);
+    createConfig = (workspaceRoot2) => {
+      return createStormConfig(void 0, void 0, workspaceRoot2);
     };
-    createStormConfig = (extensionName, schema, workspaceRoot3) => {
+    createStormConfig = (extensionName, schema, workspaceRoot2) => {
       let result;
       if (!_static_cache?.data || !_static_cache?.timestamp || _static_cache.timestamp < Date.now() - 3e4) {
         const config = getConfigEnv();
-        const defaultConfig = getDefaultConfig(config, workspaceRoot3);
+        const defaultConfig = getDefaultConfig(config, workspaceRoot2);
         result = StormConfigSchema.parse({
           ...defaultConfig,
           ...config,
@@ -95040,7 +95040,7 @@ var init_create_storm_config = __esm({
             ...config.colors
           }
         });
-        result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot3);
+        result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot2);
       } else {
         result = _static_cache.data;
       }
@@ -95068,7 +95068,7 @@ var init_create_storm_config = __esm({
       _extension_cache.set(extension_cache_key, extension);
       return extension;
     };
-    loadStormConfig = async (workspaceRoot3) => {
+    loadStormConfig = async (workspaceRoot2) => {
       let config = {};
       if (_static_cache?.data && _static_cache?.timestamp && _static_cache.timestamp >= Date.now() + 3e4) {
         writeInfo(
@@ -95077,7 +95077,7 @@ var init_create_storm_config = __esm({
         );
         return _static_cache.data;
       }
-      let _workspaceRoot = workspaceRoot3;
+      let _workspaceRoot = workspaceRoot2;
       if (!_workspaceRoot) {
         _workspaceRoot = findWorkspaceRoot();
       }
@@ -200339,22 +200339,22 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
         "The Build process failed because the context is not valid. Please run this command from a workspace."
       );
     }
-    const workspaceRoot3 = findWorkspaceRoot2();
-    const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot3;
-    const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot3;
+    const workspaceRoot2 = findWorkspaceRoot2();
+    const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot2;
+    const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot2;
     const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
-    config.workspaceRoot = workspaceRoot3;
+    config.workspaceRoot = workspaceRoot2;
     if (!executorOptions.skipReadingConfig) {
       writeDebug2(
         `Loading the Storm Config from environment variables and storm.config.js file...
- - workspaceRoot: ${workspaceRoot3}
+ - workspaceRoot: ${workspaceRoot2}
  - projectRoot: ${projectRoot}
  - sourceRoot: ${sourceRoot}
  - projectName: ${projectName}
 `,
         config
       );
-      config = await loadStormConfig2(workspaceRoot3);
+      config = await loadStormConfig2(workspaceRoot2);
     }
     if (executorOptions?.hooks?.applyDefaultOptions) {
       writeDebug2("Running the applyDefaultOptions hook...", config);
@@ -200374,7 +200374,7 @@ ${Object.keys(options).map(
       options,
       {
         config,
-        workspaceRoot: workspaceRoot3,
+        workspaceRoot: workspaceRoot2,
         projectRoot,
         sourceRoot,
         projectName,
@@ -201916,7 +201916,7 @@ var import_devkit = require("@nx/devkit");
 var import_js = require("@nx/js");
 var import_node_fs11 = require("node:fs");
 var import_node_path12 = require("node:path");
-function normalizeOptions(projectRoot, sourceRoot, options) {
+function normalizeOptions(projectRoot, sourceRoot, options, config) {
   if (global.NX_GRAPH_CREATION)
     return options;
   normalizeRelativePaths(projectRoot, options);
@@ -201936,7 +201936,10 @@ function normalizeOptions(projectRoot, sourceRoot, options) {
     generateExportsField: options.generateExportsField ?? false,
     javascriptEnabled: options.javascriptEnabled ?? false,
     skipTypeCheck: options.skipTypeCheck ?? false,
-    skipTypeField: options.skipTypeField ?? false
+    skipTypeField: options.skipTypeField ?? false,
+    projectRoot,
+    sourceRoot,
+    config
   };
 }
 function normalizeAssets(assets, root, sourceRoot) {
@@ -202027,12 +202030,14 @@ function analyze() {
     }
   };
 }
-async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
+async function withRollupConfig(rawOptions, rollupConfig = {}, config, dependencies) {
   const { writeWarning: writeWarning2, correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
   const ts = (0, import_ensure_typescript.ensureTypescript)();
   const finalConfig = { ...rollupConfig };
   const projectNode = getProjectNode();
-  const projectRoot = correctPaths2((0, import_node_path13.join)(import_devkit2.workspaceRoot, projectNode.data.root));
+  const projectRoot = correctPaths2(
+    (0, import_node_path13.join)(config.workspaceRoot, projectNode.data.root)
+  );
   const projectGraph = global.NX_GRAPH_CREATION ? null : (0, import_devkit2.readCachedProjectGraph)();
   if (!projectGraph) {
     throw new Error(`Cannot find project graph.`);
@@ -202051,7 +202056,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
     const result = (0, import_buildable_libs_utils.calculateProjectBuildableDependencies)(
       void 0,
       projectGraph,
-      import_devkit2.workspaceRoot,
+      config.workspaceRoot,
       projectNode.name,
       process.env.NX_TASK_TARGET_TARGET,
       process.env.NX_TASK_TARGET_CONFIGURATION,
@@ -202065,13 +202070,16 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
   const options = normalizeOptions(
     projectNode.data.root,
     projectNode.data.sourceRoot,
-    rawOptions
+    rawOptions,
+    config
+  );
+  const tsConfigPath = correctPaths2(
+    (0, import_node_path13.join)(config.workspaceRoot, options.tsConfig)
   );
-  const tsConfigPath = correctPaths2((0, import_node_path13.join)(import_devkit2.workspaceRoot, options.tsConfig));
   const tsConfigFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
   const tsConfigInclude = [
     ...tsConfigFile.config?.include && Array.isArray(tsConfigFile.config.include) ? tsConfigFile.config.include : [],
-    (0, import_node_path13.join)(import_devkit2.workspaceRoot, "node_modules/typescript/lib/*.d.ts")
+    (0, import_node_path13.join)(config.workspaceRoot, "node_modules/typescript/lib/*.d.ts")
   ];
   const tsConfig = ts.parseJsonConfigFileContent(
     {
@@ -202090,7 +202098,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
       config
     );
   }
-  finalConfig.input = rollupConfig.input || createInput(options);
+  finalConfig.input = rollupConfig.input || await createInput(options);
   if (options.format) {
     if (Array.isArray(rollupConfig.output)) {
       throw new Error(
@@ -202114,13 +202122,13 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         // Options are not normalized with project root during graph creation due to the lack of project and project root.
         // Cannot be joined with workspace root now, but will be handled by @nx/rollup/plugin.
         options.outputPath
-      ) : correctPaths2((0, import_node_path13.join)(import_devkit2.workspaceRoot, options.outputPath)),
+      ) : correctPaths2((0, import_node_path13.join)(config.workspaceRoot, options.outputPath)),
       sourcemap: options.sourceMap
     }));
   }
   let packageJson = {};
   if (!global.NX_GRAPH_CREATION) {
-    const packageJsonPath = options.project ? (0, import_node_path13.join)(import_devkit2.workspaceRoot, options.project) : (0, import_node_path13.join)(projectRoot, "package.json");
+    const packageJsonPath = options.project ? (0, import_node_path13.join)(config.workspaceRoot, options.project) : (0, import_node_path13.join)(projectRoot, "package.json");
     if (!(0, import_node_fs12.existsSync)(packageJsonPath)) {
       throw new Error(`Cannot find ${packageJsonPath}.`);
     }
@@ -202166,7 +202174,8 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
       copy({
         targets: convertCopyAssetsToRollupOptions(
           options.outputPath,
-          options.assets
+          options.assets,
+          config.workspaceRoot
         )
       }),
       image(),
@@ -202176,7 +202185,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         extensions: fileExtensions
       }),
       require_rollup_plugin_typescript2_cjs()({
-        cwd: correctPaths2(import_devkit2.workspaceRoot),
+        cwd: correctPaths2(config.workspaceRoot),
         check: !options.skipTypeCheck,
         typescript: ts,
         tsconfig: options.tsConfig,
@@ -202214,7 +202223,7 @@ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, con
         },
         cwd: correctPaths2(
           (0, import_node_path13.join)(
-            import_devkit2.workspaceRoot,
+            config.workspaceRoot,
             projectNode.data.sourceRoot ?? projectNode.data.root
           )
         ),
@@ -202250,15 +202259,34 @@ function convertRpts2LogLevel(logLevel) {
       return 0;
   }
 }
-function createInput(options) {
+async function createInput(options) {
+  const { correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
   if (global.NX_GRAPH_CREATION) return {};
   const mainEntryFileName = options.outputFileName || options.main;
   const input = {};
-  input[(0, import_node_path13.parse)(mainEntryFileName).name] = (0, import_node_path13.join)(import_devkit2.workspaceRoot, options.main);
+  input[(0, import_node_path13.parse)(mainEntryFileName).name] = (0, import_node_path13.join)(
+    options.config.workspaceRoot,
+    options.main
+  );
   options.additionalEntryPoints?.forEach((entry) => {
-    input[(0, import_node_path13.parse)(entry).name] = (0, import_node_path13.join)(import_devkit2.workspaceRoot, entry);
+    const entryPoint = correctPaths2((0, import_node_path13.join)(options.config.workspaceRoot, entry));
+    let entryName = entryPoint.includes(
+      options.sourceRoot.replaceAll("\\", "/")
+    ) ? entryPoint.replace(options.sourceRoot.replaceAll("\\", "/"), "") : entryPoint.replace(
+      options.config.workspaceRoot.replaceAll("\\", "/"),
+      ""
+    );
+    if (entryName.startsWith("/")) {
+      entryName = entryName.slice(1);
+    }
+    input[entryName] = entryPoint;
   });
-  return input;
+  return Object.keys(input).reduce((ret, key) => {
+    if (key.endsWith("/index.ts") && input[key]) {
+      ret[key.replace("/index.ts", "")] = input[key];
+    }
+    return ret;
+  }, input);
 }
 async function createTsCompilerOptions(parsedCommandLine, options, dependencies, config) {
   const { correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
@@ -202286,10 +202314,10 @@ async function createTsCompilerOptions(parsedCommandLine, options, dependencies,
   }
   return compilerOptions;
 }
-function convertCopyAssetsToRollupOptions(outputPath, assets) {
+function convertCopyAssetsToRollupOptions(outputPath, assets, workspaceRoot2) {
   return assets ? assets.map((a2) => ({
     src: (0, import_node_path13.join)(a2.input, a2.glob).replace(/\\/g, "/"),
-    dest: (0, import_node_path13.join)(import_devkit2.workspaceRoot, outputPath, a2.output).replace(/\\/g, "/")
+    dest: (0, import_node_path13.join)(workspaceRoot2, outputPath, a2.output).replace(/\\/g, "/")
   })) : [];
 }
 function readCompatibleFormats(config) {
@@ -202318,7 +202346,7 @@ async function* rollupExecutorFn(options, context, config) {
   if (!context?.projectName || !context?.projectsConfigurations?.projects?.[context.projectName]?.root) {
     throw new Error("Nx executor context was invalid");
   }
-  const workspaceRoot3 = findWorkspaceRoot2();
+  const workspaceRoot2 = findWorkspaceRoot2();
   const projectRoot = context?.projectsConfigurations?.projects[context.projectName]?.root;
   const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? projectRoot;
   if (options.clean !== false) {
@@ -202348,7 +202376,7 @@ async function* rollupExecutorFn(options, context, config) {
     const files = await new Glob("**/*.{ts,mts,cts,tsx}", {
       absolute: true,
       cwd: sourceRoot,
-      root: workspaceRoot3
+      root: workspaceRoot2
     }).walk();
     options.additionalEntryPoints = files.reduce(
       (ret, file) => {
@@ -202359,10 +202387,10 @@ async function* rollupExecutorFn(options, context, config) {
         return ret;
       },
       options.additionalEntryPoints?.map(
-        (entry) => correctPaths2((0, import_path5.join)(workspaceRoot3, entry))
+        (entry) => correctPaths2((0, import_path5.join)(workspaceRoot2, entry))
       ) ?? []
     ).map((entry) => {
-      const formatted = entry.replace(workspaceRoot3, "");
+      const formatted = entry.replace(workspaceRoot2, "");
       return formatted.startsWith("/") ? formatted.slice(1) : formatted;
     });
   }
@@ -202474,8 +202502,8 @@ async function createRollupOptions(options, context, config) {
   const rollupConfig = await withRollupConfig(
     options,
     {},
-    dependencies,
-    config
+    config,
+    dependencies
   );
   const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins) ? rollupConfig.plugins.find(
     (p2) => p2?.["name"] === import_generate_package_json2.pluginName

package/src/executors/rollup/utils/get-options.d.ts

@@ -2,4 +2,4 @@ import { DependentBuildableProjectNode } from "@nx/js/src/utils/buildable-libs-u
 import { StormConfig } from "@storm-software/config";
 import * as rollup from "rollup";
 import { RollupWithNxPluginOptions } from "./normalize-options";
-export declare function withRollupConfig(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[], config?: StormConfig): Promise<rollup.RollupOptions>;
+export declare function withRollupConfig(rawOptions: RollupWithNxPluginOptions, rollupConfig: rollup.RollupOptions | undefined, config: StormConfig, dependencies: DependentBuildableProjectNode[]): Promise<rollup.RollupOptions>;

package/src/executors/rollup/utils/normalize-options.d.ts

@@ -1,3 +1,4 @@
+import { StormConfig } from "@storm-software/config";
 export interface RollupWithNxPluginOptions {
     /**
      * Additional entry-points to add to exports field in the package.json file.
@@ -87,5 +88,8 @@ export interface NormalizedRollupWithNxPluginOptions extends RollupWithNxPluginO
     assets: AssetGlobPattern[];
     compiler: "babel" | "tsc" | "swc";
     format: ("cjs" | "esm")[];
+    projectRoot: string;
+    sourceRoot: string;
+    config: StormConfig;
 }
-export declare function normalizeOptions(projectRoot: string, sourceRoot: string, options: RollupWithNxPluginOptions): NormalizedRollupWithNxPluginOptions;
+export declare function normalizeOptions(projectRoot: string, sourceRoot: string, options: RollupWithNxPluginOptions, config: StormConfig): NormalizedRollupWithNxPluginOptions;