@nrwl/angular 14.8.3 → 15.0.0-beta.1

package/src/generators/ngrx/lib/add-imports-to-module.js.map

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

package/src/generators/ngrx/schema.d.ts

@@ -9,9 +9,4 @@ export interface NgRxGeneratorOptions {
   skipFormat?: boolean;
   skipImport?: boolean;
   skipPackageJson?: boolean;
-  /**
-   * @deprecated This option is deprecated and will be removed in v15.
-   * Using the individual operators is recommended.
-   */
-  useDataPersistence?: boolean;
 }

package/src/generators/ngrx/schema.json

@@ -57,12 +57,6 @@
       "default": false,
       "description": "Do not update the `package.json` with NgRx dependencies."
     },
-    "useDataPersistence": {
-      "type": "boolean",
-      "default": false,
-      "description": "Generate NgRx Effects with the `DataPersistence` helper service. Set to false to use plain effects data persistence operators.",
-      "x-deprecated": "This option is deprecated and will be removed in v15. Using the individual operators is recommended."
-    },
     "barrels": {
       "type": "boolean",
       "default": false,

package/src/generators/remote/schema.d.ts

@@ -2,8 +2,6 @@ import { Linter } from '@nrwl/linter';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
-type AngularLinter = Exclude<Linter, Linter.TsLint>;
-
 export interface Schema {
   name: string;
   host?: string;
@@ -16,7 +14,7 @@ export interface Schema {
   skipTests?: boolean;
   directory?: string;
   tags?: string;
-  linter?: AngularLinter;
+  linter?: Linter;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

package/src/generators/setup-mf/files/entry-module-files/entry.module.ts__tmpl__

@@ -3,18 +3,14 @@ import { CommonModule } from '@angular/common';<% if(routing) { %>
 import { RouterModule } from '@angular/router';<% } %>
 
 import { RemoteEntryComponent } from './entry.component';
-import { NxWelcomeComponent } from './nx-welcome.component';
+import { NxWelcomeComponent } from './nx-welcome.component';<% if(routing) { %>
+import { remoteRoutes } from './entry.routes';<% } %>
 
 @NgModule({
   declarations: [RemoteEntryComponent, NxWelcomeComponent],
   imports: [
     CommonModule,<% if(routing) { %>
-    RouterModule.forChild([
-      {
-        path: '',
-        component: RemoteEntryComponent,
-      },
-    ]),<% } %>
+    RouterModule.forChild(remoteRoutes),<% } %>
   ],
   providers: [],<% if(!routing) { %>
   exports: [RemoteEntryComponent],<% } %>

package/src/generators/setup-mf/files/{standalone-entry-component-files/routes.ts__tmpl__ → entry-module-files/entry.routes.ts__tmpl__}

@@ -1,4 +1,4 @@
 import { Route } from '@angular/router';
 import { RemoteEntryComponent } from './entry.component';
 
-export const RemoteRoutes: Route[] = [{path: '', component: RemoteEntryComponent}]
+export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntryComponent }];

package/src/generators/setup-mf/files/standalone-entry-component-files/entry.routes.ts__tmpl__

@@ -0,0 +1,4 @@
+import { Route } from '@angular/router';
+import { RemoteEntryComponent } from './entry.component';
+
+export const remoteRoutes: Route[] = [{ path: '', component: RemoteEntryComponent }];

package/src/generators/setup-mf/files/webpack/module-federation.config.js__tmpl__

@@ -2,7 +2,7 @@ module.exports = {
   name: '<%= name %>',<% if(type === 'host') { %>
   remotes: [<% remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); %>]<% } %><% if(type === 'remote') { %>
   exposes: {<% if(standalone) { %>
-    './Routes': '<%= projectRoot %>/src/app/remote-entry/routes.ts',<% } else { %>
+    './Routes': '<%= projectRoot %>/src/app/remote-entry/entry.routes.ts',<% } else { %>
     './Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',<% } %>
   },<% } %>
 }

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemoteEntry = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addRemoteEntry(tree, { appName, routing, mfType, prefix, standalone }, appRoot) {
     if (mfType === 'remote') {
         prefix = prefix !== null && prefix !== void 0 ? prefix : (0, devkit_1.readWorkspaceConfiguration)(tree).npmScope;
@@ -13,7 +14,13 @@ function addRemoteEntry(tree, { appName, routing, mfType, prefix, standalone },
             routing,
             prefix,
         });
-        if (!standalone) {
+        if (standalone && routing) {
+            (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.routes').then(m => m.remoteRoutes)}`);
+        }
+        else {
+            if (routing) {
+                (0, route_utils_1.addRoute)(tree, (0, devkit_1.joinPathFragments)(appRoot, 'src/app/app.routes.ts'), `{path: '', loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)}`);
+            }
             tree.write(`${appRoot}/src/app/app.module.ts`, `/* 
       * This RemoteEntryModule is imported here to allow TS to find the Module during 
       * compilation, allowing it to be included in the built bundle. This is required 

package/src/generators/setup-mf/lib/add-remote-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAU,EACxD,OAAe;IAEf,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC7D,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;YACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;YACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,OAAO;YACP,MAAM;SACP,CACF,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMN,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACnD,CAAC;SACH;KACF;AACH,CAAC;AArCD,wCAqCC"}
+{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAEtB,sEAAgE;AAEhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAU,EACxD,OAAe;IAEf,IAAI,MAAM,KAAK,QAAQ,EAAE;QACvB,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC7D,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;YACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;YACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;YACE,IAAI,EAAE,EAAE;YACR,OAAO;YACP,OAAO;YACP,MAAM;SACP,CACF,CAAC;QAEF,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;SACH;aAAM;YACL,IAAI,OAAO,EAAE;gBACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;aACH;YAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMN,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACnD,CAAC;SACH;KACF;AACH,CAAC;AAnDD,wCAmDC"}

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -4,9 +4,8 @@ exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = require("typescript");
-const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const ast_utils_2 = require("@nrwl/workspace/src/utilities/ast-utils");
-const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
+const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function checkIsCommaNeeded(mfRemoteText) {
     const remoteText = mfRemoteText.replace(/\s+/g, '');
     return !remoteText.endsWith(',]')
@@ -61,39 +60,26 @@ function addRemoteToDynamicHost(tree, options, pathToMfManifest) {
 // TODO(colum): future work: allow dev to pass to path to routing module
 function addLazyLoadedRouteToHostAppModule(tree, options, hostFederationType) {
     const hostAppConfig = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-    const isHostStandalone = !tree
-        .read((0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'bootstrap.ts'), 'utf-8')
-        .includes('bootstrapModule');
-    const pathToHostRootRouting = isHostStandalone
-        ? `${hostAppConfig.sourceRoot}/bootstrap.ts`
-        : `${hostAppConfig.sourceRoot}/app/app.module.ts`;
+    const pathToHostRootRouting = `${hostAppConfig.sourceRoot}/app/app.routes.ts`;
     if (!tree.exists(pathToHostRootRouting)) {
         return;
     }
     const hostRootRoutingFile = tree.read(pathToHostRootRouting, 'utf-8');
-    if (!hostRootRoutingFile.includes('RouterModule.forRoot(')) {
-        return;
-    }
     let sourceFile = ts.createSourceFile(pathToHostRootRouting, hostRootRoutingFile, ts.ScriptTarget.Latest, true);
     if (hostFederationType === 'dynamic') {
-        sourceFile = (0, ast_utils_2.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@nrwl/angular/mf');
+        sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, pathToHostRootRouting, 'loadRemoteModule', '@nrwl/angular/mf');
     }
     const routePathName = options.standalone ? 'Routes' : 'Module';
+    const exportedRemote = options.standalone
+        ? 'remoteRoutes'
+        : 'RemoteEntryModule';
     const routeToAdd = hostFederationType === 'dynamic'
         ? `loadRemoteModule('${options.appName}', './${routePathName}')`
         : `import('${options.appName}/${routePathName}')`;
-    if (hostRootRoutingFile.includes('@NgModule')) {
-        sourceFile = (0, ast_utils_1.addRoute)(tree, pathToHostRootRouting, sourceFile, `{
-         path: '${options.appName}', 
-         loadChildren: () => ${routeToAdd}.then(m => m.RemoteEntryModule)
-     }`);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, pathToHostRootRouting, `{
+    (0, route_utils_1.addRoute)(tree, pathToHostRootRouting, `{
     path: '${options.appName}',
-    loadChildren: () => ${routeToAdd}.then(m => m.RemoteRoutes)
+    loadChildren: () => ${routeToAdd}.then(m => m.${exportedRemote})
     }`);
-    }
     const pathToAppComponentTemplate = (0, devkit_1.joinPathFragments)(hostAppConfig.sourceRoot, 'app/app.component.html');
     const appComponent = tree.read(pathToAppComponentTemplate, 'utf-8');
     if (appComponent.includes(`<ul class="remote-menu">`) &&

package/src/generators/setup-mf/lib/add-remote-to-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}

package/src/generators/setup-mf/lib/fix-bootstrap.js

@@ -28,7 +28,7 @@ import {enableProdMode, importProvidersFrom} from "@angular/core";
 import {bootstrapApplication} from "@angular/platform-browser";
 import {RouterModule} from "@angular/router";
 import {RemoteEntryComponent} from "./app/remote-entry/entry.component";
-import {RemoteRoutes} from "./app/remote-entry/routes";
+import {appRoutes} from "./app/app.routes";
 
 if (environment.production) {
   enableProdMode();
@@ -37,7 +37,7 @@ if (environment.production) {
 bootstrapApplication(RemoteEntryComponent, {
   providers: [
     importProvidersFrom(
-      RouterModule.forRoot(RemoteRoutes, {initialNavigation: 'enabledBlocking'})
+      RouterModule.forRoot(appRoutes, {initialNavigation: 'enabledBlocking'})
     )
   ]
 });`;

package/src/generators/setup-mf/lib/setup-serve-target.js

@@ -7,7 +7,7 @@ function setupServeTarget(host, options) {
     const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
     appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: options.mfType === 'host'
             ? '@nrwl/angular:module-federation-dev-server'
-            : '@nrwl/angular:webpack-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
+            : '@nrwl/angular:webpack-dev-server', options: Object.assign(Object.assign({}, appConfig.targets['serve'].options), { port: (_a = options.port) !== null && _a !== void 0 ? _a : undefined, publicHost: `http://localhost:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}` }) });
     if (options.mfType === 'remote') {
         appConfig.targets['serve-static'] = {
             executor: '@nrwl/angular:file-server',

package/src/generators/setup-mf/lib/setup-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,8BAA8B,EACpC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,2BAA2B;YACrC,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}
+{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,yCAGsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,4CAA4C;YAC9C,CAAC,CAAC,kCAAkC,EACxC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,2BAA2B;YACrC,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AApCD,4CAoCC"}

package/src/generators/storybook-configuration/schema.d.ts

@@ -4,7 +4,7 @@ export interface StorybookConfigurationOptions {
   configureCypress: boolean;
   generateCypressSpecs: boolean;
   generateStories: boolean;
-  linter: Exclude<Linter, Linter.TsLint>;
+  linter: Linter;
   name: string;
   cypressDirectory?: string;
   tsConfiguration?: boolean;

package/src/migrations/update-14-8-0/rename-webpack-server.d.ts

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

package/src/migrations/update-14-8-0/rename-webpack-server.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+function renameWebpackServer(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    const oldExecutorName = '@nrwl/angular:webpack-server';
+    const newExecutorName = '@nrwl/angular:webpack-dev-server';
+    for (const [projectName, project] of projects.entries()) {
+        let stringifiedProject = JSON.stringify(project);
+        if (!stringifiedProject.includes(oldExecutorName)) {
+            continue;
+        }
+        for (const [targetName, target] of Object.entries(project.targets)) {
+            if (target.executor === oldExecutorName) {
+                target.executor = newExecutorName;
+            }
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    }
+}
+exports.default = renameWebpackServer;
+//# sourceMappingURL=rename-webpack-server.js.map

package/src/migrations/update-14-8-0/rename-webpack-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rename-webpack-server.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-8-0/rename-webpack-server.ts"],"names":[],"mappings":";;AACA,yCAAuE;AAEvE,SAAwB,mBAAmB,CAAC,IAAU;IACpD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,eAAe,GAAG,8BAA8B,CAAC;IACvD,MAAM,eAAe,GAAG,kCAAkC,CAAC;IAE3D,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;QACvD,IAAI,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;YACjD,SAAS;SACV;QACD,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAClE,IAAI,MAAM,CAAC,QAAQ,KAAK,eAAe,EAAE;gBACvC,MAAM,CAAC,QAAQ,GAAG,eAAe,CAAC;aACnC;SACF;QAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;KACxD;AACH,CAAC;AAnBD,sCAmBC"}

package/src/migrations/update-15-0-0/add-karma-inputs.d.ts

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

package/src/migrations/update-15-0-0/add-karma-inputs.js

@@ -0,0 +1,48 @@
+"use strict";
+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) {
+    var _a, _b, _c, _d;
+    var _e;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
+        const karmaTargets = getKarmaTargetNames(tree);
+        const hasProductionFileset = !!((_a = workspaceConfiguration.namedInputs) === null || _a === void 0 ? void 0 : _a.production);
+        if (karmaTargets.size > 0 && hasProductionFileset) {
+            const productionFileset = new Set(workspaceConfiguration.namedInputs.production);
+            for (const exclusion of [
+                '!{projectRoot}/**/*.spec.[jt]s',
+                '!{projectRoot}/tsconfig.spec.json',
+                '!{projectRoot}/karma.conf.js',
+            ]) {
+                productionFileset.add(exclusion);
+            }
+            workspaceConfiguration.namedInputs.production =
+                Array.from(productionFileset);
+        }
+        for (const targetName of karmaTargets) {
+            (_b = workspaceConfiguration.targetDefaults) !== null && _b !== void 0 ? _b : (workspaceConfiguration.targetDefaults = {});
+            const jestTargetDefaults = ((_c = (_e = workspaceConfiguration.targetDefaults)[targetName]) !== null && _c !== void 0 ? _c : (_e[targetName] = {}));
+            (_d = jestTargetDefaults.inputs) !== null && _d !== void 0 ? _d : (jestTargetDefaults.inputs = [
+                'default',
+                hasProductionFileset ? '^production' : '^default',
+                ...(tree.exists('karma.conf.js')
+                    ? ['{workspaceRoot}/karma.conf.js']
+                    : []),
+            ]);
+        }
+        (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function getKarmaTargetNames(tree) {
+    const karmaTargetNames = new Set();
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@angular-devkit/build-angular:karma', (_, __, target) => {
+        karmaTargetNames.add(target);
+    });
+    return karmaTargetNames;
+}
+//# sourceMappingURL=add-karma-inputs.js.map

package/src/migrations/update-15-0-0/add-karma-inputs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-karma-inputs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-0-0/add-karma-inputs.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,iGAA8F;AAE9F,mBAA+B,IAAU;;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAEhE,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,sBAAsB,CAAC,WAAW,0CAAE,UAAU,CAAA,CAAC;QAE9E,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,IAAI,oBAAoB,EAAE;YACjD,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,sBAAsB,CAAC,WAAW,CAAC,UAAU,CAC9C,CAAC;YACF,KAAK,MAAM,SAAS,IAAI;gBACtB,gCAAgC;gBAChC,mCAAmC;gBACnC,8BAA8B;aAC/B,EAAE;gBACD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,sBAAsB,CAAC,WAAW,CAAC,UAAU;gBAC3C,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;SACjC;QAED,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE;YACrC,MAAA,sBAAsB,CAAC,cAAc,oCAArC,sBAAsB,CAAC,cAAc,GAAK,EAAE,EAAC;YAC7C,MAAM,kBAAkB,GAAG,aAAC,sBAAsB,CAAC,cAAc,EAC/D,UAAU,wCAAV,UAAU,IACN,EAAE,EAAC,CAAC;YAEV,MAAA,kBAAkB,CAAC,MAAM,oCAAzB,kBAAkB,CAAC,MAAM,GAAK;gBAC5B,SAAS;gBACT,oBAAoB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU;gBACjD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;oBAC9B,CAAC,CAAC,CAAC,+BAA+B,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;aACR,EAAC;SACH;QAED,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAE3D,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAvCD,4BAuCC;AAED,SAAS,mBAAmB,CAAC,IAAU;IACrC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3C,IAAA,+CAAsB,EACpB,IAAI,EACJ,qCAAqC,EACrC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;QAChB,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC,CACF,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.d.ts

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

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const versions_1 = require("../../utils/versions");
+function switchToJasmineMarbles(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const usesJasmineMarbles = yield replaceJasmineMarbleUsagesInFiles(tree);
+        addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles);
+    });
+}
+exports.default = switchToJasmineMarbles;
+function replaceJasmineMarbleUsagesInFiles(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let usesJasmineMarbles = false;
+        const projectGraph = yield (() => {
+            try {
+                return (0, devkit_1.readCachedProjectGraph)();
+            }
+            catch (_a) {
+                return (0, devkit_1.createProjectGraphAsync)();
+            }
+        })();
+        const dirsToTraverse = Object.entries(projectGraph.dependencies)
+            .filter(([, dep]) => dep.some(({ target }) => target === 'npm:@nrwl/angular'))
+            .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName).root);
+        for (const dir of dirsToTraverse) {
+            (0, devkit_1.visitNotIgnoredFiles)(tree, dir, (path) => {
+                if ((0, path_1.extname)(path) !== '.ts') {
+                    return;
+                }
+                const fileContents = tree.read(path, 'utf-8');
+                if (!fileContents.includes('@nrwl/angular/testing')) {
+                    return;
+                }
+                const NRWL_ANGULAR_TESTING_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value="@nrwl/angular/testing"])';
+                const ast = tsquery_1.tsquery.ast(fileContents);
+                const nrwlAngularTestingImportNodes = (0, tsquery_1.tsquery)(ast, NRWL_ANGULAR_TESTING_IMPORT_SELECTOR, { visitAllChildren: true });
+                if (!nrwlAngularTestingImportNodes ||
+                    nrwlAngularTestingImportNodes.length === 0) {
+                    return;
+                }
+                const jasmineMarblesExportsRegex = new RegExp(/(hot|cold|getTestScheduler|time)/);
+                if (!jasmineMarblesExportsRegex.test(nrwlAngularTestingImportNodes[0].getText())) {
+                    return;
+                }
+                const IMPORT_SPECIFIERS_SELECTOR = 'NamedImports > ImportSpecifier';
+                const importSpecifierNodes = (0, tsquery_1.tsquery)(nrwlAngularTestingImportNodes[0], IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
+                if (!importSpecifierNodes || importSpecifierNodes.length === 0) {
+                    return;
+                }
+                const validNrwlTestingImports = [];
+                const validJasmineMarbleImports = [];
+                for (const node of importSpecifierNodes) {
+                    const importSymbol = node.getText();
+                    if (jasmineMarblesExportsRegex.test(importSymbol)) {
+                        validJasmineMarbleImports.push(importSymbol);
+                    }
+                    else {
+                        validNrwlTestingImports.push(importSymbol);
+                    }
+                }
+                if (!usesJasmineMarbles && validJasmineMarbleImports.length > 0) {
+                    usesJasmineMarbles = true;
+                }
+                const newFileContents = `${fileContents.slice(0, nrwlAngularTestingImportNodes[0].getStart())}${validNrwlTestingImports.length > 0
+                    ? `import {${validNrwlTestingImports.join(',')}} from '@nrwl/angular/testing';`
+                    : ''}
+    ${validJasmineMarbleImports.length > 0
+                    ? `import {${validJasmineMarbleImports.join(',')}} from 'jasmine-marbles';${fileContents.slice(nrwlAngularTestingImportNodes[0].getEnd(), -1)}`
+                    : ''}`;
+                tree.write(path, newFileContents);
+            });
+        }
+        return usesJasmineMarbles;
+    });
+}
+function addJasmineMarblesDevDependencyIfUsed(tree, usesJasmineMarbles) {
+    if (!usesJasmineMarbles) {
+        return;
+    }
+    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const jasmineMarblesDependency = pkgJson.dependencies['jasmine-marbles'];
+    const jasmineMarblesDevDependency = pkgJson.devDependencies['jasmine-marbles'];
+    if (jasmineMarblesDependency || jasmineMarblesDevDependency) {
+        return;
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        'jasmine-marbles': versions_1.jasmineMarblesVersion,
+    });
+}
+//# sourceMappingURL=switch-to-jasmine-marbles.js.map

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch-to-jasmine-marbles.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-0-0/switch-to-jasmine-marbles.ts"],"names":[],"mappings":"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"}

package/src/runtime/nx/data-persistence.d.ts

@@ -1,9 +1,7 @@
-import { Type } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Actions } from '@ngrx/effects';
-import { Action, Store, ActionCreator } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import * as i0 from "@angular/core";
+import type { Type } from '@angular/core';
+import type { ActivatedRouteSnapshot } from '@angular/router';
+import type { Action } from '@ngrx/store';
+import type { Observable } from 'rxjs';
 export interface PessimisticUpdateOpts<T extends Array<unknown>, A> {
     run(a: A, ...slices: [...T]): Observable<Action> | Action | void;
     onError(a: A, e: any): Observable<any> | any;
@@ -271,43 +269,3 @@ export declare function fetch<T extends Array<unknown>, A extends Action>(opts:
  * @param opts
  */
 export declare function navigation<T extends Array<unknown>, A extends Action>(component: Type<any>, opts: HandleNavigationOpts<T>): (source: ActionStatesStream<T, A>) => Observable<Action>;
-/**
- * @whatItDoes Provides convenience methods for implementing common operations of persisting data.
- *
- * @deprecated Use the individual operators instead. Will be removed in v15.
- */
-export declare class DataPersistence<T> {
-    store: Store<T>;
-    actions: Actions;
-    constructor(store: Store<T>, actions: Actions);
-    /**
-     * See {@link pessimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link pessimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    pessimisticUpdate<A extends Action = Action>(actionType: string | ActionCreator, opts: PessimisticUpdateOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link optimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link optimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    optimisticUpdate<A extends Action = Action>(actionType: string | ActionCreator, opts: OptimisticUpdateOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link fetch} operator for more information.
-     *
-     * @deprecated Use the {@link fetch} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    fetch<A extends Action = Action>(actionType: string | ActionCreator, opts: FetchOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link navigation} operator for more information.
-     *
-     * @deprecated Use the {@link navigation} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    navigation(component: Type<any>, opts: HandleNavigationOpts<[T]>): Observable<any>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DataPersistence<any>, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<DataPersistence<any>>;
-}

package/src/runtime/nx/data-persistence.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataPersistence = exports.navigation = exports.fetch = exports.optimisticUpdate = exports.pessimisticUpdate = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@angular/core");
-const effects_1 = require("@ngrx/effects");
+exports.navigation = exports.fetch = exports.optimisticUpdate = exports.pessimisticUpdate = void 0;
 const router_store_1 = require("@ngrx/router-store");
-const store_1 = require("@ngrx/store");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 /**
@@ -329,58 +325,6 @@ function normalizeActionAndState(args) {
     }
     return [action, ...slices];
 }
-/**
- * @whatItDoes Provides convenience methods for implementing common operations of persisting data.
- *
- * @deprecated Use the individual operators instead. Will be removed in v15.
- */
-let DataPersistence = class DataPersistence {
-    constructor(store, actions) {
-        this.store = store;
-        this.actions = actions;
-    }
-    /**
-     * See {@link pessimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link pessimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    pessimisticUpdate(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), pessimisticUpdate(opts));
-    }
-    /**
-     * See {@link optimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link optimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    optimisticUpdate(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), optimisticUpdate(opts));
-    }
-    /**
-     * See {@link fetch} operator for more information.
-     *
-     * @deprecated Use the {@link fetch} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    fetch(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), fetch(opts));
-    }
-    /**
-     * See {@link navigation} operator for more information.
-     *
-     * @deprecated Use the {@link navigation} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    navigation(component, opts) {
-        return this.actions.pipe((0, operators_1.withLatestFrom)(this.store), navigation(component, opts));
-    }
-};
-DataPersistence = tslib_1.__decorate([
-    (0, core_1.Injectable)(),
-    tslib_1.__metadata("design:paramtypes", [store_1.Store, effects_1.Actions])
-], DataPersistence);
-exports.DataPersistence = DataPersistence;
 function findSnapshot(component, s) {
     if (s.routeConfig && s.routeConfig.component === component) {
         return s;