@nx/rollup 18.1.2 → 18.2.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "18.1.2",
+  "version": "18.2.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -43,11 +43,10 @@
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-postcss": "^4.0.1",
     "rollup-plugin-typescript2": "0.36.0",
-    "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.1.2",
-    "@nx/js": "18.1.2",
-    "@nrwl/rollup": "18.1.2"
+    "@nx/devkit": "18.2.0-beta.0",
+    "@nx/js": "18.2.0-beta.0",
+    "@nrwl/rollup": "18.2.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1,13 +1,15 @@
 import * as rollup from 'rollup';
-import type { ExecutorContext } from '@nx/devkit';
+import { type ExecutorContext } from '@nx/devkit';
 import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
 import type { PackageJson } from 'nx/src/utils/package-json';
 import { RollupExecutorOptions } from './schema';
 import { NormalizedRollupExecutorOptions } from './lib/normalize';
-export type RollupExecutorEvent = {
+export declare function rollupExecutor(rawOptions: RollupExecutorOptions, context: ExecutorContext): AsyncGenerator<never, AsyncIterable<unknown> | {
     success: boolean;
-    outfile?: string;
-};
-export declare function rollupExecutor(rawOptions: RollupExecutorOptions, context: ExecutorContext): AsyncGenerator<RollupExecutorEvent, any, undefined>;
-export declare function createRollupOptions(options: NormalizedRollupExecutorOptions, dependencies: DependentBuildableProjectNode[], context: ExecutorContext, packageJson: PackageJson, sourceRoot: string, npmDeps: string[]): Promise<rollup.InputOptions[]>;
+    outfile: string;
+} | {
+    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 default rollupExecutor;

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

@@ -6,21 +6,18 @@ const rollup = require("rollup");
 const peerDepsExternal = require("rollup-plugin-peer-deps-external");
 const plugin_babel_1 = require("@rollup/plugin-babel");
 const path_1 = require("path");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const rxjs_for_await_1 = require("@nx/devkit/src/utils/rxjs-for-await");
 const autoprefixer = require("autoprefixer");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const plugin_node_resolve_1 = require("@rollup/plugin-node-resolve");
 const type_definitions_1 = require("@nx/js/src/plugins/rollup/type-definitions");
-const run_rollup_1 = require("./lib/run-rollup");
 const normalize_1 = require("./lib/normalize");
 const analyze_plugin_1 = require("./lib/analyze-plugin");
 const fs_1 = require("../../utils/fs");
 const swc_plugin_1 = require("./lib/swc-plugin");
 const update_package_json_1 = require("./lib/update-package-json");
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 // These use require because the ES import isn't correct.
 const commonjs = require('@rollup/plugin-commonjs');
 const image = require('@rollup/plugin-image');
@@ -32,7 +29,7 @@ async function* rollupExecutor(rawOptions, context) {
     process.env.NODE_ENV ??= 'production';
     const project = context.projectsConfigurations.projects[context.projectName];
     const sourceRoot = project.sourceRoot;
-    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
+    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
     const options = (0, normalize_1.normalizeRollupExecutorOptions)(rawOptions, context, sourceRoot);
     const packageJson = (0, devkit_1.readJsonFile)(options.project);
     const npmDeps = (context.projectGraph.dependencies[context.projectName] ?? [])
@@ -41,8 +38,9 @@ async function* rollupExecutor(rawOptions, context) {
     const rollupOptions = await createRollupOptions(options, dependencies, context, packageJson, sourceRoot, npmDeps);
     const outfile = resolveOutfile(context, options);
     if (options.watch) {
-        const watcher = rollup.watch(rollupOptions);
-        return yield* (0, rxjs_for_await_1.eachValueFrom)(new rxjs_1.Observable((obs) => {
+        // region Watch build
+        return (0, async_iterable_1.createAsyncIterable)(({ next }) => {
+            const watcher = rollup.watch(rollupOptions);
             watcher.on('event', (data) => {
                 if (data.code === 'START') {
                     devkit_1.logger.info(`Bundling ${context.projectName}...`);
@@ -50,46 +48,49 @@ async function* rollupExecutor(rawOptions, context) {
                 else if (data.code === 'END') {
                     (0, update_package_json_1.updatePackageJson)(options, packageJson);
                     devkit_1.logger.info('Bundle complete. Watching for file changes...');
-                    obs.next({ success: true, outfile });
+                    next({ success: true, outfile });
                 }
                 else if (data.code === 'ERROR') {
                     devkit_1.logger.error(`Error during bundle: ${data.error.message}`);
-                    obs.next({ success: false });
+                    next({ success: false });
                 }
             });
-            // Teardown logic. Close watcher when unsubscribed.
-            return () => watcher.close();
-        }));
+            const processExitListener = (signal) => () => {
+                watcher.close();
+            };
+            process.once('SIGTERM', processExitListener);
+            process.once('SIGINT', processExitListener);
+            process.once('SIGQUIT', processExitListener);
+        });
+        // endregion
     }
     else {
-        devkit_1.logger.info(`Bundling ${context.projectName}...`);
-        // Delete output path before bundling
-        if (options.deleteOutputPath) {
-            (0, fs_1.deleteOutputDir)(context.root, options.outputPath);
+        // region Single build
+        try {
+            devkit_1.logger.info(`Bundling ${context.projectName}...`);
+            // Delete output path before bundling
+            if (options.deleteOutputPath) {
+                (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 end = process.hrtime.bigint();
+            const duration = `${(Number(end - start) / 1_000_000_000).toFixed(2)}s`;
+            (0, update_package_json_1.updatePackageJson)(options, packageJson);
+            devkit_1.logger.info(`⚡ Done in ${duration}`);
+            return { success: true, outfile };
         }
-        const start = process.hrtime.bigint();
-        return (0, rxjs_1.from)(rollupOptions)
-            .pipe((0, operators_1.concatMap)((opts) => (0, run_rollup_1.runRollup)(opts).pipe((0, operators_1.catchError)((e) => {
-            devkit_1.logger.error(`Error during bundle: ${e}`);
-            return (0, rxjs_1.of)({ success: false });
-        }))), (0, operators_1.scan)((acc, result) => {
-            if (!acc.success)
-                return acc;
-            return result;
-        }, { success: true, outfile }), (0, operators_1.last)(), (0, operators_1.tap)({
-            next: (result) => {
-                if (result.success) {
-                    const end = process.hrtime.bigint();
-                    const duration = `${(Number(end - start) / 1000000000).toFixed(2)}s`;
-                    (0, update_package_json_1.updatePackageJson)(options, packageJson);
-                    devkit_1.logger.info(`⚡ Done in ${duration}`);
-                }
-                else {
-                    devkit_1.logger.error(`Bundle failed: ${context.projectName}`);
-                }
-            },
-        }))
-            .toPromise();
+        catch {
+            devkit_1.logger.error(`Bundle failed: ${context.projectName}`);
+            return { success: false };
+        }
+        // endregion
     }
 }
 exports.rollupExecutor = rollupExecutor;
@@ -116,133 +117,117 @@ async function createRollupOptions(options, dependencies, context, packageJson,
         }
         options.format = ['cjs'];
     }
-    const _rollupOptions = options.format.map(async (format, idx) => {
-        // Either we're generating only one format, so we should bundle types
-        // OR we are generating dual formats, so only bundle types for CJS.
-        const shouldBundleTypes = options.format.length === 1 || format === 'cjs';
-        const plugins = [
-            copy({
-                targets: convertCopyAssetsToRollupOptions(options.outputPath, options.assets),
-            }),
-            image(),
-            json(),
-            (useTsc || shouldBundleTypes) &&
-                require('rollup-plugin-typescript2')({
-                    check: !options.skipTypeCheck,
-                    tsconfig: options.tsConfig,
-                    tsconfigOverride: {
-                        compilerOptions: createTsCompilerOptions(config, dependencies, options),
-                    },
-                }),
-            shouldBundleTypes &&
-                (0, type_definitions_1.typeDefinitions)({
-                    main: options.main,
-                    projectRoot: options.projectRoot,
-                }),
-            peerDepsExternal({
-                packageJsonPath: options.project,
-            }),
-            postcss({
-                inject: true,
-                extract: options.extractCss,
-                autoModules: true,
-                plugins: [autoprefixer],
-                use: {
-                    less: {
-                        javascriptEnabled: options.javascriptEnabled,
-                    },
+    const plugins = [
+        copy({
+            targets: convertCopyAssetsToRollupOptions(options.outputPath, options.assets),
+        }),
+        image(),
+        json(),
+        // Needed to generate type definitions, even if we're using babel or swc.
+        require('rollup-plugin-typescript2')({
+            check: !options.skipTypeCheck,
+            tsconfig: options.tsConfig,
+            tsconfigOverride: {
+                compilerOptions: createTsCompilerOptions(config, dependencies, options),
+            },
+        }),
+        (0, type_definitions_1.typeDefinitions)({
+            main: options.main,
+            projectRoot: options.projectRoot,
+        }),
+        peerDepsExternal({
+            packageJsonPath: options.project,
+        }),
+        postcss({
+            inject: true,
+            extract: options.extractCss,
+            autoModules: true,
+            plugins: [autoprefixer],
+            use: {
+                less: {
+                    javascriptEnabled: options.javascriptEnabled,
                 },
-            }),
-            (0, plugin_node_resolve_1.default)({
-                preferBuiltins: true,
+            },
+        }),
+        (0, plugin_node_resolve_1.default)({
+            preferBuiltins: true,
+            extensions: fileExtensions,
+        }),
+        useSwc && (0, swc_plugin_1.swc)(),
+        useBabel &&
+            (0, plugin_babel_1.getBabelInputPlugin)({
+                // Lets `@nx/js/babel` preset know that we are packaging.
+                caller: {
+                    // @ts-ignore
+                    // Ignoring type checks for caller since we have custom attributes
+                    isNxPackage: true,
+                    // Always target esnext and let rollup handle cjs
+                    supportsStaticESM: true,
+                    isModern: true,
+                },
+                cwd: (0, path_1.join)(context.root, sourceRoot),
+                rootMode: options.babelUpwardRootMode ? 'upward' : undefined,
+                babelrc: true,
                 extensions: fileExtensions,
+                babelHelpers: 'bundled',
+                skipPreflightCheck: true, // pre-flight check may yield false positives and also slows down the build
+                exclude: /node_modules/,
             }),
-            useSwc && (0, swc_plugin_1.swc)(),
-            useBabel &&
-                (0, plugin_babel_1.getBabelInputPlugin)({
-                    // Lets `@nx/js/babel` preset know that we are packaging.
-                    caller: {
-                        // @ts-ignore
-                        // Ignoring type checks for caller since we have custom attributes
-                        isNxPackage: true,
-                        // Always target esnext and let rollup handle cjs
-                        supportsStaticESM: true,
-                        isModern: true,
-                    },
-                    cwd: (0, path_1.join)(context.root, sourceRoot),
-                    rootMode: options.babelUpwardRootMode ? 'upward' : undefined,
-                    babelrc: true,
-                    extensions: fileExtensions,
-                    babelHelpers: 'bundled',
-                    skipPreflightCheck: true, // pre-flight check may yield false positives and also slows down the build
-                    exclude: /node_modules/,
-                    plugins: [
-                        format === 'esm'
-                            ? undefined
-                            : require.resolve('babel-plugin-transform-async-to-promises'),
-                    ].filter(Boolean),
-                }),
-            commonjs(),
-            (0, analyze_plugin_1.analyze)(),
-        ];
-        let externalPackages = [
-            ...Object.keys(packageJson.dependencies || {}),
-            ...Object.keys(packageJson.peerDependencies || {}),
-        ]; // If external is set to none, include all dependencies and peerDependencies in externalPackages
-        if (options.external === 'all') {
-            externalPackages = externalPackages
-                .concat(dependencies.map((d) => d.name))
-                .concat(npmDeps);
+        commonjs(),
+        (0, analyze_plugin_1.analyze)(),
+    ];
+    let externalPackages = [
+        ...Object.keys(packageJson.dependencies || {}),
+        ...Object.keys(packageJson.peerDependencies || {}),
+    ]; // If external is set to none, include all dependencies and peerDependencies in externalPackages
+    if (options.external === 'all') {
+        externalPackages = externalPackages
+            .concat(dependencies.map((d) => d.name))
+            .concat(npmDeps);
+    }
+    else if (Array.isArray(options.external) && options.external.length > 0) {
+        externalPackages = externalPackages.concat(options.external);
+    }
+    externalPackages = [...new Set(externalPackages)];
+    const mainEntryFileName = options.outputFileName || options.main;
+    const input = {};
+    input[(0, path_1.parse)(mainEntryFileName).name] = options.main;
+    options.additionalEntryPoints.forEach((entry) => {
+        input[(0, path_1.parse)(entry).name] = entry;
+    });
+    const rollupConfig = {
+        input,
+        output: options.format.map((format) => ({
+            format,
+            dir: `${options.outputPath}`,
+            name: (0, devkit_1.names)(context.projectName).className,
+            entryFileNames: `[name].${format}.js`,
+            chunkFileNames: `[name].${format}.js`,
+        })),
+        external: (id) => {
+            return externalPackages.some((name) => id === name || id.startsWith(`${name}/`)); // Could be a deep import
+        },
+        plugins,
+    };
+    const userDefinedRollupConfigs = options.rollupConfig.map((plugin) => (0, config_utils_1.loadConfigFile)(plugin));
+    let finalConfig = rollupConfig;
+    for (const _config of userDefinedRollupConfigs) {
+        const config = await _config;
+        if (typeof config === 'function') {
+            finalConfig = config(finalConfig, options);
         }
-        else if (Array.isArray(options.external) && options.external.length > 0) {
-            externalPackages = externalPackages.concat(options.external);
+        else {
+            finalConfig = {
+                ...finalConfig,
+                ...config,
+                plugins: [
+                    ...(finalConfig.plugins?.length > 0 ? finalConfig.plugins : []),
+                    ...(config.plugins?.length > 0 ? config.plugins : []),
+                ],
+            };
         }
-        externalPackages = [...new Set(externalPackages)];
-        const mainEntryFileName = options.outputFileName || options.main;
-        const input = {};
-        input[(0, path_1.parse)(mainEntryFileName).name] = options.main;
-        options.additionalEntryPoints.forEach((entry) => {
-            input[(0, path_1.parse)(entry).name] = entry;
-        });
-        const rollupConfig = {
-            input,
-            output: {
-                format,
-                dir: `${options.outputPath}`,
-                name: (0, devkit_1.names)(context.projectName).className,
-                entryFileNames: `[name].${format}.js`,
-                chunkFileNames: `[name].${format}.js`,
-            },
-            external: (id) => {
-                return externalPackages.some((name) => id === name || id.startsWith(`${name}/`)); // Could be a deep import
-            },
-            plugins,
-        };
-        const userDefinedRollupConfigs = options.rollupConfig.map((plugin) => (0, config_utils_1.loadConfigFile)(plugin));
-        let finalConfig = rollupConfig;
-        for (const _config of userDefinedRollupConfigs) {
-            const config = await _config;
-            if (typeof config === 'function') {
-                finalConfig = config(finalConfig, options);
-            }
-            else {
-                finalConfig = {
-                    ...finalConfig,
-                    ...config,
-                    plugins: [
-                        ...(finalConfig.plugins?.length > 0 ? finalConfig.plugins : []),
-                        ...(config.plugins?.length > 0 ? config.plugins : []),
-                    ],
-                };
-            }
-        }
-        return finalConfig;
-    });
-    const rollupOptions = [];
-    for (const rollupOption of _rollupOptions) {
-        rollupOptions.push(await rollupOption);
     }
-    return rollupOptions;
+    return finalConfig;
 }
 exports.createRollupOptions = createRollupOptions;
 function createTsCompilerOptions(config, dependencies, options) {

package/src/utils/ensure-dependencies.js

@@ -5,13 +5,20 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/js/src/utils/versions");
 const versions_2 = require("./versions");
 function ensureDependencies(tree, options) {
-    if (options.compiler === 'swc') {
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@swc/helpers': versions_1.swcHelpersVersion,
-            '@swc/core': versions_1.swcCoreVersion,
-            'swc-loader': versions_2.swcLoaderVersion,
-        });
+    switch (options.compiler) {
+        case 'swc':
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                '@swc/helpers': versions_1.swcHelpersVersion,
+                '@swc/core': versions_1.swcCoreVersion,
+                'swc-loader': versions_2.swcLoaderVersion,
+            });
+        case 'babel':
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                'core-js': versions_2.coreJsVersion, // needed for preset-env to work
+                tslib: versions_2.tsLibVersion,
+            });
+        default:
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_2.tsLibVersion });
     }
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { tslib: versions_2.tsLibVersion });
 }
 exports.ensureDependencies = ensureDependencies;

package/src/utils/versions.d.ts

@@ -1,3 +1,4 @@
 export declare const nxVersion: any;
 export declare const swcLoaderVersion = "0.1.15";
 export declare const tsLibVersion = "^2.3.0";
+export declare const coreJsVersion = "^3.36.1";

package/src/utils/versions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsLibVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
+exports.coreJsVersion = exports.tsLibVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.swcLoaderVersion = '0.1.15';
 exports.tsLibVersion = '^2.3.0';
+exports.coreJsVersion = '^3.36.1';

package/src/executors/rollup/lib/run-rollup.d.ts

@@ -1,4 +0,0 @@
-import * as rollup from 'rollup';
-export declare function runRollup(options: rollup.RollupOptions): import("rxjs").Observable<{
-    success: boolean;
-}>;

package/src/executors/rollup/lib/run-rollup.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runRollup = void 0;
-const rollup = require("rollup");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-function runRollup(options) {
-    return (0, rxjs_1.from)(rollup.rollup(options)).pipe((0, operators_1.switchMap)((bundle) => {
-        const outputOptions = Array.isArray(options.output)
-            ? options.output
-            : [options.output];
-        return (0, rxjs_1.from)(Promise.all(outputOptions.map((o) => bundle.write(o))));
-    }), (0, operators_1.map)(() => ({ success: true })));
-}
-exports.runRollup = runRollup;