@nrwl/angular 15.7.0-beta.2 → 15.7.0-beta.3

package/migrations.json

@@ -123,6 +123,9 @@
     "update-angular-cli-version-14-1-0": {
       "cli": "nx",
       "version": "14.5.2-beta.0",
+      "requires": {
+        "@angular/core": ">=14.1.0"
+      },
       "description": "Update the @angular/cli package version to ~14.1.0.",
       "factory": "./src/migrations/update-14-5-2/update-angular-cli"
     },
@@ -135,6 +138,9 @@
     "update-angular-cli-version-14-2-0": {
       "cli": "nx",
       "version": "14.6.0-beta.0",
+      "requires": {
+        "@angular/core": ">=14.2.0"
+      },
       "description": "Update the @angular/cli package version to ~14.2.0.",
       "factory": "./src/migrations/update-14-6-0/update-angular-cli"
     },
@@ -159,42 +165,63 @@
     "update-angular-cli-version-15-0-0": {
       "cli": "nx",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Update the @angular/cli package version to ~15.0.0.",
       "factory": "./src/migrations/update-15-2-0/update-angular-cli"
     },
     "remove-browserlist-config": {
       "cli": "nx",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Remove browserlist config as it's handled by build-angular",
       "factory": "./src/migrations/update-15-2-0/remove-browserlist-config"
     },
     "update-typescript-target": {
       "cli": "nx",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Update typescript target to ES2022",
       "factory": "./src/migrations/update-15-2-0/update-typescript-target"
     },
     "update-workspace-config": {
       "cli": "nx",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Remove bundleDependencies from server targets",
       "factory": "./src/migrations/update-15-2-0/update-workspace-config"
     },
     "update-platform-server-exports": {
       "cli": "ng",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Remove exported `@angular/platform-server` `renderModule` method. The `renderModule` method is now exported by the Angular CLI.",
       "factory": "./src/migrations/update-15-2-0/remove-platform-server-exports"
     },
     "update-karma-main-file": {
       "cli": "ng",
       "version": "15.2.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.0.0"
+      },
       "description": "Remove no longer needed require calls in Karma builder main file.",
       "factory": "./src/migrations/update-15-2-0/update-karma-main-file"
     },
     "update-angular-cli-version-15-1-0": {
       "cli": "nx",
       "version": "15.5.0-beta.0",
+      "requires": {
+        "@angular/core": ">=15.1.0"
+      },
       "description": "Update the @angular/cli package version to ~15.1.0.",
       "factory": "./src/migrations/update-15-5-0/update-angular-cli"
     },
@@ -1346,6 +1373,9 @@
     },
     "14.3.7": {
       "version": "14.3.7-beta.0",
+      "requires": {
+        "@angular/core": "^14.0.0"
+      },
       "packages": {
         "@ngrx/store": {
           "version": "~14.0.0",
@@ -1378,6 +1408,9 @@
     },
     "14.4.0": {
       "version": "14.4.0-beta.1",
+      "requires": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      },
       "packages": {
         "@angular-eslint/eslint-plugin": {
           "version": "~14.0.0",
@@ -1395,6 +1428,10 @@
     },
     "14.5.2": {
       "version": "14.5.2-beta.0",
+      "x-prompt": "Do you want to update the Angular version to v14.1?",
+      "requires": {
+        "@angular/core": ">=14.0.0 <14.1.0"
+      },
       "packages": {
         "@angular-devkit/architect": {
           "version": "~0.1401.0",
@@ -1417,7 +1454,7 @@
           "alwaysAddToPackageJson": false
         },
         "@schematics/angular": {
-          "version": "~14.0.0",
+          "version": "~14.1.0",
           "alwaysAddToPackageJson": false
         },
         "@angular/core": {
@@ -1500,13 +1537,13 @@
         }
       }
     },
-    "14.6.0": {
+    "14.6.0-angular": {
       "version": "14.6.0-beta.0",
+      "x-prompt": "Do you want to update the Angular version to v14.2?",
+      "requires": {
+        "@angular/core": ">=14.1.0 <14.2.0"
+      },
       "packages": {
-        "jest-preset-angular": {
-          "version": "~12.2.0",
-          "alwaysAddToPackageJson": false
-        },
         "@angular-devkit/architect": {
           "version": "~0.1402.0",
           "alwaysAddToPackageJson": false
@@ -1549,17 +1586,25 @@
         }
       }
     },
-    "14.8.0": {
-      "version": "14.8.0-beta.0",
+    "14.6.0-jest-preset-angular": {
+      "version": "14.6.0-beta.0",
+      "requires": {
+        "@angular-devkit/build-angular": ">=0.1102.19 <15.0.0",
+        "@angular/compiler-cli": ">=11.2.14 <15.0.0",
+        "@angular/core": ">=11.2.14 <15.0.0",
+        "@angular/platform-browser-dynamic": ">=11.2.14 <15.0.0",
+        "jest": "^28.0.0"
+      },
       "packages": {
         "jest-preset-angular": {
-          "version": "~12.2.2",
+          "version": "12.2.0",
           "alwaysAddToPackageJson": false
-        },
-        "typescript": {
-          "version": "~4.8.2",
-          "alwaysAddToPackageJson": false
-        },
+        }
+      }
+    },
+    "14.8.0-angular-eslint": {
+      "version": "14.8.0-beta.0",
+      "packages": {
         "@angular-eslint/eslint-plugin": {
           "version": "~14.0.4",
           "alwaysAddToPackageJson": false
@@ -1574,8 +1619,28 @@
         }
       }
     },
+    "14.8.0-jest-preset-angular": {
+      "version": "14.8.0-beta.0",
+      "requires": {
+        "@angular-devkit/build-angular": ">=0.1102.19 <15.0.0",
+        "@angular/compiler-cli": ">=11.2.14 <15.0.0",
+        "@angular/core": ">=11.2.14 <15.0.0",
+        "@angular/platform-browser-dynamic": ">=11.2.14 <15.0.0",
+        "jest": "^28.0.0"
+      },
+      "packages": {
+        "jest-preset-angular": {
+          "version": "12.2.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
     "15.2.0": {
       "version": "15.2.0-beta.0",
+      "x-prompt": "Do you want to update the Angular version to v15?",
+      "requires": {
+        "@angular/core": "^14.0.0"
+      },
       "packages": {
         "@angular-devkit/architect": {
           "version": "~0.1500.0",
@@ -1631,8 +1696,11 @@
         }
       }
     },
-    "15.2.2": {
+    "15.2.2-angular-eslint": {
       "version": "15.2.2-beta.0",
+      "requires": {
+        "eslint": "^7.20.0 || ^8.0.0"
+      },
       "packages": {
         "@angular-eslint/eslint-plugin": {
           "version": "~15.0.0",
@@ -1645,7 +1713,19 @@
         "@angular-eslint/template-parser": {
           "version": "~15.0.0",
           "alwaysAddToPackageJson": false
-        },
+        }
+      }
+    },
+    "15.2.2-jest": {
+      "version": "15.2.2-beta.0",
+      "requires": {
+        "@angular-devkit/build-angular": ">=12.2.18 <16.0.0",
+        "@angular/compiler-cli": ">=12.2.16 <16.0.0",
+        "@angular/core": ">=12.2.16 <16.0.0",
+        "@angular/platform-browser-dynamic": ">=12.2.16 <16.0.0",
+        "jest": "^28.0.0"
+      },
+      "packages": {
         "jest-preset-angular": {
           "version": "12.2.3",
           "alwaysAddToPackageJson": false
@@ -1654,6 +1734,9 @@
     },
     "15.3.1": {
       "version": "15.3.1-beta.0",
+      "requires": {
+        "@angular/core": "^15.0.0"
+      },
       "packages": {
         "@ngrx/store": {
           "version": "~15.0.0",
@@ -1686,6 +1769,10 @@
     },
     "15.5.0": {
       "version": "15.5.0-beta.0",
+      "x-prompt": "Do you want to update the Angular version to v15.1?",
+      "requires": {
+        "@angular/core": ">=15.0.0 <15.1.0"
+      },
       "packages": {
         "@angular-devkit/architect": {
           "version": "~0.1501.0",
@@ -1731,6 +1818,9 @@
     },
     "15.5.2": {
       "version": "15.5.2-beta.0",
+      "requires": {
+        "@angular-devkit/build-angular": ">=15.0.0 <16.0.0"
+      },
       "packages": {
         "@nguniversal/builders": {
           "version": "~15.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.7.0-beta.2",
+  "version": "15.7.0-beta.3",
   "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, Cypress, Karma, and Protractor. \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": {
@@ -63,12 +63,12 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "15.7.0-beta.2",
-    "@nrwl/devkit": "15.7.0-beta.2",
-    "@nrwl/jest": "15.7.0-beta.2",
-    "@nrwl/linter": "15.7.0-beta.2",
-    "@nrwl/webpack": "15.7.0-beta.2",
-    "@nrwl/workspace": "15.7.0-beta.2",
+    "@nrwl/cypress": "15.7.0-beta.3",
+    "@nrwl/devkit": "15.7.0-beta.3",
+    "@nrwl/jest": "15.7.0-beta.3",
+    "@nrwl/linter": "15.7.0-beta.3",
+    "@nrwl/webpack": "15.7.0-beta.3",
+    "@nrwl/workspace": "15.7.0-beta.3",
     "@phenomnomnominal/tsquery": "4.1.1",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -84,7 +84,6 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": ">= 0.1400.0 < 0.1600.0",
     "@angular-devkit/build-angular": ">= 14.0.0 < 16.0.0",
     "@angular-devkit/core": ">= 14.0.0 < 16.0.0",
     "@angular-devkit/schematics": ">= 14.0.0 < 16.0.0",
@@ -107,5 +106,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "104285b6929acc138531d6c7c8f5eba22c06ed92"
+  "gitHead": "b2bd4f27e04124c70a19c53191a4503bacf0b229"
 }

package/src/generators/ng-add/migrate-from-angular-cli.js

@@ -13,6 +13,7 @@ function migrateFromAngularCli(tree, rawOptions) {
         const projects = (0, utilities_1.getAllProjects)(tree);
         const options = (0, utilities_1.normalizeOptions)(tree, rawOptions, projects);
         const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
+        (0, utilities_1.ensureAngularDevKitPeerDependenciesAreInstalled)(tree);
         if (options.preserveAngularCliLayout) {
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 nx: versions_2.nxVersion,

package/src/generators/ng-add/migrate-from-angular-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,iEAAqE;AACrE,mDAAiD;AAEjD,2CAAuD;AAEvD,2CAoBqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAQ,CAAC;QAC1D,IAAA,2DAA+C,EAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;gBAC5B,QAAQ,EAAE,0BAAe;aAC1B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;YACxD,IAAA,6CAAiC,EAAC,IAAI,CAAC,CAAC;YACxC,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,gEAAgE;YAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,kCAAsB,EAAC,IAAI,CAAC,CAAC;SAC9B;aAAM;YACL,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,MAAM,0BAA0B,GAAG,IAAA,yCAA6B,EAC9D,IAAI,EACJ,SAAS,CACV,CAAC;YAEF;;;;;eAKG;YACH,IAAI,YAAY,GACd,0BAA0B,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAChE,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;YACxD,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,0BAA0B,CAAC,KAAK,EAAE;gBACpC,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,0BAA0B,CAAC,MAAM,EAAE;gBACrC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;gBACnE,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;SACrC;QAED,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;gBAC1B,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AA/FD,sDA+FC"}

package/src/generators/ng-add/utilities/dependencies.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function ensureAngularDevKitPeerDependenciesAreInstalled(tree: Tree): void;

package/src/generators/ng-add/utilities/dependencies.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAngularDevKitPeerDependenciesAreInstalled = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../../utils/version-utils");
+const version_utils_2 = require("../../utils/version-utils");
+function ensureAngularDevKitPeerDependenciesAreInstalled(tree) {
+    var _a;
+    const packagesToInstall = [
+        '@angular-devkit/core',
+        '@angular-devkit/schematics',
+        '@schematics/angular',
+    ];
+    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    let angularCliVersion = (_a = devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies['@angular/cli']) !== null && _a !== void 0 ? _a : dependencies === null || dependencies === void 0 ? void 0 : dependencies['@angular/cli'];
+    if (!angularCliVersion) {
+        const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
+        const angularDevkitVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
+        angularCliVersion = angularDevkitVersion;
+    }
+    const filteredPackages = packagesToInstall
+        .filter((pkg) => !(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkg]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkg]))
+        .reduce((allPkgs, pkg) => {
+        allPkgs[pkg] = angularCliVersion;
+        return allPkgs;
+    }, {});
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, filteredPackages);
+}
+exports.ensureAngularDevKitPeerDependenciesAreInstalled = ensureAngularDevKitPeerDependenciesAreInstalled;
+//# sourceMappingURL=dependencies.js.map

package/src/generators/ng-add/utilities/dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAA4E;AAC5E,gEAAmF;AACnF,6DAA4E;AAE5E,SAAgB,+CAA+C,CAC7D,IAAU;;IAEV,MAAM,iBAAiB,GAAG;QACxB,sBAAsB;QACtB,4BAA4B;QAC5B,qBAAqB;KACtB,CAAC;IAEF,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,IAAI,iBAAiB,GACnB,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,cAAc,CAAC,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,cAAc,CAAC,CAAC;IAEtE,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QACF,iBAAiB,GAAG,oBAAoB,CAAC;KAC1C;IAED,MAAM,gBAAgB,GAAG,iBAAiB;SACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,GAAG,CAAC,CAAA,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,CAAA,CAAC;SAChE,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAA4B,CAAC,CAAC;IAEnC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AA9BD,0GA8BC"}

package/src/generators/ng-add/utilities/index.d.ts

@@ -1,3 +1,4 @@
+export * from './dependencies';
 export * from './file-change-recorder';
 export * from './format-files-task';
 export * from './logger';

package/src/generators/ng-add/utilities/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./dependencies"), exports);
 tslib_1.__exportStar(require("./file-change-recorder"), exports);
 tslib_1.__exportStar(require("./format-files-task"), exports);
 tslib_1.__exportStar(require("./logger"), exports);

package/src/generators/ng-add/utilities/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,8DAAoC;AACpC,mDAAyB;AACzB,8DAAoC;AACpC,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,iEAAuC;AACvC,8DAAoC;AACpC,mDAAyB;AACzB,8DAAoC;AACpC,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}

package/src/migrations/update-15-7-0/install-required-packages.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 const version_utils_1 = require("../../generators/utils/version-utils");
 const version_utils_2 = require("../../utils/version-utils");
 function default_1(tree) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const packagesToInstall = [
             '@angular-devkit/core',
@@ -15,9 +15,9 @@ function default_1(tree) {
         const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
         const angularMajorVersion = (0, version_utils_1.getInstalledAngularMajorVersion)(tree);
         const angularDevkitVersion = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
-        const angularCliVersion = (_b = (_a = pkgJson.devDependencies['@angular/cli']) !== null && _a !== void 0 ? _a : pkgJson.dependencies['@angular/cli']) !== null && _b !== void 0 ? _b : angularDevkitVersion;
+        const angularCliVersion = (_d = (_b = (_a = pkgJson.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) !== null && _b !== void 0 ? _b : (_c = pkgJson.dependencies) === null || _c === void 0 ? void 0 : _c['@angular/cli']) !== null && _d !== void 0 ? _d : angularDevkitVersion;
         const filteredPackages = packagesToInstall
-            .filter((pkg) => !pkgJson.devDependencies[pkg] && !pkgJson.dependencies[pkg])
+            .filter((pkg) => { var _a, _b; return !((_a = pkgJson.devDependencies) === null || _a === void 0 ? void 0 : _a[pkg]) && !((_b = pkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[pkg]); })
             .reduce((allPkgs, pkg) => (Object.assign(Object.assign({}, allPkgs), { [pkg]: angularCliVersion })), {});
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, Object.assign({}, filteredPackages));
     });

package/src/migrations/update-15-7-0/install-required-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"install-required-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-7-0/install-required-packages.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,wEAAuF;AACvF,6DAAgF;AAEhF,mBAA+B,IAAU;;;QACvC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE/C,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,MAAA,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,mCACvC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,mCACpC,oBAAoB,CAAC;QAEvB,MAAM,gBAAgB,GAA2B,iBAAiB;aAC/D,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CACrE;aACA,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,GAAG,CAAC,EAAE,iBAAiB,IAAG,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,oBAAO,gBAAgB,EAAG,CAAC;;CACjE;AA1BD,4BA0BC"}
+{"version":3,"file":"install-required-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-7-0/install-required-packages.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,wEAAuF;AACvF,6DAAgF;AAEhF,mBAA+B,IAAU;;;QACvC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE/C,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,MAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,cAAc,CAAC,mCACzC,MAAA,OAAO,CAAC,YAAY,0CAAG,cAAc,CAAC,mCACtC,oBAAoB,CAAC;QAEvB,MAAM,gBAAgB,GAA2B,iBAAiB;aAC/D,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,eAAC,OAAA,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,GAAG,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,YAAY,0CAAG,GAAG,CAAC,CAAA,CAAA,EAAA,CACzE;aACA,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,GAAG,CAAC,EAAE,iBAAiB,IAAG,EAAE,EAAE,CAAC,CAAC;QAE5E,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,oBAAO,gBAAgB,EAAG,CAAC;;CACjE;AA1BD,4BA0BC"}