@nx/rollup 16.5.1 → 16.6.0-beta.1

package/generators.json

@@ -8,9 +8,10 @@
       "description": "Initialize the `@nrwl/rollup` plugin.",
       "hidden": true
     },
-    "rollup-project": {
-      "factory": "./src/generators/rollup-project/rollup-project#rollupProjectSchematic",
-      "schema": "./src/generators/rollup-project/schema.json",
+    "configuration": {
+      "aliases": ["rollup-project"],
+      "factory": "./src/generators/configuration/configuration#compat",
+      "schema": "./src/generators/configuration/schema.json",
       "description": "Add rollup configuration to a project.",
       "hidden": true
     }
@@ -23,9 +24,10 @@
       "aliases": ["ng-add"],
       "hidden": true
     },
-    "rollup-project": {
-      "factory": "./src/generators/rollup-project/rollup-project#rollupProjectGenerator",
-      "schema": "./src/generators/rollup-project/schema.json",
+    "configuration": {
+      "aliases": ["rollup-project"],
+      "factory": "./src/generators/configuration/configuration",
+      "schema": "./src/generators/configuration/schema.json",
       "description": "Add rollup configuration to a project.",
       "hidden": true
     }

package/index.d.ts

@@ -1,4 +1,7 @@
+import { configurationGenerator } from './src/generators/configuration/configuration';
+export { configurationGenerator };
+/** @deprecated Use `configurationGenerator` instead. */
+export declare const rollupProjectGenerator: typeof configurationGenerator;
 export * from './src/generators/init/init';
-export * from './src/generators/rollup-project/rollup-project';
 export type { AssetGlobPattern, Globals, RollupExecutorOptions, } from './src/executors/rollup/schema';
 export * from './src/executors/rollup/rollup.impl';

package/index.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.rollupProjectGenerator = exports.configurationGenerator = void 0;
 const tslib_1 = require("tslib");
+const configuration_1 = require("./src/generators/configuration/configuration");
+Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
+// Exported for backwards compatibility in case a plugin is using the old name.
+/** @deprecated Use `configurationGenerator` instead. */
+exports.rollupProjectGenerator = configuration_1.configurationGenerator;
 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/rollup.impl"), exports);

package/migrations.json

@@ -17,6 +17,12 @@
       "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"
+    },
+    "explicitly-set-projects-to-update-buildable-deps": {
+      "cli": "nx",
+      "version": "16.6.0-beta.0",
+      "description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
+      "factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps"
     }
   },
   "packageJsonUpdates": {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "16.5.1",
+  "version": "16.6.0-beta.1",
   "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.5.1",
-    "@nx/devkit": "16.5.1",
-    "@nx/js": "16.5.1",
+    "@nrwl/rollup": "16.6.0-beta.1",
+    "@nx/devkit": "16.6.0-beta.1",
+    "@nx/js": "16.6.0-beta.1",
     "@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": "7b7f1e7f72a34cb31cff43ea0ebb80d0eab1ac79"
+  "gitHead": "cf9f5cbe6a7ce3b916ec6505dc8488f669cbc52b"
 }

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

@@ -24,7 +24,17 @@ export interface RollupExecutorOptions {
   rollupConfig?: string | string[];
   watch?: boolean;
   assets?: any[];
+  /**
+   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
+   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
+   * It will be removed in v17.
+   */
   updateBuildableProjectDepsInPackageJson?: boolean;
+  /**
+   * @deprecated Configure the project to use the `@nx/dependency-checks` ESLint
+   * rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks).
+   * It will be removed in v17.
+   */
   buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
   deleteOutputPath?: boolean;
   format?: string[];

package/src/executors/rollup/schema.json

@@ -5,19 +5,6 @@
   "description": "Packages a library for different web usages (ESM, CommonJS).",
   "cli": "nx",
   "type": "object",
-  "presets": [
-    {
-      "name": "Including Dependencies in package.json",
-      "keys": [
-        "main",
-        "outputPath",
-        "project",
-        "tsConfig",
-        "buildableProjectDepsInPackageJsonType",
-        "updateBuildableProjectDepsInPackageJson"
-      ]
-    }
-  ],
   "properties": {
     "project": {
       "type": "string",
@@ -92,13 +79,15 @@
     "updateBuildableProjectDepsInPackageJson": {
       "type": "boolean",
       "description": "Update buildable project dependencies in `package.json`.",
-      "default": true
+      "default": false,
+      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
     },
     "buildableProjectDepsInPackageJsonType": {
       "type": "string",
       "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
       "enum": ["dependencies", "peerDependencies"],
-      "default": "peerDependencies"
+      "default": "peerDependencies",
+      "x-deprecated": "Configure the project to use the '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
     },
     "rollupConfig": {
       "oneOf": [

package/src/generators/configuration/configuration.d.ts

@@ -0,0 +1,5 @@
+import type { Tree } from '@nx/devkit';
+import { RollupProjectSchema } from './schema';
+export declare function configurationGenerator(tree: Tree, options: RollupProjectSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export default configurationGenerator;
+export declare const compat: (generatorOptions: RollupProjectSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/{rollup-project/rollup-project.js → configuration/configuration.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rollupProjectSchematic = exports.rollupProjectGenerator = void 0;
+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 rollupProjectGenerator(tree, options) {
+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 }));
@@ -16,7 +16,7 @@ function rollupProjectGenerator(tree, options) {
         return task;
     });
 }
-exports.rollupProjectGenerator = rollupProjectGenerator;
+exports.configurationGenerator = configurationGenerator;
 function checkForTargetConflicts(tree, options) {
     var _a;
     if (options.skipValidation)
@@ -74,5 +74,5 @@ function addBuildTarget(tree, options) {
                 },
             } }) }));
 }
-exports.default = rollupProjectGenerator;
-exports.rollupProjectSchematic = (0, devkit_1.convertNxGenerator)(rollupProjectGenerator);
+exports.default = configurationGenerator;
+exports.compat = (0, devkit_1.convertNxGenerator)(configurationGenerator);

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

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

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

@@ -0,0 +1,34 @@
+"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') {
+                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);
+                }
+            }
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;

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

@@ -1,5 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import { RollupProjectSchema } from './schema';
-export declare function rollupProjectGenerator(tree: Tree, options: RollupProjectSchema): Promise<import("@nx/devkit").GeneratorCallback>;
-export default rollupProjectGenerator;
-export declare const rollupProjectSchematic: (generatorOptions: RollupProjectSchema) => (tree: any, context: any) => Promise<any>;