@nx/rollup 0.0.0-pr-22870-9ecd080 → 0.0.0-pr-26623-78cbba7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "0.0.0-pr-22870-9ecd080",
+  "version": "0.0.0-pr-26623-78cbba7",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -43,9 +43,9 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-22870-9ecd080",
-    "@nx/js": "0.0.0-pr-22870-9ecd080",
-    "@nrwl/rollup": "0.0.0-pr-22870-9ecd080"
+    "@nx/devkit": "0.0.0-pr-26623-78cbba7",
+    "@nx/js": "0.0.0-pr-26623-78cbba7",
+    "@nrwl/rollup": "0.0.0-pr-26623-78cbba7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-to-inferred/lib/extract-rollup-config-from-executor-options.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const normalize_path_options_1 = require("./normalize-path-options");
 function extractRollupConfigFromExecutorOptions(tree, options, configurations, projectRoot) {
     (0, normalize_path_options_1.normalizePathOptions)(projectRoot, options);
+    let newRollupConfigContent;
     const hasConfigurations = !!configurations && Object.keys(configurations).length > 0;
     const oldRollupConfig = Array.isArray(options.rollupConfig)
         ? options.rollupConfig
@@ -27,70 +28,25 @@ function extractRollupConfigFromExecutorOptions(tree, options, configurations, p
         delete options[key];
         defaultOptions[key] = value;
     }
-    let configurationOptions;
     if (hasConfigurations) {
-        configurationOptions = {};
+        const configurationOptions = {};
         for (const [key, value] of Object.entries(configurations)) {
-            let newConfigFileName;
-            let oldRollupConfigForConfiguration;
             for (const [optionKey, optionValue] of Object.entries(value)) {
                 if (optionKey === 'watch')
                     continue;
-                /**
-                 * If a configuration lists rollupConfig as an option
-                 * Collect the options and set up a new file to point to
-                 * Set the `--config` option to the new file
-                 */
-                if (optionKey === 'rollupConfig') {
-                    oldRollupConfigForConfiguration = Array.isArray(optionValue)
-                        ? optionValue
-                        : optionValue
-                            ? [optionValue]
-                            : [];
-                    newConfigFileName = `rollup.${key}.config.js`;
-                    for (let i = 0; i < oldRollupConfigForConfiguration.length; i++) {
-                        const file = oldRollupConfigForConfiguration[i];
-                        if (file === newConfigFileName) {
-                            tree.rename((0, devkit_1.joinPathFragments)(projectRoot, newConfigFileName), (0, devkit_1.joinPathFragments)(projectRoot, `rollup.${key}.migrated.config.js`));
-                            oldRollupConfigForConfiguration.splice(i, 1, `./rollup.${key}.migrated.config.js`);
-                        }
-                    }
-                    delete value[optionKey];
-                    value['config'] = newConfigFileName;
-                    continue;
-                }
                 delete value[optionKey];
                 configurationOptions[key] ??= {};
                 configurationOptions[key][optionKey] = optionValue;
             }
-            /**
-             * Only if we encountered a rollupConfig in the current configuration
-             * should we write a new config file, containing all the config values
-             */
-            if (newConfigFileName) {
-                tree.write((0, devkit_1.joinPathFragments)(projectRoot, newConfigFileName), createNewRollupConfig(oldRollupConfigForConfiguration, defaultOptions, configurationOptions[key], true));
-            }
         }
-    }
-    tree.write((0, devkit_1.joinPathFragments)(projectRoot, `rollup.config.js`), createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOptions));
-    return defaultOptions;
-}
-exports.extractRollupConfigFromExecutorOptions = extractRollupConfigFromExecutorOptions;
-function createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOptions, singleConfiguration = false) {
-    if (configurationOptions) {
-        return (0, devkit_1.stripIndents) `
+        newRollupConfigContent = (0, devkit_1.stripIndents) `
       const { withNx } = require('@nx/rollup/with-nx');
       
       // These options were migrated by @nx/rollup:convert-to-inferred from project.json
-      const configValues =  ${JSON.stringify(singleConfiguration
-            ? {
-                ...defaultOptions,
-                ...configurationOptions,
-            }
-            : {
-                default: defaultOptions,
-                ...configurationOptions,
-            }, null, 2)}; 
+      const configValues =  ${JSON.stringify({
+            default: defaultOptions,
+            ...configurationOptions,
+        }, null, 2)}; 
         
       // Determine the correct configValue to use based on the configuration
       const nxConfiguration = process.env.NX_TASK_TARGET_CONFIGURATION ?? 'default';
@@ -115,7 +71,7 @@ function createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOpt
     `;
     }
     else {
-        return (0, devkit_1.stripIndents) `
+        newRollupConfigContent = (0, devkit_1.stripIndents) `
       const { withNx } = require('@nx/rollup/with-nx');
       
       // These options were migrated by @nx/rollup:convert-to-inferred from project.json
@@ -135,4 +91,7 @@ function createNewRollupConfig(oldRollupConfig, defaultOptions, configurationOpt
       module.exports = config;
     `;
     }
+    tree.write((0, devkit_1.joinPathFragments)(projectRoot, `rollup.config.js`), newRollupConfigContent);
+    return defaultOptions;
 }
+exports.extractRollupConfigFromExecutorOptions = extractRollupConfigFromExecutorOptions;