@storm-software/workspace-tools 1.177.2 → 1.178.1

package/package.json

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

@@ -409522,7 +409522,7 @@ function analyze() {
     }
   };
 }
-function withRollupConfig(rawOptions, rollupConfig = {}, dependencies) {
+function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
   const finalConfig = { ...rollupConfig };
   const projectNode = getProjectNode();
   const projectRoot = (0, import_node_path13.join)(import_devkit2.workspaceRoot, projectNode.data.root);
@@ -409659,13 +409659,14 @@ function withRollupConfig(rawOptions, rollupConfig = {}, dependencies) {
         tsconfig: options.tsConfig,
         tsconfigOverride: {
           compilerOptions: createTsCompilerOptions(
-            projectRoot,
             tsConfig,
             options,
-            dependencies
+            dependencies,
+            config
           )
         },
-        verbosity: 3
+        verbosity: 3,
+        useTsconfigDeclarationDir: true
       }),
       (0, import_type_definitions.typeDefinitions)({
         projectRoot
@@ -409726,18 +409727,18 @@ function createInput(options) {
   });
   return input;
 }
-function createTsCompilerOptions(projectRoot, config, options, dependencies) {
+function createTsCompilerOptions(parsedCommandLine, options, dependencies, config) {
   const compilerOptionPaths = (0, import_buildable_libs_utils.computeCompilerOptionsPaths)(
-    config,
+    parsedCommandLine,
     dependencies ?? []
   );
   const compilerOptions = {
-    rootDir: projectRoot,
+    rootDir: config?.workspaceRoot,
     allowJs: options.allowJs,
     declaration: true,
     paths: compilerOptionPaths
   };
-  if (config.options.module === ts.ModuleKind.CommonJS) {
+  if (parsedCommandLine.options.module === ts.ModuleKind.CommonJS) {
     compilerOptions["module"] = "ESNext";
   }
   if (options.compiler === "swc") {
@@ -409848,7 +409849,11 @@ ${formatLogMessage2(options)}`, config);
     perf: true,
     treeshake: true
   };
-  const rollupOptions = await createRollupOptions(normalizedOptions, context);
+  const rollupOptions = await createRollupOptions(
+    normalizedOptions,
+    context,
+    config
+  );
   const outfile = resolveOutfile(context, normalizedOptions);
   if (normalizedOptions.watch) {
     return yield* (0, import_async_iterable.createAsyncIterable)(({ next }) => {
@@ -409901,7 +409906,7 @@ ${formatLogMessage2(options)}`, config);
     }
   }
 }
-async function createRollupOptions(options, context) {
+async function createRollupOptions(options, context, config) {
   const { dependencies } = (0, import_buildable_libs_utils2.calculateProjectBuildableDependencies)(
     context.taskGraph,
     context.projectGraph,
@@ -409911,7 +409916,7 @@ async function createRollupOptions(options, context) {
     context.configurationName,
     true
   );
-  const rollupConfig = withRollupConfig(options, {}, dependencies);
+  const rollupConfig = withRollupConfig(options, {}, dependencies, config);
   const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins) ? rollupConfig.plugins.find(
     (p2) => p2?.["name"] === import_generate_package_json2.pluginName
   ) : null;
@@ -409920,16 +409925,16 @@ async function createRollupOptions(options, context) {
   );
   let finalConfig = rollupConfig;
   for (const _config of userDefinedRollupConfigs) {
-    const config = await _config;
-    if (typeof config === "function") {
-      finalConfig = config(finalConfig, options);
+    const config2 = await _config;
+    if (typeof config2 === "function") {
+      finalConfig = config2(finalConfig, options);
     } else {
       finalConfig = {
         ...finalConfig,
-        ...config,
+        ...config2,
         plugins: [
           ...Array.isArray(finalConfig.plugins) && finalConfig.plugins?.length > 0 ? finalConfig.plugins : [],
-          ...config.plugins?.length > 0 ? config.plugins : []
+          ...config2.plugins?.length > 0 ? config2.plugins : []
         ]
       };
     }

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

@@ -1,4 +1,5 @@
 import { DependentBuildableProjectNode } from "@nx/js/src/utils/buildable-libs-utils";
+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[]): rollup.RollupOptions;
+export declare function withRollupConfig(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[], config?: StormConfig): rollup.RollupOptions;