@nx/rollup 16.4.0-beta.1 → 16.4.0-beta.13

package/index.d.ts

@@ -1,4 +1,4 @@
 export * from './src/generators/init/init';
 export * from './src/generators/rollup-project/rollup-project';
-export * from './src/executors/rollup/schema';
+export type { AssetGlobPattern, Globals, RollupExecutorOptions, } from './src/executors/rollup/schema';
 export * from './src/executors/rollup/rollup.impl';

package/index.js

@@ -3,5 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/generators/init/init"), exports);
 tslib_1.__exportStar(require("./src/generators/rollup-project/rollup-project"), exports);
-tslib_1.__exportStar(require("./src/executors/rollup/schema"), exports);
 tslib_1.__exportStar(require("./src/executors/rollup/rollup.impl"), exports);

package/migrations.json

@@ -11,6 +11,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/rollup with @nx/rollup",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-16-3-3-add-babel-upward-root-mode-flag": {
+      "cli": "nx",
+      "version": "16-3-3-beta.0",
+      "description": "Add babelUpwardRootMode if not already defined",
+      "implementation": "./src/migrations/update-16-3-3-add-babel-upward-root-mode-flag/update-16-3-3-add-babel-upward-root-mode-flag"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "16.4.0-beta.1",
+  "version": "16.4.0-beta.13",
   "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.4.0-beta.1",
-    "@nx/devkit": "16.4.0-beta.1",
-    "@nx/js": "16.4.0-beta.1",
+    "@nrwl/rollup": "16.4.0-beta.13",
+    "@nx/devkit": "16.4.0-beta.13",
+    "@nx/js": "16.4.0-beta.13",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-image": "^2.1.0",
@@ -54,5 +54,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "1c4fb934b607f0d93bb23bff2cf0f39b31a8fa43"
+  "gitHead": "d81afedfcc8d07db8cdb9b0e9286de0321ee184e"
 }

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

@@ -167,7 +167,7 @@ function createRollupOptions(options, dependencies, context, packageJson, source
                         isModern: true,
                     },
                     cwd: (0, path_1.join)(context.root, sourceRoot),
-                    rootMode: 'upward',
+                    rootMode: options.babelUpwardRootMode ? 'upward' : undefined,
                     babelrc: true,
                     extensions: fileExtensions,
                     babelHelpers: 'bundled',

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

@@ -32,4 +32,5 @@ export interface RollupExecutorOptions {
   javascriptEnabled?: boolean;
   generateExportsField?: boolean;
   skipTypeCheck?: boolean;
+  babelUpwardRootMode?: boolean;
 }

package/src/executors/rollup/schema.json

@@ -137,6 +137,11 @@
       "default": "babel",
       "description": "Which compiler to use."
     },
+    "babelUpwardRootMode": {
+      "type": "boolean",
+      "description": "Whether to set rootmode to upward. See https://babeljs.io/docs/en/options#rootmode",
+      "default": false
+    },
     "javascriptEnabled": {
       "type": "boolean",
       "description": "Sets `javascriptEnabled` option for less loader",

package/src/generators/init/init.js

@@ -5,13 +5,9 @@ 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");
-const add_babel_inputs_1 = require("@nx/js/src/utils/add-babel-inputs");
 function rollupInitGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let task;
-        if (schema.compiler === 'babel') {
-            (0, add_babel_inputs_1.addBabelInputs)(tree);
-        }
         if (schema.compiler === 'swc') {
             task = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@nx/rollup': versions_2.nxVersion,

package/src/generators/rollup-project/rollup-project.js

@@ -6,8 +6,10 @@ 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 rollupProjectGenerator(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);
@@ -20,8 +22,8 @@ function checkForTargetConflicts(tree, options) {
     if (options.skipValidation)
         return;
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) {
-        throw new Error(`Project "${options.project}" already has a build target. Pass --skipValidation to ignore this error.`);
+    if ((_a = project.targets) === null || _a === void 0 ? void 0 : _a[options.buildTarget]) {
+        throw new Error(`Project "${options.project}" already has a ${options.buildTarget} target. Pass --skipValidation to ignore this error.`);
     }
 }
 function addBuildTarget(tree, options) {
@@ -56,7 +58,7 @@ function addBuildTarget(tree, options) {
             },
         ];
     }
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { build: {
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { [options.buildTarget]: {
                 executor: '@nx/rollup:rollup',
                 outputs: ['{options.outputPath}'],
                 defaultConfiguration: 'production',

package/src/generators/rollup-project/schema.d.ts

@@ -9,4 +9,5 @@ export interface RollupProjectSchema {
   importPath?: string;
   external?: string[];
   rollupConfig?: string;
+  buildTarget?: string;
 }

package/src/generators/rollup-project/schema.json

@@ -66,6 +66,11 @@
     "rollupConfig": {
       "type": "string",
       "description": "Path relative to workspace root to a custom rollup file that takes a config object and returns an updated config."
+    },
+    "buildTarget": {
+      "description": "The build target to add.",
+      "type": "string",
+      "default": "build"
     }
   },
   "required": []

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

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

@@ -0,0 +1,20 @@
+"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);
+    });
+}
+exports.default = default_1;