@nrwl/angular 15.2.0-beta.1 → 15.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [15.2.0-beta.1](https://github.com/nrwl/nx/compare/15.1.0...15.2.0-beta.1) (2022-11-17)
6
+ ## [15.2.1](https://github.com/nrwl/nx/compare/15.2.0...15.2.1) (2022-11-19)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/angular
@@ -55,3 +55,4 @@ function loadRemoteContainer(remoteName) {
55
55
 
56
56
  export { loadRemoteModule, setRemoteDefinitions, setRemoteUrlResolver };
57
57
  //# sourceMappingURL=nrwl-angular-mf.mjs.map
58
+ //# sourceMappingURL=nrwl-angular-mf.mjs.map
@@ -37,3 +37,4 @@ function readFirst(o) {
37
37
 
38
38
  export { readAll, readFirst };
39
39
  //# sourceMappingURL=nrwl-angular-testing.mjs.map
40
+ //# sourceMappingURL=nrwl-angular-testing.mjs.map
@@ -349,3 +349,4 @@ function wrapIntoObservable(obj) {
349
349
 
350
350
  export { fetch, navigation, optimisticUpdate, pessimisticUpdate };
351
351
  //# sourceMappingURL=nrwl-angular.mjs.map
352
+ //# sourceMappingURL=nrwl-angular.mjs.map
@@ -49,3 +49,4 @@ async function loadRemoteContainer(remoteName) {
49
49
 
50
50
  export { loadRemoteModule, setRemoteDefinitions, setRemoteUrlResolver };
51
51
  //# sourceMappingURL=nrwl-angular-mf.mjs.map
52
+ //# sourceMappingURL=nrwl-angular-mf.mjs.map
@@ -37,3 +37,4 @@ function readFirst(o) {
37
37
 
38
38
  export { readAll, readFirst };
39
39
  //# sourceMappingURL=nrwl-angular-testing.mjs.map
40
+ //# sourceMappingURL=nrwl-angular-testing.mjs.map
@@ -349,3 +349,4 @@ function wrapIntoObservable(obj) {
349
349
 
350
350
  export { fetch, navigation, optimisticUpdate, pessimisticUpdate };
351
351
  //# sourceMappingURL=nrwl-angular.mjs.map
352
+ //# sourceMappingURL=nrwl-angular.mjs.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "15.2.0-beta.1",
3
+ "version": "15.2.1",
4
4
  "private": false,
5
5
  "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.",
6
6
  "repository": {
@@ -67,13 +67,13 @@
67
67
  },
68
68
  "dependencies": {
69
69
  "@angular-devkit/schematics": "~15.0.0",
70
- "@nrwl/cypress": "15.2.0-beta.1",
71
- "@nrwl/devkit": "15.2.0-beta.1",
72
- "@nrwl/jest": "15.2.0-beta.1",
73
- "@nrwl/linter": "15.2.0-beta.1",
74
- "@nrwl/storybook": "15.2.0-beta.1",
75
- "@nrwl/webpack": "15.2.0-beta.1",
76
- "@nrwl/workspace": "15.2.0-beta.1",
70
+ "@nrwl/cypress": "15.2.1",
71
+ "@nrwl/devkit": "15.2.1",
72
+ "@nrwl/jest": "15.2.1",
73
+ "@nrwl/linter": "15.2.1",
74
+ "@nrwl/storybook": "15.2.1",
75
+ "@nrwl/webpack": "15.2.1",
76
+ "@nrwl/workspace": "15.2.1",
77
77
  "@phenomnomnominal/tsquery": "4.1.1",
78
78
  "@schematics/angular": "~15.0.0",
79
79
  "chalk": "4.1.0",
@@ -99,5 +99,5 @@
99
99
  "fesm2015": "fesm2015/nrwl-angular.mjs",
100
100
  "typings": "index.d.ts",
101
101
  "sideEffects": false,
102
- "gitHead": "486028118fca1f4feeefe63ecde8952f31d8750b"
102
+ "gitHead": "87b2b5c085b665e784e9effcdbfe1d6497e9d78a"
103
103
  }
@@ -50,6 +50,11 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
50
50
  options.tsConfig = tsConfigPath;
51
51
  return options;
52
52
  });
53
+ // The buildTargetConfiguration also needs to use the generated tsconfig path
54
+ // otherwise the build will fail if customWebpack function/file is referencing
55
+ // local libs. This synchronize the behavior with webpack-browser and
56
+ // webpack-server implementation.
57
+ buildTargetConfiguration.tsConfig = tsConfigPath;
53
58
  }
54
59
  return (0, build_angular_1.executeDevServerBuilder)(options, context, {
55
60
  webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1 +1 @@
1
- {"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
@@ -7,13 +7,5 @@
7
7
  */
8
8
  import '@angular/platform-server/init';
9
9
 
10
- import { enableProdMode } from '@angular/core';
11
-
12
- import { environment } from './environments/environment';
13
-
14
- if (environment.production) {
15
- enableProdMode();
16
- }
17
-
18
10
  export { <%= rootModuleClassName %> } from './app/<%= rootModuleFileName.slice(0, -3) %>';
19
11
  export { renderModule } from '@angular/platform-server';
@@ -1,12 +1,6 @@
1
- import { enableProdMode } from '@angular/core';
2
1
  import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
3
2
 
4
3
  import { AppModule } from './app/app.module';
5
- import { environment } from './environments/environment';
6
-
7
- if (environment.production) {
8
- enableProdMode();
9
- }
10
4
 
11
5
  function bootstrap() {
12
6
  platformBrowserDynamic()
@@ -3,25 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateProjectConfig = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  function updateProjectConfig(tree, schema) {
6
+ var _a, _b;
6
7
  let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
7
8
  projectConfig.targets.build.options.outputPath = `dist/apps/${schema.project}/browser`;
9
+ const buildTargetFileReplacements = (_b = (_a = projectConfig.targets.build.configurations) === null || _a === void 0 ? void 0 : _a.production) === null || _b === void 0 ? void 0 : _b.fileReplacements;
8
10
  projectConfig.targets.server = {
9
11
  executor: '@angular-devkit/build-angular:server',
10
12
  options: {
11
- outputPath: `dist/apps/${projectConfig.root}/server`,
13
+ outputPath: `dist/${projectConfig.root}/server`,
12
14
  main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
13
15
  tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
14
16
  },
15
17
  configurations: {
16
- production: {
17
- outputHashing: 'media',
18
- fileReplacements: [
19
- {
20
- replace: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'environments/environment.ts'),
21
- with: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'environments/environment.prod.ts'),
22
- },
23
- ],
24
- },
18
+ production: Object.assign({ outputHashing: 'media' }, (buildTargetFileReplacements
19
+ ? { fileReplacements: buildTargetFileReplacements }
20
+ : {})),
25
21
  development: {
26
22
  optimization: false,
27
23
  sourceMap: true,
@@ -1 +1 @@
1
- {"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,aAAa,MAAM,CAAC,OAAO,UAAU,CAAC;IAEvF,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE;YACP,UAAU,EAAE,aAAa,aAAa,CAAC,IAAI,SAAS;YACpD,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC;YAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC;SACxE;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,aAAa,EAAE,OAAO;gBACtB,gBAAgB,EAAE;oBAChB;wBACE,OAAO,EAAE,IAAA,0BAAiB,EACxB,aAAa,CAAC,UAAU,EACxB,6BAA6B,CAC9B;wBACD,IAAI,EAAE,IAAA,0BAAiB,EACrB,aAAa,CAAC,UAAU,EACxB,kCAAkC,CACnC;qBACF;iBACF;aACF;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,IAAI;gBACf,eAAe,EAAE,KAAK;aACvB;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;QACnC,QAAQ,EAAE,sCAAsC;QAChD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,aAAa;KACpC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,SAAS,GAAG;QAChC,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,GAAG,CAAC;SACd;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAvED,kDAuEC"}
1
+ {"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,aAAa,MAAM,CAAC,OAAO,UAAU,CAAC;IAEvF,MAAM,2BAA2B,GAC/B,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,0CAAE,UAAU,0CAAE,gBAAgB,CAAC;IAE3E,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE;YACP,UAAU,EAAE,QAAQ,aAAa,CAAC,IAAI,SAAS;YAC/C,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC;YAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC;SACxE;QACD,cAAc,EAAE;YACd,UAAU,kBACR,aAAa,EAAE,OAAO,IACnB,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,EAAE,gBAAgB,EAAE,2BAA2B,EAAE;gBACnD,CAAC,CAAC,EAAE,CAAC,CACR;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,IAAI;gBACf,eAAe,EAAE,KAAK;aACvB;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;QACnC,QAAQ,EAAE,sCAAsC;QAChD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,aAAa;KACpC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,SAAS,GAAG;QAChC,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,GAAG,CAAC;SACd;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAjED,kDAiEC"}
@@ -7,7 +7,9 @@
7
7
  * found in the LICENSE file at https://angular.io/license
8
8
  */
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
+ const schematics_1 = require("@angular-devkit/schematics");
10
11
  const ts = require("typescript");
12
+ const workspace_1 = require("@nrwl/workspace");
11
13
  function* visit(directory) {
12
14
  for (const path of directory.subfiles) {
13
15
  if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
@@ -30,52 +32,55 @@ function* visit(directory) {
30
32
  }
31
33
  }
32
34
  function default_1() {
33
- return (tree) => {
34
- for (const sourceFile of visit(tree.root)) {
35
- let recorder;
36
- let printer;
37
- ts.forEachChild(sourceFile, function analyze(node) {
38
- if (!(ts.isExportDeclaration(node) &&
39
- node.moduleSpecifier &&
40
- ts.isStringLiteral(node.moduleSpecifier) &&
41
- node.moduleSpecifier.text === '@angular/platform-server' &&
42
- node.exportClause &&
43
- ts.isNamedExports(node.exportClause))) {
44
- // Not a @angular/platform-server named export.
45
- return;
46
- }
47
- const exportClause = node.exportClause;
48
- const newElements = [];
49
- for (const element of exportClause.elements) {
50
- if (element.name.text !== 'renderModule') {
51
- newElements.push(element);
35
+ return (0, schematics_1.chain)([
36
+ (tree) => {
37
+ for (const sourceFile of visit(tree.root)) {
38
+ let recorder;
39
+ let printer;
40
+ ts.forEachChild(sourceFile, function analyze(node) {
41
+ if (!(ts.isExportDeclaration(node) &&
42
+ node.moduleSpecifier &&
43
+ ts.isStringLiteral(node.moduleSpecifier) &&
44
+ node.moduleSpecifier.text === '@angular/platform-server' &&
45
+ node.exportClause &&
46
+ ts.isNamedExports(node.exportClause))) {
47
+ // Not a @angular/platform-server named export.
48
+ return;
52
49
  }
50
+ const exportClause = node.exportClause;
51
+ const newElements = [];
52
+ for (const element of exportClause.elements) {
53
+ if (element.name.text !== 'renderModule') {
54
+ newElements.push(element);
55
+ }
56
+ }
57
+ if (newElements.length === exportClause.elements.length) {
58
+ // No changes
59
+ return;
60
+ }
61
+ recorder !== null && recorder !== void 0 ? recorder : (recorder = tree.beginUpdate(sourceFile.fileName));
62
+ if (newElements.length) {
63
+ // Update named exports as there are leftovers.
64
+ const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
65
+ printer !== null && printer !== void 0 ? printer : (printer = ts.createPrinter());
66
+ const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, sourceFile);
67
+ const index = exportClause.getStart();
68
+ const length = exportClause.getWidth();
69
+ recorder.remove(index, length).insertLeft(index, fix);
70
+ }
71
+ else {
72
+ // Delete export as no exports remain.
73
+ recorder.remove(node.getStart(), node.getWidth());
74
+ }
75
+ ts.forEachChild(node, analyze);
76
+ });
77
+ if (recorder) {
78
+ tree.commitUpdate(recorder);
53
79
  }
54
- if (newElements.length === exportClause.elements.length) {
55
- // No changes
56
- return;
57
- }
58
- recorder !== null && recorder !== void 0 ? recorder : (recorder = tree.beginUpdate(sourceFile.fileName));
59
- if (newElements.length) {
60
- // Update named exports as there are leftovers.
61
- const newExportClause = ts.factory.updateNamedExports(exportClause, newElements);
62
- printer !== null && printer !== void 0 ? printer : (printer = ts.createPrinter());
63
- const fix = printer.printNode(ts.EmitHint.Unspecified, newExportClause, sourceFile);
64
- const index = exportClause.getStart();
65
- const length = exportClause.getWidth();
66
- recorder.remove(index, length).insertLeft(index, fix);
67
- }
68
- else {
69
- // Delete export as no exports remain.
70
- recorder.remove(node.getStart(), node.getWidth());
71
- }
72
- ts.forEachChild(node, analyze);
73
- });
74
- if (recorder) {
75
- tree.commitUpdate(recorder);
76
80
  }
77
- }
78
- };
81
+ },
82
+ (0, workspace_1.formatFiles)(),
83
+ ]);
79
84
  }
80
85
  exports.default = default_1;
81
86
  //# sourceMappingURL=remove-platform-server-exports.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"remove-platform-server-exports.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/remove-platform-server-exports.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remove-platform-server-exports.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/remove-platform-server-exports.ts"],"names":[],"mappings":"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"}
@@ -8,16 +8,21 @@
8
8
  */
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  const tslib_1 = require("tslib");
11
+ const schematics_1 = require("@angular-devkit/schematics");
11
12
  const ts = require("typescript");
12
13
  const utility_1 = require("@schematics/angular/utility");
13
14
  const workspace_models_1 = require("@schematics/angular/utility/workspace-models");
14
15
  const workspace_1 = require("@schematics/angular/utility/workspace");
16
+ const workspace_2 = require("@nrwl/workspace");
15
17
  function default_1() {
16
- return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
17
- for (const file of yield findTestMainFiles(host)) {
18
- updateTestFile(host, file);
19
- }
20
- });
18
+ return (0, schematics_1.chain)([
19
+ (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
20
+ for (const file of yield findTestMainFiles(host)) {
21
+ updateTestFile(host, file);
22
+ }
23
+ }),
24
+ (0, workspace_2.formatFiles)(),
25
+ ]);
21
26
  }
22
27
  exports.default = default_1;
23
28
  function findTestMainFiles(host) {
@@ -1 +1 @@
1
- {"version":3,"file":"update-karma-main-file.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-karma-main-file.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,iCAAiC;AACjC,yDAA4D;AAC5D,mFAAwE;AACxE,qEAAyE;AAEzE;IACE,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,KAAK,MAAM,IAAI,IAAI,MAAM,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAChD,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC5B;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAND,4BAMC;AAED,SAAe,iBAAiB,CAAC,IAAU;;QACzC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;QACpC,MAAM,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,IAAI,CAAC,CAAC;QAE5C,0BAA0B;QAC1B,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YACjD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBAC7C,IAAI,MAAM,CAAC,OAAO,KAAK,2BAAQ,CAAC,KAAK,EAAE;oBACrC,SAAS;iBACV;gBAED,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,IAAA,4BAAgB,EAAC,MAAM,CAAC,EAAE;oBAClD,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBACjE,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC7B;iBACF;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CAAA;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,IAAY;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;QACxC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAC9B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEvD,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;;QACnC,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAEjE,IACE,MAAA,EAAE;iBACC,YAAY,CAAC,IAAI,CAAC,0CACjB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EACxD;gBACA,0BAA0B;gBAC1B,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,SAAS,EAAE;oBACpD,OAAO;iBACR;aACF;iBAAM;gBACL,gEAAgE;gBAChE,IACE,CAAC,CAAA,MAAA,mBAAmB,CAAC,WAAW,0CAC5B,OAAO,GACR,UAAU,CAAC,iBAAiB,CAAC,CAAA,EAChC;oBACA,OAAO;iBACR;gBAED,6BAA6B;gBAC7B,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3D;YAED,eAAe;YACf,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3D;QAED,IACE,iBAAiB,CAAC,IAAI;YACtB,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,+BAA+B;YACjE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,+BAA+B;YACvE,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,qBAAqB;YAClF,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,iBAAiB;YAC/E,EAAE,CAAC,0BAA0B,CAC3B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CACjD,IAAI,eAAe;YACpB,EAAE,CAAC,YAAY,CACb,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAC5D,IAAI,UAAU;YACf,iBAAiB,CAAC,GAAG,CACnB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,CACtE,EACD;YACA,iCAAiC;YACjC,qCAAqC;YACrC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"update-karma-main-file.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-karma-main-file.ts"],"names":[],"mappings":"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"}
@@ -43,6 +43,7 @@ function updateTypescriptTarget(tree) {
43
43
  }
44
44
  }
45
45
  }
46
+ yield (0, devkit_1.formatFiles)(tree);
46
47
  });
47
48
  }
48
49
  exports.default = updateTypescriptTarget;
@@ -1 +1 @@
1
- {"version":3,"file":"update-typescript-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-typescript-target.ts"],"names":[],"mappings":";;;AACA,yCAAuD;AACvD,mFAAwE;AAExE,SAAS,YAAY,CAAC,IAAU,EAAE,YAAoB;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,iCACpC,IAAI,KACP,eAAe,kCACV,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AAED,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAClC,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxD,0DAA0D;gBAC1D,MAAM,SAAS,GAAG;oBAChB,MAAM,CAAC,OAAO,IAAI,EAAE;oBACpB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;iBAC9C;qBACE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,KAAK,QAAQ,CAAC;qBAClD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA4B,CAAC,QAAQ,CAAC,CAAC;gBAExD,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAEhD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;oBACjC,2BAAQ,CAAC,MAAM;oBACf,2BAAQ,CAAC,KAAK;oBACd,2BAAQ,CAAC,OAAO;oBAChB,2BAAQ,CAAC,SAAS;oBAClB,+BAA+B;oBAC/B,+BAA+B;oBAC/B,uBAAuB;oBACvB,8BAA8B;oBAC9B,iBAAiB;iBAClB,CAAC,CAAC;gBAEH,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC3C,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;wBACtC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBAC9B;iBACF;aACF;SACF;IACH,CAAC;CAAA;AArCD,yCAqCC"}
1
+ {"version":3,"file":"update-typescript-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-typescript-target.ts"],"names":[],"mappings":";;;AACA,yCAAoE;AACpE,mFAAwE;AAExE,SAAS,YAAY,CAAC,IAAU,EAAE,YAAoB;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,iCACpC,IAAI,KACP,eAAe,kCACV,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AAED,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAClC,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxD,0DAA0D;gBAC1D,MAAM,SAAS,GAAG;oBAChB,MAAM,CAAC,OAAO,IAAI,EAAE;oBACpB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;iBAC9C;qBACE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,KAAK,QAAQ,CAAC;qBAClD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAE,GAA4B,CAAC,QAAQ,CAAC,CAAC;gBAExD,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAEhD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC9B,SAAS;iBACV;gBAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;oBACjC,2BAAQ,CAAC,MAAM;oBACf,2BAAQ,CAAC,KAAK;oBACd,2BAAQ,CAAC,OAAO;oBAChB,2BAAQ,CAAC,SAAS;oBAClB,+BAA+B;oBAC/B,+BAA+B;oBAC/B,uBAAuB;oBACvB,8BAA8B;oBAC9B,iBAAiB;iBAClB,CAAC,CAAC;gBAEH,IAAI,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC3C,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;wBACtC,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;qBAC9B;iBACF;aACF;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvCD,yCAuCC"}
@@ -1,2 +1,2 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
- export default function updateWorkspaceConfigurations(tree: Tree): void;
2
+ export default function updateWorkspaceConfigurations(tree: Tree): Promise<void>;
@@ -1,24 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
3
4
  const devkit_1 = require("@nrwl/devkit");
4
5
  const workspace_models_1 = require("@schematics/angular/utility/workspace-models");
5
6
  function updateWorkspaceConfigurations(tree) {
6
- const projects = (0, devkit_1.getProjects)(tree);
7
- const supportedExecutors = new Set([workspace_models_1.Builders.Server]);
8
- for (const [name, project] of projects) {
9
- for (const [targetName, target] of Object.entries(project.targets)) {
10
- if (!supportedExecutors.has(target.executor)) {
11
- continue;
7
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
+ const projects = (0, devkit_1.getProjects)(tree);
9
+ const supportedExecutors = new Set([workspace_models_1.Builders.Server]);
10
+ for (const [name, project] of projects) {
11
+ for (const [targetName, target] of Object.entries(project.targets)) {
12
+ if (!supportedExecutors.has(target.executor)) {
13
+ continue;
14
+ }
15
+ target.options.bundleDependencies = undefined;
16
+ for (const [configurationName, configuration] of Object.entries(target.configurations)) {
17
+ configuration.bundleDependencies = undefined;
18
+ target[configurationName] = configuration;
19
+ }
20
+ project.targets[targetName] = target;
21
+ (0, devkit_1.updateProjectConfiguration)(tree, name, project);
12
22
  }
13
- target.options.bundleDependencies = undefined;
14
- for (const [configurationName, configuration] of Object.entries(target.configurations)) {
15
- configuration.bundleDependencies = undefined;
16
- target[configurationName] = configuration;
17
- }
18
- project.targets[targetName] = target;
19
- (0, devkit_1.updateProjectConfiguration)(tree, name, project);
20
23
  }
21
- }
24
+ yield (0, devkit_1.formatFiles)(tree);
25
+ });
22
26
  }
23
27
  exports.default = updateWorkspaceConfigurations;
24
28
  //# sourceMappingURL=update-workspace-config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-workspace-config.ts"],"names":[],"mappings":";;AACA,yCAAuE;AACvE,mFAAwE;AAExE,SAAwB,6BAA6B,CAAC,IAAU;IAC9D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,kBAAkB,GAAgB,IAAI,GAAG,CAAC,CAAC,2BAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACnE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACtC,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAClE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAC5C,SAAS;aACV;YAED,MAAM,CAAC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;YAE9C,KAAK,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAC7D,MAAM,CAAC,cAAc,CACtB,EAAE;gBACD,aAAa,CAAC,kBAAkB,GAAG,SAAS,CAAC;gBAC7C,MAAM,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;aAC3C;YAED,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;YACrC,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACjD;KACF;AACH,CAAC;AAvBD,gDAuBC"}
1
+ {"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-2-0/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,mFAAwE;AAExE,SAA8B,6BAA6B,CAAC,IAAU;;QACpE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,kBAAkB,GAAgB,IAAI,GAAG,CAAC,CAAC,2BAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YACtC,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAClE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;oBAC5C,SAAS;iBACV;gBAED,MAAM,CAAC,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;gBAE9C,KAAK,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAC7D,MAAM,CAAC,cAAc,CACtB,EAAE;oBACD,aAAa,CAAC,kBAAkB,GAAG,SAAS,CAAC;oBAC7C,MAAM,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;iBAC3C;gBAED,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;gBACrC,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;aACjD;SACF;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAzBD,gDAyBC"}