@nx/angular 16.6.0-beta.0 → 16.6.0-beta.1

package/ng-package.json

@@ -25,7 +25,8 @@
     "webpack",
     "http-server",
     "magic-string",
-    "enquirer"
+    "enquirer",
+    "find-cache-dir"
   ],
   "keepLifecycleScripts": true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.6.0-beta.0",
+  "version": "16.6.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,19 +66,20 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.6.0-beta.0",
-    "@nx/cypress": "16.6.0-beta.0",
-    "@nx/devkit": "16.6.0-beta.0",
-    "@nx/jest": "16.6.0-beta.0",
-    "@nx/js": "16.6.0-beta.0",
-    "@nx/linter": "16.6.0-beta.0",
-    "@nx/webpack": "16.6.0-beta.0",
-    "@nx/workspace": "16.6.0-beta.0",
+    "@nrwl/angular": "16.6.0-beta.1",
+    "@nx/cypress": "16.6.0-beta.1",
+    "@nx/devkit": "16.6.0-beta.1",
+    "@nx/jest": "16.6.0-beta.1",
+    "@nx/js": "16.6.0-beta.1",
+    "@nx/linter": "16.6.0-beta.1",
+    "@nx/webpack": "16.6.0-beta.1",
+    "@nx/workspace": "16.6.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
     "enquirer": "^2.3.6",
+    "find-cache-dir": "^3.3.2",
     "http-server": "^14.1.0",
     "ignore": "^5.0.4",
     "magic-string": "~0.26.2",
@@ -109,5 +110,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "5a7ffb93c9e84bffbf52f6ae9c6c1e3b8edb9d35"
+  "gitHead": "cf9f5cbe6a7ce3b916ec6505dc8488f669cbc52b"
 }

package/src/executors/ng-packagr-lite/schema.json

@@ -13,11 +13,7 @@
     },
     {
       "name": "Updating Project Dependencies for Buildable Library",
-      "keys": [
-        "project",
-        "updateBuildableProjectDepsInPackageJson",
-        "buildableProjectDepsInPackageJsonType"
-      ]
+      "keys": ["project"]
     }
   ],
   "properties": {
@@ -40,13 +36,15 @@
     "updateBuildableProjectDepsInPackageJson": {
       "type": "boolean",
       "description": "Whether to update the buildable project dependencies in the build output 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 '@nx/dependency-checks' ESLint rule instead (https://nx.dev/packages/eslint-plugin/documents/dependency-checks). It will be removed in v17."
     },
     "tailwindConfig": {
       "type": "string",

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

@@ -1,8 +1,18 @@
 export interface BuildAngularLibraryExecutorOptions {
   project: string;
+  /**
+   * @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';
   tailwindConfig?: string;
   tsConfig?: string;
+  /**
+   * @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;
   watch?: boolean;
 }

package/src/executors/package/schema.json

@@ -13,11 +13,7 @@
     },
     {
       "name": "Updating Project Dependencies for Publishable Library",
-      "keys": [
-        "project",
-        "updateBuildableProjectDepsInPackageJson",
-        "buildableProjectDepsInPackageJsonType"
-      ]
+      "keys": ["project"]
     }
   ],
   "properties": {
@@ -40,13 +36,15 @@
     "updateBuildableProjectDepsInPackageJson": {
       "type": "boolean",
       "description": "Whether to update the buildable project dependencies in the build output 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."
     },
     "tailwindConfig": {
       "type": "string",

package/src/generators/application/lib/add-unit-test-runner.js

@@ -8,7 +8,7 @@ const test_runners_1 = require("../../../utils/test-runners");
 function addUnitTestRunner(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.unitTestRunner === test_runners_1.UnitTestRunner.Jest) {
-            yield (0, jest_1.jestProjectGenerator)(host, {
+            yield (0, jest_1.configurationGenerator)(host, {
                 project: options.name,
                 setupFile: 'angular',
                 supportTsx: false,

package/src/generators/library/library.js

@@ -81,7 +81,7 @@ exports.libraryGenerator = libraryGenerator;
 function addUnitTestRunner(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.unitTestRunner === 'jest') {
-            yield (0, jest_1.jestProjectGenerator)(host, {
+            yield (0, jest_1.configurationGenerator)(host, {
                 project: options.name,
                 setupFile: 'angular',
                 supportTsx: false,

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

@@ -9,26 +9,29 @@ const executors = new Set([
     '@nrwl/angular:package',
 ]);
 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);
     });