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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/rollup",
-  "version": "16.6.0-beta.0",
+  "version": "16.6.0-beta.2",
   "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.6.0-beta.0",
-    "@nx/devkit": "16.6.0-beta.0",
-    "@nx/js": "16.6.0-beta.0",
+    "@nrwl/rollup": "16.6.0-beta.2",
+    "@nx/devkit": "16.6.0-beta.2",
+    "@nx/js": "16.6.0-beta.2",
     "@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": "5a7ffb93c9e84bffbf52f6ae9c6c1e3b8edb9d35"
+  "gitHead": "c3d31711b71d648cedeff688fce9334d393b586b"
 }

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": false
+      "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/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps.js

@@ -4,26 +4,29 @@ 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* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [projectName, project] of projects) {
-            if (project.projectType !== 'library') {
+        // 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;
             }
-            let updated = false;
-            for (const [, target] of Object.entries(project.targets || {})) {
+            for (const [targetName, target] of Object.entries(projectData.targets || {})) {
                 if (!executors.has(target.executor)) {
                     continue;
                 }
-                if (target.options &&
+                if (!target.options ||
                     target.options.updateBuildableProjectDepsInPackageJson === undefined) {
-                    target.options.updateBuildableProjectDepsInPackageJson = true;
-                    updated = true;
+                    // 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 (updated) {
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-            }
         }
         yield (0, devkit_1.formatFiles)(tree);
     });