@nrwl/angular 13.2.0-beta.2 → 13.2.0-rc.0

package/migrations.json

@@ -99,25 +99,25 @@
     },
     "update-angular-config": {
       "cli": "nx",
-      "version": "13.2.0-bata.1",
+      "version": "13.2.0-beta.1",
       "description": "Remove deprecated options from webpack-server and webpack-browser.",
       "factory": "./src/migrations/update-13-2-0/update-angular-config"
     },
     "update-libraries": {
       "cli": "nx",
-      "version": "13.2.0-bata.1",
+      "version": "13.2.0-beta.1",
       "description": "Remove enableIvy and add compilationMode to library tsconfig and remove deprecated ng-packagr options.",
       "factory": "./src/migrations/update-13-2-0/update-libraries"
     },
     "update-angular-jest-config": {
       "cli": "nx",
-      "version": "13.2.0-bata.1",
+      "version": "13.2.0-beta.1",
       "description": "Update jest config to support jest-preset-angular",
       "factory": "./src/migrations/update-13-2-0/update-angular-jest-config"
     },
     "update-testing-imports": {
       "cli": "nx",
-      "version": "13.2.0-bata.1",
+      "version": "13.2.0-beta.1",
       "description": "Move some imports from @nrwl/angular/testing to jasmine-marbles",
       "factory": "./src/migrations/update-13-2-0/update-testing-imports"
     }
@@ -1027,34 +1027,6 @@
           "version": "^13.0.0",
           "alwaysAddToPackageJson": false
         },
-        "@ngrx/store": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/effects": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/entity": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/router-store": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/schematics": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/store-devtools": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@ngrx/component-store": {
-          "version": "~13.0.0-beta.0",
-          "alwaysAddToPackageJson": false
-        },
         "zone.js": {
           "version": "~0.11.4",
           "alwaysAddToPackageJson": false
@@ -1080,7 +1052,23 @@
           "alwaysAddToPackageJson": false
         },
         "jest-preset-angular": {
-          "version": "11.0.0-rc.2",
+          "version": "11.0.0-rc.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/manager-webpack5": {
+          "version": "6.4.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/builder-webpack5": {
+          "version": "6.4.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/angular": {
+          "version": "6.4.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@storybook/addon-essentials": {
+          "version": "6.4.0-rc.1",
           "alwaysAddToPackageJson": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "13.2.0-beta.2",
+  "version": "13.2.0-rc.0",
   "description": "Angular Plugin for Nx",
   "repository": {
     "type": "git",
@@ -58,11 +58,11 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~13.0.0",
-    "@nrwl/cypress": "13.2.0-beta.2",
-    "@nrwl/devkit": "13.2.0-beta.2",
-    "@nrwl/jest": "13.2.0-beta.2",
-    "@nrwl/linter": "13.2.0-beta.2",
-    "@nrwl/storybook": "13.2.0-beta.2",
+    "@nrwl/cypress": "13.2.0-rc.0",
+    "@nrwl/devkit": "13.2.0-rc.0",
+    "@nrwl/jest": "13.2.0-rc.0",
+    "@nrwl/linter": "13.2.0-rc.0",
+    "@nrwl/storybook": "13.2.0-rc.0",
     "@schematics/angular": "~13.0.0",
     "@phenomnomnominal/tsquery": "4.1.1",
     "ignore": "^5.0.4",

package/src/builders/webpack-browser/webpack-browser.impl.d.ts

@@ -1,5 +1,10 @@
 import { JsonObject } from '@angular-devkit/core';
 import { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
+export declare type BrowserBuilderSchema = Schema & {
+    customWebpackConfig?: {
+        path: string;
+    };
+};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & Schema & {
     customWebpackConfig?: {
         path: string;

package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js

@@ -4,7 +4,6 @@ exports.ngPackagrLiteExecutor = void 0;
 const tslib_1 = require("tslib");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
 const ng_packagr_1 = require("ng-packagr");
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const path_1 = require("path");
 const package_impl_1 = require("../package/package.impl");
 const entry_point_di_1 = require("./ng-packagr-adjustments/entry-point.di");
@@ -19,11 +18,8 @@ function initializeNgPackgrLite(options, context, projectDependencies) {
         packager.forProject((0, path_1.resolve)(context.root, options.project));
         packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
         if (options.tsConfig) {
-            // read the tsconfig and modify its path in memory to
-            // pass it on to ngpackagr
-            const parsedTSConfig = (yield (0, ng_compiler_cli_1.ngCompilerCli)()).readConfiguration(options.tsConfig);
-            (0, buildable_libs_utils_1.updatePaths)(projectDependencies, parsedTSConfig.options.paths);
-            packager.withTsConfig(parsedTSConfig);
+            const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
+            packager.withTsConfig(tsConfigPath);
         }
         return packager;
     });

package/src/executors/ng-packagr-lite/ng-packagr-lite.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AAEA,6FAAiF;AACjF,2CAAuC;AACvC,0EAAqE;AACrE,+BAA+B;AAC/B,0DAAgE;AAEhE,4EAAmF;AACnF,oEAG6C;AAE7C,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,qDAAqD;YACrD,0BAA0B;YAC1B,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,+BAAa,GAAE,CAAC,CAAC,iBAAiB,CAC9D,OAAO,CAAC,QAAQ,CACjB,CAAC;YACF,IAAA,kCAAW,EAAC,mBAAmB,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/D,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;SACvC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}
+{"version":3,"file":"ng-packagr-lite.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-lite.impl.ts"],"names":[],"mappings":";;;;AACA,6FAG4D;AAC5D,2CAAuC;AACvC,+BAA+B;AAC/B,0DAAgE;AAEhE,4EAAmF;AACnF,oEAG6C;AAE7C,SAAe,sBAAsB,CACnC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,IAAI,sBAAS,CAAC;YAC7B,sCAAsC;YACtC,GAAG,iCAAoB;YACvB,GAAG,yCAAwB;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,UAAU,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,QAAQ,CAAC,kBAAkB,CAAC,iCAAoB,CAAC,OAAO,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,YAAY,GAAG,IAAA,wCAAiB,EACpC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EACpD,mBAAmB,CACpB,CAAC;YACF,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;SACrC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAEY,QAAA,qBAAqB,GAAG,IAAA,oCAAqB,EACxD,sBAAsB,CACvB,CAAC;AAEF,kBAAe,6BAAqB,CAAC"}

package/src/executors/package/package.impl.d.ts

@@ -1,5 +1,5 @@
 import type { ExecutorContext } from '@nrwl/devkit';
-import type { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
 import type { NgPackagr } from 'ng-packagr';
 import type { BuildAngularLibraryExecutorOptions } from './schema';
 /**

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

@@ -4,7 +4,7 @@ exports.packageExecutor = exports.createLibraryExecutor = void 0;
 const tslib_1 = require("tslib");
 const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
+const buildable_libs_utils_2 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const rxjs_for_await_1 = require("rxjs-for-await");
@@ -19,14 +19,9 @@ function initializeNgPackagr(options, context, projectDependencies) {
         ]);
         packager.forProject((0, path_1.resolve)(context.root, options.project));
         packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
-        // read the tsconfig and modify its path in memory to
-        // pass it on to ngpackagr if specified
         if (options.tsConfig) {
-            // read the tsconfig and modify its path in memory to
-            // pass it on to ngpackagr
-            const parsedTSConfig = (yield (0, ng_compiler_cli_1.ngCompilerCli)()).readConfiguration(options.tsConfig);
-            (0, buildable_libs_utils_1.updatePaths)(projectDependencies, parsedTSConfig.options.paths);
-            packager.withTsConfig(parsedTSConfig);
+            const tsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, context.root, context.workspace.projects[context.projectName].root, projectDependencies);
+            packager.withTsConfig(tsConfigPath);
         }
         return packager;
     });
@@ -39,14 +34,14 @@ function initializeNgPackagr(options, context, projectDependencies) {
 function createLibraryExecutor(initializeNgPackagr) {
     return function (options, context) {
         return (0, tslib_1.__asyncGenerator)(this, arguments, function* () {
-            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, project_graph_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
-            if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+            const { target, dependencies } = (0, buildable_libs_utils_2.calculateProjectDependencies)((0, project_graph_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
+            if (!(0, buildable_libs_utils_2.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
                 return yield (0, tslib_1.__await)(Promise.resolve({ success: false }));
             }
             function updatePackageJson() {
                 if (dependencies.length > 0 &&
                     options.updateBuildableProjectDepsInPackageJson) {
-                    (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
+                    (0, buildable_libs_utils_2.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
                 }
             }
             if (options.watch) {

package/src/executors/package/package.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/application/lib/add-e2e.js

@@ -19,6 +19,7 @@ const devkit_1 = require("@nrwl/devkit");
  * @returns Function to run to add Cypres config after intial app files have been moved to correct location
  */
 function addE2e(tree, options, e2eProjectRoot) {
+    var _a;
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         if (options.e2eTestRunner === "protractor" /* Protractor */) {
             yield (0, add_protractor_1.addProtractor)(tree, options);
@@ -38,8 +39,8 @@ function addE2e(tree, options, e2eProjectRoot) {
         }
         if (options.e2eTestRunner === "protractor" /* Protractor */) {
             (0, update_e2e_project_1.updateE2eProject)(tree, options);
-            if (options.standaloneConfig) {
-                (0, workspace_1.convertToNxProjectGenerator)(tree, {
+            if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(tree).standaloneAsDefault) {
+                yield (0, workspace_1.convertToNxProjectGenerator)(tree, {
                     project: `${options.e2eProjectName}`,
                 });
             }

package/src/generators/application/lib/add-e2e.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAiD;AAEjD;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,IAAA,uCAA2B,EAAC,IAAI,EAAE;oBAChC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;IACH,CAAC;CAAA;AAzCD,wBAyCC"}
+{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAqE;AAErE;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;gBACA,MAAM,IAAA,uCAA2B,EAAC,IAAI,EAAE;oBACtC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;;CACF;AA5CD,wBA4CC"}

package/src/generators/application/lib/add-protractor.js

@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProtractor = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
 const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
-const workspace_1 = require("@nrwl/workspace");
 function addProtractor(host, options) {
-    var _a;
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const protractorSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'e2e');
         yield protractorSchematic(host, {
             relatedAppName: options.name,
             rootSelector: `${options.prefix}-root`,
         });
-        if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(host).standaloneAsDefault) {
-            yield (0, workspace_1.convertToNxProjectGenerator)(host, {
-                project: options.e2eProjectName,
-            });
-        }
-        (0, devkit_2.moveFilesToNewDirectory)(host, (0, devkit_2.joinPathFragments)(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
+        (0, devkit_1.moveFilesToNewDirectory)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
     });
 }
 exports.addProtractor = addProtractor;

package/src/generators/application/lib/add-protractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAGxD,yCAA0E;AAC1E,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;;QACvE,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;YACA,MAAM,IAAA,uCAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,IAAA,gCAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;;CACH;AAzBD,sCAyBC"}
+{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AAGxE,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IAAA,gCAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;IACJ,CAAC;CAAA;AAhBD,sCAgBC"}

package/src/generators/init/init.js

@@ -100,6 +100,9 @@ function addE2ETestRunner(host, options) {
 function addGitIgnoreEntry(host, entry) {
     if (host.exists('.gitignore')) {
         let content = host.read('.gitignore', 'utf-8');
+        if (/^\.angular$/gm.test(content)) {
+            return;
+        }
         content = `${content}\n${entry}\n`;
         host.write('.gitignore', content);
     }

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,2FAAqF;AACrF,iGAA4F;AAE5F,mDAK8B;AAC9B,0CAAgD;AAGhD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAe;;QAEf,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CAAA;AAjBD,oDAiBC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC/C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC7D,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAC3C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACzD,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC7C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAA,6CAAoB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;QAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,8CAA8C,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;SACvC;aAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxD,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,OAAO,EAAE,CAAC;SAC9E;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,qBAAqB,EAAE,yBAAc;QACrC,iBAAiB,EAAE,yBAAc;QACjC,mBAAmB,EAAE,yBAAc;QACnC,eAAe,EAAE,yBAAc;QAC/B,gBAAgB,EAAE,yBAAc;QAChC,2BAA2B,EAAE,yBAAc;QAC3C,mCAAmC,EAAE,yBAAc;QACnD,iBAAiB,EAAE,yBAAc;QACjC,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,SAAS;KACrB,EACD;QACE,uBAAuB,EAAE,yBAAc;QACvC,2BAA2B,EAAE,yBAAc;QAC3C,+BAA+B,EAAE,+BAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAU,EACV,OAAuC;IAEvC,QAAQ,OAAO,CAAC,cAAc,EAAE;QAC9B;YACE,OAAO,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QAC9B;YACE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,qBAAqB,EAAE,mCAAwB;aAChD,CACF,CAAC;YACF,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAsC;IAEtC,QAAQ,OAAO,CAAC,aAAa,EAAE;QAC7B;YACE,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;gBACE,UAAU,EAAE,QAAQ;gBACpB,cAAc,EAAE,QAAQ;gBACxB,uBAAuB,EAAE,QAAQ;gBACjC,SAAS,EAAE,QAAQ;gBACnB,gBAAgB,EAAE,QAAQ;gBAC1B,mBAAmB,EAAE,QAAQ;aAC9B,CACF,CAAC;QACJ;YACE,OAAO,IAAA,8BAAoB,EAAC,IAAI,CAAC,CAAC;QACpC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AACD,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}

package/src/generators/stories/lib/component-info.js

@@ -68,7 +68,8 @@ function getComponentInfoFromDir(tree, dir, componentName, moduleFolderPath) {
     for (const candidateFile of componentImportPathChildren) {
         if (candidateFile.endsWith('.ts')) {
             const content = tree.read(candidateFile, 'utf-8');
-            if (content.indexOf(`class ${componentName}`) > -1) {
+            const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${componentName}\\b`, 'g');
+            if (content.match(classAndComponentRegex)) {
                 path = candidateFile
                     .slice(0, candidateFile.lastIndexOf('/'))
                     .replace(moduleFolderPath, '.');

package/src/generators/stories/lib/component-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}

package/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.js

@@ -8,8 +8,8 @@ function assertCompatibleStorybookVersion() {
         storybookVersion = require(require.resolve('@storybook/angular/package.json')).version;
     }
     catch (_a) { }
-    if (storybookVersion && (0, semver_1.lt)(storybookVersion, '6.2.0')) {
-        throw new Error('Incompatible Storybook Version');
+    if (storybookVersion && (0, semver_1.lt)(storybookVersion, '6.4.0-rc.1')) {
+        throw new Error('Incompatible Storybook Version: Please use a version of @storybook/angular higher than 6.4.0-rc.1');
     }
 }
 exports.assertCompatibleStorybookVersion = assertCompatibleStorybookVersion;

package/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"assert-compatible-storybook-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAE5B,SAAgB,gCAAgC;IAC9C,IAAI,gBAAwB,CAAC;IAC7B,IAAI;QACF,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CACxC,iCAAiC,CAClC,CAAC,CAAC,OAAO,CAAC;KACZ;IAAC,WAAM,GAAE;IAEV,IAAI,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;AACH,CAAC;AAXD,4EAWC"}
+{"version":3,"file":"assert-compatible-storybook-version.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/assert-compatible-storybook-version.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAE5B,SAAgB,gCAAgC;IAC9C,IAAI,gBAAwB,CAAC;IAC7B,IAAI;QACF,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CACxC,iCAAiC,CAClC,CAAC,CAAC,OAAO,CAAC;KACZ;IAAC,WAAM,GAAE;IAEV,IAAI,gBAAgB,IAAI,IAAA,WAAE,EAAC,gBAAgB,EAAE,YAAY,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;KACH;AACH,CAAC;AAbD,4EAaC"}

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../utils/versions");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
@@ -10,11 +12,21 @@ function storybookConfigurationGenerator(tree, options) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         (0, assert_compatible_storybook_version_1.assertCompatibleStorybookVersion)();
         (0, validate_options_1.validateOptions)(options);
-        const installTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
+        // TODO(coly010/juristr): remove when @nrwl/storybook has been updated
+        const angularStorybookInstallTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@storybook/angular': versions_1.storybookVersion,
+            '@storybook/manager-webpack5': versions_1.storybookVersion,
+            '@storybook/builder-webpack5': versions_1.storybookVersion,
+            '@storybook/addon-essentials': versions_1.storybookVersion,
+        });
+        const storybookGeneratorInstallTask = yield (0, generate_storybook_configuration_1.generateStorybookConfiguration)(tree, options);
         if (options.generateStories) {
             (0, generate_stories_1.generateStories)(tree, options);
         }
-        return installTask;
+        return () => {
+            angularStorybookInstallTask();
+            storybookGeneratorInstallTask();
+        };
     });
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;

package/src/generators/storybook-configuration/storybook-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QACzB,MAAM,WAAW,GAAG,MAAM,IAAA,iEAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExE,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAbD,0EAaC;AAED,kBAAe,+BAA+B,CAAC"}
+{"version":3,"file":"storybook-configuration.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-configuration/storybook-configuration.ts"],"names":[],"mappings":";;;;AACA,yCAA4D;AAC5D,mDAAwD;AACxD,mGAA6F;AAC7F,6DAAyD;AACzD,6FAAwF;AACxF,6DAAyD;AAGzD,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAAsC;;QAEtC,IAAA,sEAAgC,GAAE,CAAC;QACnC,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;QAEzB,sEAAsE;QACtE,MAAM,2BAA2B,GAAG,IAAA,qCAA4B,EAC9D,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,2BAAgB;YACtC,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;YAC/C,6BAA6B,EAAE,2BAAgB;SAChD,CACF,CAAC;QACF,MAAM,6BAA6B,GAAG,MAAM,IAAA,iEAA8B,EACxE,IAAI,EACJ,OAAO,CACR,CAAC;QAEF,IAAI,OAAO,CAAC,eAAe,EAAE;YAC3B,IAAA,kCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,OAAO,GAAG,EAAE;YACV,2BAA2B,EAAE,CAAC;YAC9B,6BAA6B,EAAE,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}

package/src/migrations/update-13-2-0/update-angular-config.js

@@ -2,19 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
 function default_1(tree) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [projectName, project] of projects.entries()) {
-            for (const [targetName, target] of Object.entries(project.targets)) {
-                if (target.executor === '@nrwl/angular:webpack-server') {
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, Object.assign(Object.assign({}, project), { targets: Object.assign(Object.assign({}, project.targets), { [targetName]: Object.assign(Object.assign({}, target), { options: Object.assign(Object.assign({}, target.options), { optimization: undefined, aot: undefined, progress: undefined, deployUrl: undefined, sourceMap: undefined, vendorChunk: undefined, commonChunk: undefined, baseHref: undefined, servePathDefaultWarning: undefined, hmrWarning: undefined, extractCss: undefined }) }) }) }));
-                }
-                else if (target.executor === '@nrwl/angular:webpack-browser') {
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, Object.assign(Object.assign({}, project), { [targetName]: Object.assign(Object.assign({}, target), { options: Object.assign(Object.assign({}, target.options), { extractCss: undefined }) }) }));
-                }
-            }
-        }
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-server', (options, projectName, targetName, configurationName) => {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            const config = configurationName
+                ? projectConfiguration.targets[targetName].configurations[configurationName]
+                : projectConfiguration.targets[targetName].options;
+            delete config.optimization;
+            delete config.aot;
+            delete config.progress;
+            delete config.deployUrl;
+            delete config.sourceMap;
+            delete config.vendorChunk;
+            delete config.commonChunk;
+            delete config.baseHref;
+            delete config.servePathDefaultWarning;
+            delete config.hmrWarning;
+            delete config.extractCss;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        });
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/angular:webpack-browser', (options, projectName, targetName, configurationName) => {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            const config = configurationName
+                ? projectConfiguration.targets[targetName].configurations[configurationName]
+                : projectConfiguration.targets[targetName];
+            delete config.extractCss;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        });
     });
 }
 exports.default = default_1;

package/src/migrations/update-13-2-0/update-angular-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-config.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAEvE,mBAA+B,IAAU;;QACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACvD,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAClE,IAAI,MAAM,CAAC,QAAQ,KAAK,8BAA8B,EAAE;oBACtD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,kCACvC,OAAO,KACV,OAAO,kCACF,OAAO,CAAC,OAAO,KAClB,CAAC,UAAU,CAAC,kCACP,MAAM,KACT,OAAO,kCACF,MAAM,CAAC,OAAO,KACjB,YAAY,EAAE,SAAS,EACvB,GAAG,EAAE,SAAS,EACd,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,SAAS,EACnB,uBAAuB,EAAE,SAAS,EAClC,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,SAAS,aAI3B,CAAC;iBACJ;qBAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,+BAA+B,EAAE;oBAC9D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,kCACvC,OAAO,KACV,CAAC,UAAU,CAAC,kCACP,MAAM,KACT,OAAO,kCACF,MAAM,CAAC,OAAO,KACjB,UAAU,EAAE,SAAS,UAGzB,CAAC;iBACJ;aACF;SACF;IACH,CAAC;CAAA;AA1CD,4BA0CC"}
+{"version":3,"file":"update-angular-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-config.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AACtB,iGAA8F;AAK9F,mBAA+B,IAAU;;QACvC,IAAA,+CAAsB,EACpB,IAAI,EACJ,8BAA8B,EAC9B,CAAC,OAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAC3D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,iBAAiB;gBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;gBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACrD,OAAO,MAAM,CAAC,YAAY,CAAC;YAC3B,OAAO,MAAM,CAAC,GAAG,CAAC;YAClB,OAAO,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,MAAM,CAAC,SAAS,CAAC;YACxB,OAAO,MAAM,CAAC,SAAS,CAAC;YACxB,OAAO,MAAM,CAAC,WAAW,CAAC;YAC1B,OAAO,MAAM,CAAC,WAAW,CAAC;YAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,MAAM,CAAC,uBAAuB,CAAC;YACtC,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC,CACF,CAAC;QACF,IAAA,+CAAsB,EACpB,IAAI,EACJ,+BAA+B,EAC/B,CAAC,OAAY,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;YAC3D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,iBAAiB;gBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;gBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC7C,OAAO,MAAM,CAAC,UAAU,CAAC;YACzB,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;QACtE,CAAC,CACF,CAAC;IACJ,CAAC;CAAA;AAvCD,4BAuCC"}

package/src/migrations/update-13-2-0/update-angular-jest-config.js

@@ -20,6 +20,7 @@ function default_1(tree) {
                     angularProjects[projectName] = [jestConfigPath, jestConfig];
                 }
             }
+            yield (0, devkit_1.formatFiles)(tree);
         }
         for (const [_, [jestConfigPath, jestFileContents]] of Object.entries(angularProjects)) {
             tree.write(jestConfigPath, replaceTransformAndAddIgnorePattern(jestFileContents));
@@ -29,6 +30,15 @@ function default_1(tree) {
 }
 exports.default = default_1;
 function replaceTransformAndAddIgnorePattern(fileContents) {
+    let updatedFileContents = updateTransformProperty(fileContents);
+    updatedFileContents = updateTransformIgnorePattern(updatedFileContents);
+    if (fileContents === updatedFileContents) {
+        return updatedFileContents;
+    }
+    return updatedFileContents;
+}
+exports.replaceTransformAndAddIgnorePattern = replaceTransformAndAddIgnorePattern;
+function updateTransformProperty(fileContents) {
     const JEST_PRESET_ANGULAR_AST_QUERY = 'Identifier[name=transform] ~ ObjectLiteralExpression > PropertyAssignment:has(StringLiteral[value=jest-preset-angular])';
     const TRANSFORMER_STRING = "'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular'";
     let ast = tsquery_1.tsquery.ast(fileContents);
@@ -40,26 +50,26 @@ function replaceTransformAndAddIgnorePattern(fileContents) {
     }
     const transformerIndex = transformerExpressionNode.pos;
     const transformerEndIndex = transformerExpressionNode.end;
-    let updatedFileContents = `${fileContents.slice(0, transformerIndex)}\n${TRANSFORMER_STRING}${fileContents.slice(transformerEndIndex)}`;
+    return `${fileContents.slice(0, transformerIndex)}\n${TRANSFORMER_STRING}${fileContents.slice(transformerEndIndex)}`;
+}
+function updateTransformIgnorePattern(fileContents) {
     const TRANSFORM_OBJECT_AST_QUERY = 'PropertyAssignment:has(Identifier[name=transform])';
     let TRANSFORM_IGNORE_PATTERN_STRING = "transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],";
-    ast = tsquery_1.tsquery.ast(updatedFileContents);
+    const ast = tsquery_1.tsquery.ast(fileContents);
     const transformObjectNode = (0, tsquery_1.tsquery)(ast, TRANSFORM_OBJECT_AST_QUERY, {
         visitAllChildren: true,
     })[0];
     if (!transformObjectNode) {
-        return updatedFileContents;
+        return fileContents;
     }
     let transformEndIndex = transformObjectNode.getEnd();
-    if (updatedFileContents.charAt(transformEndIndex) == ',') {
+    if (fileContents.charAt(transformEndIndex) == ',') {
         transformEndIndex = transformObjectNode.getEnd() + 1;
         TRANSFORM_IGNORE_PATTERN_STRING = `\n${TRANSFORM_IGNORE_PATTERN_STRING}`;
     }
     else {
         TRANSFORM_IGNORE_PATTERN_STRING = `,\n${TRANSFORM_IGNORE_PATTERN_STRING}`;
     }
-    updatedFileContents = `${updatedFileContents.slice(0, transformEndIndex)}${TRANSFORM_IGNORE_PATTERN_STRING}${updatedFileContents.slice(transformEndIndex)}`;
-    return updatedFileContents;
+    return `${fileContents.slice(0, transformEndIndex)}${TRANSFORM_IGNORE_PATTERN_STRING}${fileContents.slice(transformEndIndex)}`;
 }
-exports.replaceTransformAndAddIgnorePattern = replaceTransformAndAddIgnorePattern;
 //# sourceMappingURL=update-angular-jest-config.js.map

package/src/migrations/update-13-2-0/update-angular-jest-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}

package/src/utils/versions.d.ts

@@ -2,7 +2,8 @@ export declare const nxVersion = "*";
 export declare const angularVersion = "^13.0.0";
 export declare const angularDevkitVersion = "~13.0.0";
 export declare const angularJsVersion = "1.7.9";
-export declare const ngrxVersion = "~13.0.0-beta.0";
+export declare const ngrxVersion = "~12.5.0";
 export declare const rxjsVersion = "~7.4.0";
-export declare const jestPresetAngularVersion = "11.0.0-rc.2";
+export declare const jestPresetAngularVersion = "11.0.0-rc.3";
 export declare const angularEslintVersion = "~12.6.0";
+export declare const storybookVersion = "~6.4.0-rc.1";

package/src/utils/versions.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.2.0-beta.2';
+exports.storybookVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.nxVersion = '13.2.0-rc.0';
 exports.angularVersion = '^13.0.0';
 exports.angularDevkitVersion = '~13.0.0';
 exports.angularJsVersion = '1.7.9';
-exports.ngrxVersion = '~13.0.0-beta.0';
+exports.ngrxVersion = '~12.5.0';
 exports.rxjsVersion = '~7.4.0';
-exports.jestPresetAngularVersion = '11.0.0-rc.2';
+exports.jestPresetAngularVersion = '11.0.0-rc.3';
 exports.angularEslintVersion = '~12.6.0';
+exports.storybookVersion = '~6.4.0-rc.1';
 //# sourceMappingURL=versions.js.map

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,gBAAgB,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,aAAa,CAAC;AACzC,QAAA,oBAAoB,GAAG,SAAS,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,aAAa,CAAC;AACzC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,aAAa,CAAC"}