@nx/rollup 16.8.0-beta.4 → 16.8.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Rollup contains executors and generators that support building applications using Rollup.",
   "repository": {
@@ -29,9 +29,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/rollup": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
+    "@nrwl/rollup": "16.8.0-beta.6",
+    "@nx/devkit": "16.8.0-beta.6",
+    "@nx/js": "16.8.0-beta.6",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-image": "^2.1.0",
@@ -54,5 +54,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "0cc6ba996f2ef09f00b932c8eacf42de642457f3"
 }

package/src/executors/rollup/lib/normalize.js

@@ -17,18 +17,25 @@ function normalizeRollupExecutorOptions(options, context, sourceRoot) {
     if (options.buildableProjectDepsInPackageJsonType == undefined) {
         options.buildableProjectDepsInPackageJsonType = 'peerDependencies';
     }
-    return Object.assign(Object.assign({}, options), { 
+    return {
+        ...options,
         // de-dupe formats
-        format: Array.from(new Set(options.format)), rollupConfig: []
+        format: Array.from(new Set(options.format)),
+        rollupConfig: []
             .concat(options.rollupConfig)
             .filter(Boolean)
-            .map((p) => normalizePluginPath(p, root)), assets: options.assets
+            .map((p) => normalizePluginPath(p, root)),
+        assets: options.assets
             ? normalizeAssets(options.assets, root, sourceRoot)
-            : undefined, main,
+            : undefined,
+        main,
         entryRoot,
         project,
         projectRoot,
-        outputPath, skipTypeCheck: options.skipTypeCheck || false, additionalEntryPoints: createEntryPoints(options, context) });
+        outputPath,
+        skipTypeCheck: options.skipTypeCheck || false,
+        additionalEntryPoints: createEntryPoints(options, context),
+    };
 }
 exports.normalizeRollupExecutorOptions = normalizeRollupExecutorOptions;
 function normalizePluginPath(pluginPath, root) {
@@ -38,7 +45,7 @@ function normalizePluginPath(pluginPath, root) {
     try {
         return require.resolve(pluginPath);
     }
-    catch (_a) {
+    catch {
         return (0, path_1.resolve)(root, pluginPath);
     }
 }
@@ -70,16 +77,18 @@ function normalizeAssets(assets, root, sourceRoot) {
             }
             const assetPath = (0, devkit_1.normalizePath)(asset.input);
             const resolvedAssetPath = (0, path_1.resolve)(root, assetPath);
-            return Object.assign(Object.assign({}, asset), { input: resolvedAssetPath, 
+            return {
+                ...asset,
+                input: resolvedAssetPath,
                 // Now we remove starting slash to make Webpack place it from the output root.
-                output: asset.output.replace(/^\//, '') });
+                output: asset.output.replace(/^\//, ''),
+            };
         }
     });
 }
 exports.normalizeAssets = normalizeAssets;
 function createEntryPoints(options, context) {
-    var _a;
-    if (!((_a = options.additionalEntryPoints) === null || _a === void 0 ? void 0 : _a.length))
+    if (!options.additionalEntryPoints?.length)
         return [];
     return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
         cwd: context.root,

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

@@ -4,34 +4,43 @@ exports.updatePackageJson = void 0;
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const fileutils_1 = require("nx/src/utils/fileutils");
+const fs_1 = require("fs");
+const devkit_1 = require("@nx/devkit");
 // TODO(jack): Use updatePackageJson from @nx/js instead.
 function updatePackageJson(options, context, target, dependencies, packageJson) {
-    var _a, _b;
-    var _c;
     const hasEsmFormat = options.format.includes('esm');
     const hasCjsFormat = options.format.includes('cjs');
     if (options.generateExportsField) {
         packageJson.exports =
-            typeof packageJson.exports === 'string' ? {} : Object.assign({}, packageJson.exports);
+            typeof packageJson.exports === 'string' ? {} : { ...packageJson.exports };
         packageJson.exports['./package.json'] = './package.json';
     }
     if (hasEsmFormat) {
-        const esmExports = getExports(Object.assign(Object.assign({}, options), { fileExt: '.esm.js' }));
+        const esmExports = getExports({
+            ...options,
+            fileExt: '.esm.js',
+        });
         packageJson.module = esmExports['.'];
         if (!hasCjsFormat) {
             packageJson.type = 'module';
-            (_a = packageJson.main) !== null && _a !== void 0 ? _a : (packageJson.main = esmExports['.']);
+            packageJson.main ??= esmExports['.'];
         }
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(esmExports)) {
                 packageJson.exports[exportEntry] = hasCjsFormat
-                    ? { import: filePath }
+                    ? // If CJS format is used, make sure `import` (from Node) points to same instance of the package.
+                        // Otherwise, packages that are required to be singletons (like React, RxJS, etc.) will break.
+                        // Reserve `module` entry for bundlers to accommodate tree-shaking.
+                        { [hasCjsFormat ? 'module' : 'import']: filePath }
                     : filePath;
             }
         }
     }
     if (hasCjsFormat) {
-        const cjsExports = getExports(Object.assign(Object.assign({}, options), { fileExt: '.cjs.js' }));
+        const cjsExports = getExports({
+            ...options,
+            fileExt: '.cjs.js',
+        });
         packageJson.main = cjsExports['.'];
         if (!hasEsmFormat) {
             packageJson.type = 'commonjs';
@@ -39,7 +48,24 @@ function updatePackageJson(options, context, target, dependencies, packageJson)
         if (options.generateExportsField) {
             for (const [exportEntry, filePath] of Object.entries(cjsExports)) {
                 if (hasEsmFormat) {
-                    (_b = (_c = packageJson.exports[exportEntry])['default']) !== null && _b !== void 0 ? _b : (_c['default'] = filePath);
+                    // If ESM format used, make sure `import` (from Node) points to a wrapped
+                    // version of CJS file to ensure the package remains a singleton.
+                    // TODO(jack): This can be made into a rollup plugin to re-use in Vite.
+                    const relativeFile = (0, path_1.parse)(filePath).base;
+                    const fauxEsmFilePath = filePath.replace(/\.cjs\.js$/, '.cjs.mjs');
+                    packageJson.exports[exportEntry]['import'] ??= fauxEsmFilePath;
+                    packageJson.exports[exportEntry]['default'] ??= filePath;
+                    // Re-export from relative CJS file, and Node will synthetically export it as ESM.
+                    // Make sure both ESM and CJS point to same instance of the package because libs like React, RxJS, etc. requires it.
+                    // Also need a special .cjs.default.js file that re-exports the `default` from CJS, or else
+                    // default import in Node will not work.
+                    (0, fs_1.writeFileSync)((0, path_1.join)(options.outputPath, filePath.replace(/\.cjs\.js$/, '.cjs.default.js')), `exports._default = require('./${(0, path_1.parse)(filePath).base}').default;`);
+                    (0, fs_1.writeFileSync)((0, path_1.join)(options.outputPath, fauxEsmFilePath), 
+                    // Re-export from relative CJS file, and Node will synthetically export it as ESM.
+                    (0, devkit_1.stripIndents) `
+            export * from './${relativeFile}';
+            export { _default as default } from './${relativeFile.replace(/\.cjs\.js$/, '.cjs.default.js')}';
+            `);
                 }
                 else {
                     packageJson.exports[exportEntry] = filePath;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRollupOptions = exports.rollupExecutor = void 0;
-const tslib_1 = require("tslib");
 const ts = require("typescript");
 const rollup = require("rollup");
 const peerDepsExternal = require("rollup-plugin-peer-deps-external");
@@ -28,73 +27,69 @@ const json = require('@rollup/plugin-json');
 const copy = require('rollup-plugin-copy');
 const postcss = require('rollup-plugin-postcss');
 const fileExtensions = ['.js', '.jsx', '.ts', '.tsx'];
-function rollupExecutor(rawOptions, context) {
-    var _a, _b;
-    var _c;
-    return tslib_1.__asyncGenerator(this, arguments, function* rollupExecutor_1() {
-        (_a = (_c = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_c.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 options = (0, normalize_1.normalizeRollupExecutorOptions)(rawOptions, context, sourceRoot);
-        const packageJson = (0, devkit_1.readJsonFile)(options.project);
-        const npmDeps = ((_b = context.projectGraph.dependencies[context.projectName]) !== null && _b !== void 0 ? _b : [])
-            .filter((d) => d.target.startsWith('npm:'))
-            .map((d) => d.target.slice(4));
-        const rollupOptions = createRollupOptions(options, dependencies, context, packageJson, sourceRoot, npmDeps);
-        const outfile = resolveOutfile(context, options);
-        if (options.watch) {
-            const watcher = rollup.watch(rollupOptions);
-            return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, rxjs_for_await_1.eachValueFrom)(new rxjs_1.Observable((obs) => {
-                watcher.on('event', (data) => {
-                    if (data.code === 'START') {
-                        devkit_1.logger.info(`Bundling ${context.projectName}...`);
-                    }
-                    else if (data.code === 'END') {
-                        (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, packageJson);
-                        devkit_1.logger.info('Bundle complete. Watching for file changes...');
-                        obs.next({ success: true, outfile });
-                    }
-                    else if (data.code === 'ERROR') {
-                        devkit_1.logger.error(`Error during bundle: ${data.error.message}`);
-                        obs.next({ success: false });
-                    }
-                });
-                // Teardown logic. Close watcher when unsubscribed.
-                return () => watcher.close();
-            }))))));
-        }
-        else {
-            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();
-            return yield tslib_1.__await((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, context, target, dependencies, packageJson);
-                        devkit_1.logger.info(`⚡ Done in ${duration}`);
-                    }
-                    else {
-                        devkit_1.logger.error(`Bundle failed: ${context.projectName}`);
-                    }
-                },
-            }))
-                .toPromise());
+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 options = (0, normalize_1.normalizeRollupExecutorOptions)(rawOptions, context, sourceRoot);
+    const packageJson = (0, devkit_1.readJsonFile)(options.project);
+    const npmDeps = (context.projectGraph.dependencies[context.projectName] ?? [])
+        .filter((d) => d.target.startsWith('npm:'))
+        .map((d) => d.target.slice(4));
+    const rollupOptions = 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) => {
+            watcher.on('event', (data) => {
+                if (data.code === 'START') {
+                    devkit_1.logger.info(`Bundling ${context.projectName}...`);
+                }
+                else if (data.code === 'END') {
+                    (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies, packageJson);
+                    devkit_1.logger.info('Bundle complete. Watching for file changes...');
+                    obs.next({ success: true, outfile });
+                }
+                else if (data.code === 'ERROR') {
+                    devkit_1.logger.error(`Error during bundle: ${data.error.message}`);
+                    obs.next({ success: false });
+                }
+            });
+            // Teardown logic. Close watcher when unsubscribed.
+            return () => watcher.close();
+        }));
+    }
+    else {
+        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();
+        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, context, target, dependencies, packageJson);
+                    devkit_1.logger.info(`⚡ Done in ${duration}`);
+                }
+                else {
+                    devkit_1.logger.error(`Bundle failed: ${context.projectName}`);
+                }
+            },
+        }))
+            .toPromise();
+    }
 }
 exports.rollupExecutor = rollupExecutor;
 // -----------------------------------------------------------------------------
@@ -251,10 +246,9 @@ function readCompatibleFormats(config) {
     }
 }
 function resolveOutfile(context, options) {
-    var _a, _b;
-    if (!((_a = options.format) === null || _a === void 0 ? void 0 : _a.includes('cjs')))
+    if (!options.format?.includes('cjs'))
         return undefined;
-    const { name } = (0, path_1.parse)((_b = options.outputFileName) !== null && _b !== void 0 ? _b : options.main);
+    const { name } = (0, path_1.parse)(options.outputFileName ?? options.main);
     return (0, path_1.resolve)(context.root, options.outputPath, `${name}.cjs.js`);
 }
 exports.default = rollupExecutor;

package/src/generators/configuration/configuration.js

@@ -1,33 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compat = exports.configurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const init_1 = require("../init/init");
-function configurationGenerator(tree, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const task = yield (0, init_1.rollupInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        (_a = options.buildTarget) !== null && _a !== void 0 ? _a : (options.buildTarget = 'build');
-        checkForTargetConflicts(tree, options);
-        addBuildTarget(tree, options);
-        yield (0, devkit_1.formatFiles)(tree);
-        return task;
+async function configurationGenerator(tree, options) {
+    const task = await (0, init_1.rollupInitGenerator)(tree, {
+        ...options,
+        skipFormat: true,
     });
+    options.buildTarget ??= 'build';
+    checkForTargetConflicts(tree, options);
+    addBuildTarget(tree, options);
+    await (0, devkit_1.formatFiles)(tree);
+    return task;
 }
 exports.configurationGenerator = configurationGenerator;
 function checkForTargetConflicts(tree, options) {
-    var _a;
     if (options.skipValidation)
         return;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget]) {
+    if (project.targets?.[options.buildTarget]) {
         throw new Error(`Project "${options.project}" already has a ${options.buildTarget} target. Pass --skipValidation to ignore this error.`);
     }
 }
 function addBuildTarget(tree, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const packageJsonPath = (0, devkit_1.joinPathFragments)(project.root, 'package.json');
     if (!tree.exists(packageJsonPath)) {
@@ -37,14 +34,19 @@ function addBuildTarget(tree, options) {
             version: '0.0.1',
         });
     }
-    const prevBuildOptions = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget]) === null || _b === void 0 ? void 0 : _b.options;
+    const prevBuildOptions = project.targets?.[options.buildTarget]?.options;
     const buildOptions = {
-        main: (_d = (_c = options.main) !== null && _c !== void 0 ? _c : prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.main) !== null && _d !== void 0 ? _d : (0, devkit_1.joinPathFragments)(project.root, 'src/main.ts'),
-        outputPath: (_e = prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.outputPath) !== null && _e !== void 0 ? _e : (0, devkit_1.joinPathFragments)('dist', project.root === '.' ? project.name : project.root),
-        tsConfig: (_g = (_f = options.tsConfig) !== null && _f !== void 0 ? _f : prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.tsConfig) !== null && _g !== void 0 ? _g : (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.lib.json'),
-        additionalEntryPoints: prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.additionalEntryPoints,
-        generateExportsField: prevBuildOptions === null || prevBuildOptions === void 0 ? void 0 : prevBuildOptions.generateExportsField,
-        compiler: (_h = options.compiler) !== null && _h !== void 0 ? _h : 'babel',
+        main: options.main ??
+            prevBuildOptions?.main ??
+            (0, devkit_1.joinPathFragments)(project.root, 'src/main.ts'),
+        outputPath: prevBuildOptions?.outputPath ??
+            (0, devkit_1.joinPathFragments)('dist', project.root === '.' ? project.name : project.root),
+        tsConfig: options.tsConfig ??
+            prevBuildOptions?.tsConfig ??
+            (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.lib.json'),
+        additionalEntryPoints: prevBuildOptions?.additionalEntryPoints,
+        generateExportsField: prevBuildOptions?.generateExportsField,
+        compiler: options.compiler ?? 'babel',
         project: `${project.root}/package.json`,
         external: options.external,
         format: options.format,
@@ -61,7 +63,11 @@ function addBuildTarget(tree, options) {
             },
         ];
     }
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { [options.buildTarget]: {
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, {
+        ...project,
+        targets: {
+            ...project.targets,
+            [options.buildTarget]: {
                 executor: '@nx/rollup:rollup',
                 outputs: ['{options.outputPath}'],
                 defaultConfiguration: 'production',
@@ -75,7 +81,9 @@ function addBuildTarget(tree, options) {
                         vendorChunk: false,
                     },
                 },
-            } }) }));
+            },
+        },
+    });
 }
 exports.default = configurationGenerator;
 exports.compat = (0, devkit_1.convertNxGenerator)(configurationGenerator);

package/src/generators/init/init.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollupInitSchematic = exports.rollupInitGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("@nx/js/src/utils/versions");
 const versions_2 = require("../../utils/versions");
-function rollupInitGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let task;
-        if (schema.compiler === 'swc') {
-            task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@nx/rollup': versions_2.nxVersion,
-                '@swc/helpers': versions_1.swcHelpersVersion,
-                '@swc/core': versions_1.swcCoreVersion,
-                'swc-loader': versions_2.swcLoaderVersion,
-            });
-        }
-        else {
-            task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@nx/rollup': versions_2.nxVersion,
-                tslib: versions_2.tsLibVersion,
-            });
-        }
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return task;
-    });
+async function rollupInitGenerator(tree, schema) {
+    let task;
+    if (schema.compiler === 'swc') {
+        task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/rollup': versions_2.nxVersion,
+            '@swc/helpers': versions_1.swcHelpersVersion,
+            '@swc/core': versions_1.swcCoreVersion,
+            'swc-loader': versions_2.swcLoaderVersion,
+        });
+    }
+    else {
+        task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/rollup': versions_2.nxVersion,
+            tslib: versions_2.tsLibVersion,
+        });
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return task;
 }
 exports.rollupInitGenerator = rollupInitGenerator;
 exports.default = rollupInitGenerator;

package/src/migrations/update-15-0-0/add-babel-inputs.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_babel_inputs_1 = require("@nx/js/src/utils/add-babel-inputs");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_babel_inputs_1.addBabelInputs)(tree);
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function default_1(tree) {
+    (0, add_babel_inputs_1.addBabelInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-function replacePackage(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/rollup', '@nx/rollup');
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+async function replacePackage(tree) {
+    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/rollup', '@nx/rollup');
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = replacePackage;

package/src/migrations/update-16-3-3-add-babel-upward-root-mode-flag/update-16-3-3-add-babel-upward-root-mode-flag.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rollup:rollup', (options, projectName, targetName, _configurationName) => {
-            if (options.babelUpwardRootMode !== undefined) {
-                return;
-            }
-            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-            projectConfiguration.targets[targetName].options.babelUpwardRootMode =
-                true;
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rollup:rollup', (options, projectName, targetName, _configurationName) => {
+        if (options.babelUpwardRootMode !== undefined) {
+            return;
+        }
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        projectConfiguration.targets[targetName].options.babelUpwardRootMode =
+            true;
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps.js

@@ -1,34 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executors = new Set(['@nx/rollup:rollup', '@nrwl/rollup:rollup']);
-function default_1(tree) {
-    var _a;
-    var _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // use project graph to get the expanded target configurations
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
-            if (projectData.projectType !== 'library') {
+async function default_1(tree) {
+    // use project graph to get the expanded target configurations
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
+        if (projectData.projectType !== 'library') {
+            continue;
+        }
+        for (const [targetName, target] of Object.entries(projectData.targets || {})) {
+            if (!executors.has(target.executor)) {
                 continue;
             }
-            for (const [targetName, target] of Object.entries(projectData.targets || {})) {
-                if (!executors.has(target.executor)) {
-                    continue;
-                }
-                if (!target.options ||
-                    target.options.updateBuildableProjectDepsInPackageJson === undefined) {
-                    // read the project configuration to write the explicit project configuration
-                    // and avoid writing the expanded target configuration
-                    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                    (_a = (_b = project.targets[targetName]).options) !== null && _a !== void 0 ? _a : (_b.options = {});
-                    project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-                }
+            if (!target.options ||
+                target.options.updateBuildableProjectDepsInPackageJson === undefined) {
+                // read the project configuration to write the explicit project configuration
+                // and avoid writing the expanded target configuration
+                const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+                project.targets[targetName].options ??= {};
+                project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;