@nrwl/angular 14.0.5 → 14.1.0-beta.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.
Files changed (27) hide show
  1. package/package.json +7 -7
  2. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +40 -2
  3. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
  4. package/src/executors/file-server/file-server.impl.js +0 -3
  5. package/src/executors/file-server/file-server.impl.js.map +1 -1
  6. package/src/generators/application/lib/update-config-files.js +3 -0
  7. package/src/generators/application/lib/update-config-files.js.map +1 -1
  8. package/src/generators/library/lib/update-project.js +3 -0
  9. package/src/generators/library/lib/update-project.js.map +1 -1
  10. package/src/generators/ng-add/migrate-from-angular-cli.js +0 -4
  11. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  12. package/src/generators/ng-add/utilities/app.migrator.d.ts +16 -2
  13. package/src/generators/ng-add/utilities/app.migrator.js +278 -83
  14. package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
  15. package/src/generators/ng-add/utilities/e2e.migrator.d.ts +6 -2
  16. package/src/generators/ng-add/utilities/e2e.migrator.js +112 -70
  17. package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -1
  18. package/src/generators/ng-add/utilities/lib.migrator.d.ts +3 -5
  19. package/src/generators/ng-add/utilities/lib.migrator.js +26 -108
  20. package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -1
  21. package/src/generators/ng-add/utilities/project.migrator.d.ts +9 -5
  22. package/src/generators/ng-add/utilities/project.migrator.js +120 -11
  23. package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
  24. package/src/generators/ng-add/utilities/types.d.ts +4 -0
  25. package/src/utils/mfe/with-module-federation.js +6 -1
  26. package/src/utils/mfe/with-module-federation.js.map +1 -1
  27. package/src/utils/versions.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "14.0.5",
3
+ "version": "14.1.0-beta.1",
4
4
  "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.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -65,12 +65,12 @@
65
65
  },
66
66
  "dependencies": {
67
67
  "@angular-devkit/schematics": "~13.3.0",
68
- "@nrwl/cypress": "14.0.5",
69
- "@nrwl/devkit": "14.0.5",
70
- "@nrwl/jest": "14.0.5",
71
- "@nrwl/linter": "14.0.5",
72
- "@nrwl/storybook": "14.0.5",
73
- "@nrwl/workspace": "14.0.5",
68
+ "@nrwl/cypress": "14.1.0-beta.1",
69
+ "@nrwl/devkit": "14.1.0-beta.1",
70
+ "@nrwl/jest": "14.1.0-beta.1",
71
+ "@nrwl/linter": "14.1.0-beta.1",
72
+ "@nrwl/storybook": "14.1.0-beta.1",
73
+ "@nrwl/workspace": "14.1.0-beta.1",
74
74
  "@schematics/angular": "~13.3.0",
75
75
  "@phenomnomnominal/tsquery": "4.1.1",
76
76
  "chalk": "4.1.0",
@@ -7,7 +7,38 @@ const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
7
7
  const architect_1 = require("@angular-devkit/architect");
8
8
  const path_1 = require("path");
9
9
  const webpack_server_impl_1 = require("../webpack-server/webpack-server.impl");
10
+ const child_process_1 = require("child_process");
11
+ /**
12
+ * Inline kill-port to prevent adding a new dependency
13
+ */
14
+ function killPort(port, method = 'tcp') {
15
+ port = Number.parseInt(port);
16
+ if (!port) {
17
+ throw new Error('Invalid argument provided for port');
18
+ }
19
+ if (process.platform === 'win32') {
20
+ return (0, child_process_1.exec)('netstat -nao', (error, stdout, stderr) => {
21
+ if (!stdout)
22
+ return;
23
+ const lines = stdout.split('\n');
24
+ // The second white-space delimited column of netstat output is the local port,
25
+ // which is the only port we care about.
26
+ // The regex here will match only the local port column of the output
27
+ const lineWithLocalPortRegEx = new RegExp(`^ *${method.toUpperCase()} *[^ ]*:${port}`, 'gm');
28
+ const linesWithLocalPort = lines.filter((line) => line.match(lineWithLocalPortRegEx));
29
+ const pids = linesWithLocalPort.reduce((acc, line) => {
30
+ const match = line.match(/(\d*)\w*(\n|$)/gm);
31
+ return match && match[0] && !acc.includes(match[0])
32
+ ? acc.concat(match[0])
33
+ : acc;
34
+ }, []);
35
+ return (0, child_process_1.execSync)(`TaskKill /F /PID ${pids.join(' /PID ')}`);
36
+ });
37
+ }
38
+ return (0, child_process_1.execSync)(`lsof -ni ${method === 'udp' ? 'udp' : 'tcp'}:${port} | grep ${method === 'udp' ? 'UDP' : 'LISTEN'} | awk '{print $2}' | xargs kill -9`);
39
+ }
10
40
  function moduleFederationDevServer(schema, context) {
41
+ var _a, _b, _c;
11
42
  const workspaces = new devkit_1.Workspaces(context.workspaceRoot);
12
43
  const workspaceConfig = workspaces.readWorkspaceConfiguration();
13
44
  const p = workspaceConfig.projects[context.target.project];
@@ -16,7 +47,7 @@ function moduleFederationDevServer(schema, context) {
16
47
  try {
17
48
  mfeConfig = require(mfConfigPath);
18
49
  }
19
- catch (_a) {
50
+ catch (_d) {
20
51
  throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
21
52
  }
22
53
  const options = tslib_1.__rest(schema, []);
@@ -27,16 +58,23 @@ function moduleFederationDevServer(schema, context) {
27
58
  : Array.isArray(options.devRemotes)
28
59
  ? options.devRemotes
29
60
  : [options.devRemotes];
61
+ const remotePorts = [];
30
62
  for (const remote of remotes) {
31
63
  const isDev = devServeRemotes.includes(remote);
64
+ const target = isDev ? 'serve' : 'serve-static';
65
+ remotePorts.push((_c = (_b = (_a = workspaceConfig.projects[remote]) === null || _a === void 0 ? void 0 : _a.targets[target]) === null || _b === void 0 ? void 0 : _b.options.port) !== null && _c !== void 0 ? _c : 4200);
32
66
  (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
33
67
  project: remote,
34
- target: isDev ? 'serve' : 'serve-static',
68
+ target,
35
69
  configuration: context.target.configuration,
36
70
  runOptions: {},
37
71
  executor: context.builder.builderName,
38
72
  }, options.verbose);
39
73
  }
74
+ // Cleanup ports on kill
75
+ process.on('kill', () => {
76
+ remotePorts.forEach((port) => killPort(port));
77
+ });
40
78
  return (0, webpack_server_impl_1.webpackServer)(options, context);
41
79
  }
42
80
  exports.moduleFederationDevServer = moduleFederationDevServer;
@@ -1 +1 @@
1
- {"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,yCAA0C;AAC1C,gEAA8D;AAC9D,yDAA0E;AAE1E,+BAA4B;AAC5B,+EAAsE;AAEtE,SAAgB,yBAAyB,CACvC,MAAc,EACd,OAAuB;IAEvB,MAAM,UAAU,GAAG,IAAI,mBAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,UAAU,CAAC,0BAA0B,EAAE,CAAC;IAEhE,MAAM,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,IAAA,WAAI,EACvB,OAAO,CAAC,aAAa,EACrB,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;IAEF,IAAI,SAAgC,CAAC;IACrC,IAAI;QACF,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KACnC;IAAC,WAAM;QACN,MAAM,IAAI,KAAK,CACb,kBAAkB,YAAY,yDAAyD,CACxF,CAAC;KACH;IAED,MAAW,OAAO,kBAAK,MAAM,EAAvB,EAAc,CAAS,CAAC;IAC9B,MAAM,eAAe,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1E,MAAM,eAAe,GAAG,CAAC,OAAO,CAAC,UAAU;QACzC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;YACnC,CAAC,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAA,8BAAc,EACZ,OAAO,CAAC,aAAa,EACrB;YACE,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;YACxC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa;YAC3C,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;SACtC,EACD,OAAO,CAAC,OAAO,CAChB,CAAC;KACH;IAED,OAAO,IAAA,mCAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAlDD,8DAkDC;AAED,kBAAe,IAAA,yBAAa,EAAsB,yBAAyB,CAAC,CAAC"}
1
+ {"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
@@ -107,9 +107,6 @@ function fileServerExecutor(options, context) {
107
107
  const args = getBuildTargetCommand(options);
108
108
  (0, child_process_1.execFileSync)(pmCmd, args, {
109
109
  stdio: [0, 1, 2],
110
- // NX_CLOUD: true is only used when Nx Cloud is on.
111
- // It forces remote caching.
112
- env: Object.assign(Object.assign({}, process.env), { NX_CLOUD: 'true' }),
113
110
  });
114
111
  }
115
112
  catch (_a) { }
@@ -1 +1 @@
1
- {"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,9 @@ function updateAppAndE2EProjectConfigurations(host, options) {
20
20
  let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
21
21
  if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
22
22
  project = (0, cli_config_utils_1.replaceAppNameWithPath)(project, options.ngCliSchematicAppRoot, options.appProjectRoot);
23
+ // project already has the right root, but the above function, makes it incorrect.
24
+ // This corrects it.
25
+ project.root = options.appProjectRoot;
23
26
  }
24
27
  delete project.targets.test;
25
28
  // Ensure the outputs property comes after the executor for
@@ -1 +1 @@
1
- {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
@@ -94,6 +94,9 @@ function fixProjectWorkspaceConfig(host, options) {
94
94
  project.tags = options.parsedTags;
95
95
  if (options.ngCliSchematicLibRoot !== options.projectRoot) {
96
96
  project = (0, cli_config_utils_1.replaceAppNameWithPath)(project, options.ngCliSchematicLibRoot, options.projectRoot);
97
+ // project already has the right root, but the above function, makes it incorrect.
98
+ // This corrects it.
99
+ project.root = options.projectRoot;
97
100
  }
98
101
  if (!options.publishable && !options.buildable) {
99
102
  delete project.targets.build;
@@ -1 +1 @@
1
- {"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
@@ -24,10 +24,6 @@ function migrateFromAngularCli(tree, rawOptions) {
24
24
  (0, workspace_1.decorateAngularCli)(tree);
25
25
  }
26
26
  else {
27
- // TODO(leo): remove when support for multiple apps is added
28
- if (projects.apps.length > 2) {
29
- throw new Error('Can not convert workspaces with more than 1 application.');
30
- }
31
27
  const migrators = [
32
28
  ...projects.apps.map((app) => new app_migrator_1.AppMigrator(tree, options, app)),
33
29
  ...projects.libs.map((lib) => new lib_migrator_1.LibMigrator(tree, options, lib)),
@@ -1 +1 @@
1
- {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,2DAAuD;AACvD,qEAAiE;AAEjE,qEAAiE;AACjE,qDAY+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,4DAA4D;YAC5D,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;aACH;YAED,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,wBAAwB;YACxB,IAAA,oCAAgB,EAAC,SAAS,CAAC,CAAC;YAE5B,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAC3C,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AAvFD,sDAuFC"}
1
+ {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,2DAAuD;AACvD,qEAAiE;AAEjE,qEAAiE;AACjE,qDAY+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,wBAAwB;YACxB,IAAA,oCAAgB,EAAC,SAAS,CAAC,CAAC;YAE5B,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAC3C,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AAhFD,sDAgFC"}
@@ -1,10 +1,14 @@
1
1
  import { Tree } from '@nrwl/devkit';
2
2
  import { GeneratorOptions } from '../schema';
3
+ import { Logger } from './logger';
3
4
  import { ProjectMigrator } from './project.migrator';
4
5
  import { MigrationProjectConfiguration, ValidationResult } from './types';
5
- export declare class AppMigrator extends ProjectMigrator {
6
+ declare type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'lint' | 'prerender' | 'serve' | 'server' | 'serveSsr' | 'test';
7
+ export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
6
8
  private e2eMigrator;
7
- constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration);
9
+ private newEsLintConfigPath;
10
+ private oldEsLintConfigPath;
11
+ constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
8
12
  migrate(): Promise<void>;
9
13
  validate(): ValidationResult;
10
14
  private moveProjectFiles;
@@ -14,4 +18,14 @@ export declare class AppMigrator extends ProjectMigrator {
14
18
  private convertBuildOptions;
15
19
  private convertServerOptions;
16
20
  private moveFilePathsFromTargetToProjectRoot;
21
+ private updateBuildTargetConfiguration;
22
+ private updateLintTargetConfiguration;
23
+ private updatePrerenderTargetConfiguration;
24
+ private updateServerTargetConfiguration;
25
+ private updateServeSsrTargetConfiguration;
26
+ private updateTestTargetConfiguration;
27
+ private updateTsConfigFileUsedByBuildTarget;
28
+ private updateTsConfigFileUsedByServerTarget;
29
+ private updateTsConfigFileUsedByTestTarget;
17
30
  }
31
+ export {};