@nx/rollup 18.3.0-beta.0 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -44,9 +44,9 @@
     "rollup-plugin-postcss": "^4.0.1",
     "rollup-plugin-typescript2": "0.36.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
-    "@nrwl/rollup": "18.3.0-beta.0"
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
+    "@nrwl/rollup": "18.3.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/rollup/lib/update-package-json.js

@@ -42,7 +42,7 @@ function updatePackageJson(options, packageJson) {
             fileExt: '.cjs.js',
         });
         packageJson.main = cjsExports['.'];
-        if (!hasEsmFormat) {
+        if (!hasEsmFormat && !options.skipTypeField) {
             packageJson.type = 'commonjs';
         }
         if (options.generateExportsField) {

package/src/executors/rollup/rollup.impl.d.ts

@@ -11,5 +11,5 @@ export declare function rollupExecutor(rawOptions: RollupExecutorOptions, contex
     success: boolean;
     outfile?: undefined;
 }, unknown>;
-export declare function createRollupOptions(options: NormalizedRollupExecutorOptions, dependencies: DependentBuildableProjectNode[], context: ExecutorContext, packageJson: PackageJson, sourceRoot: string, npmDeps: string[]): Promise<rollup.RollupOptions>;
+export declare function createRollupOptions(options: NormalizedRollupExecutorOptions, dependencies: DependentBuildableProjectNode[], context: ExecutorContext, packageJson: PackageJson, sourceRoot: string, npmDeps: string[]): Promise<rollup.RollupOptions | rollup.RollupOptions[]>;
 export default rollupExecutor;

package/src/executors/rollup/rollup.impl.js

@@ -73,12 +73,15 @@ async function* rollupExecutor(rawOptions, context) {
                 (0, fs_1.deleteOutputDir)(context.root, options.outputPath);
             }
             const start = process.hrtime.bigint();
-            const bundle = await rollup.rollup(rollupOptions);
-            const output = Array.isArray(rollupOptions.output)
-                ? rollupOptions.output
-                : [rollupOptions.output];
-            for (const o of output) {
-                await bundle.write(o);
+            const allRollupOptions = Array.isArray(rollupOptions)
+                ? rollupOptions
+                : [rollupOptions];
+            for (const opts of allRollupOptions) {
+                const bundle = await rollup.rollup(opts);
+                const output = Array.isArray(opts.output) ? opts.output : [opts.output];
+                for (const o of output) {
+                    await bundle.write(o);
+                }
             }
             const end = process.hrtime.bigint();
             const duration = `${(Number(end - start) / 1_000_000_000).toFixed(2)}s`;
@@ -86,7 +89,8 @@ async function* rollupExecutor(rawOptions, context) {
             devkit_1.logger.info(`⚡ Done in ${duration}`);
             return { success: true, outfile };
         }
-        catch {
+        catch (e) {
+            devkit_1.logger.error(e);
             devkit_1.logger.error(`Bundle failed: ${context.projectName}`);
             return { success: false };
         }

package/src/generators/init/init.js

@@ -3,26 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollupInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/rollup/plugin'
-            : plugin.plugin === '@nx/rollup/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/rollup/plugin',
-        options: {
-            buildTargetName: 'build',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
 async function rollupInitGenerator(tree, schema) {
     let task = () => { };
     if (!schema.skipPackageJson) {
@@ -30,10 +12,9 @@ async function rollupInitGenerator(tree, schema) {
     }
     schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     if (schema.addPlugin) {
-        addPlugin(tree);
-    }
-    if (schema.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/rollup/plugin', plugin_1.createNodes, {
+            buildTargetName: ['build', 'rollup:build', 'rollup-build'],
+        }, schema.updatePackageScripts);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);