@nrwl/angular 14.0.0-beta.0 → 14.0.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 (108) hide show
  1. package/executors.json +10 -0
  2. package/generators.d.ts +2 -2
  3. package/generators.js +2 -2
  4. package/generators.js.map +1 -1
  5. package/generators.json +16 -20
  6. package/migrations.json +6 -0
  7. package/ng-package.json +1 -0
  8. package/package.json +8 -6
  9. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +6 -0
  10. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +38 -0
  11. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -0
  12. package/src/builders/module-federation-dev-server/schema.d.ts +20 -0
  13. package/src/builders/module-federation-dev-server/schema.json +108 -0
  14. package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -7
  15. package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
  16. package/src/generators/application/lib/update-editor-tsconfig.js +14 -2
  17. package/src/generators/application/lib/update-editor-tsconfig.js.map +1 -1
  18. package/src/generators/application/schema.json +5 -5
  19. package/src/generators/convert-to-with-mf/convert-to-with-mf.js +4 -4
  20. package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -1
  21. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
  22. package/src/generators/{mfe-host/mfe-host.compat.d.ts → host/host.compat.d.ts} +0 -0
  23. package/src/generators/host/host.compat.js +6 -0
  24. package/src/generators/host/host.compat.js.map +1 -0
  25. package/src/generators/host/host.d.ts +3 -0
  26. package/src/generators/host/host.js +34 -0
  27. package/src/generators/host/host.js.map +1 -0
  28. package/src/generators/{mfe-host → host}/schema.d.ts +0 -0
  29. package/src/generators/{mfe-host → host}/schema.json +5 -5
  30. package/src/generators/karma/karma.js +1 -0
  31. package/src/generators/karma/karma.js.map +1 -1
  32. package/src/generators/library/library.js +2 -7
  33. package/src/generators/library/library.js.map +1 -1
  34. package/src/generators/ng-add/migrate-from-angular-cli.js +9 -6
  35. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  36. package/src/generators/ng-add/schema.d.ts +0 -1
  37. package/src/generators/ng-add/schema.json +0 -7
  38. package/src/generators/ng-add/utilities/app.migrator.d.ts +1 -3
  39. package/src/generators/ng-add/utilities/app.migrator.js +27 -58
  40. package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
  41. package/src/generators/ng-add/utilities/{e2e-project.migrator.d.ts → e2e.migrator.d.ts} +0 -0
  42. package/src/generators/ng-add/utilities/{e2e-project.migrator.js → e2e.migrator.js} +32 -11
  43. package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -0
  44. package/src/generators/ng-add/utilities/lib.migrator.d.ts +26 -0
  45. package/src/generators/ng-add/utilities/lib.migrator.js +351 -0
  46. package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -0
  47. package/src/generators/ng-add/utilities/normalize-options.js +5 -2
  48. package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
  49. package/src/generators/ng-add/utilities/project.migrator.d.ts +11 -2
  50. package/src/generators/ng-add/utilities/project.migrator.js +82 -4
  51. package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
  52. package/src/generators/ng-add/utilities/types.d.ts +9 -1
  53. package/src/generators/ng-add/utilities/validate-projects.d.ts +2 -0
  54. package/src/generators/ng-add/utilities/validate-projects.js +46 -0
  55. package/src/generators/ng-add/utilities/validate-projects.js.map +1 -0
  56. package/src/generators/ng-add/utilities/validation-logging.d.ts +2 -0
  57. package/src/generators/ng-add/utilities/validation-logging.js +20 -0
  58. package/src/generators/ng-add/utilities/validation-logging.js.map +1 -0
  59. package/src/generators/ng-add/utilities/workspace.d.ts +1 -1
  60. package/src/generators/ng-add/utilities/workspace.js +13 -17
  61. package/src/generators/ng-add/utilities/workspace.js.map +1 -1
  62. package/src/generators/{mfe-remote/mfe-remote.compat.d.ts → remote/remote.compat.d.ts} +0 -0
  63. package/src/generators/remote/remote.compat.js +6 -0
  64. package/src/generators/remote/remote.compat.js.map +1 -0
  65. package/src/generators/remote/remote.d.ts +3 -0
  66. package/src/generators/remote/remote.js +76 -0
  67. package/src/generators/remote/remote.js.map +1 -0
  68. package/src/generators/{mfe-remote → remote}/schema.d.ts +0 -0
  69. package/src/generators/{mfe-remote → remote}/schema.json +5 -5
  70. package/src/generators/setup-mfe/files/webpack/{mfe.config.js__tmpl__ → module-federation.config.js__tmpl__} +0 -0
  71. package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +1 -1
  72. package/src/generators/setup-mfe/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
  73. package/src/generators/setup-mfe/lib/add-remote-to-host.js +10 -10
  74. package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
  75. package/src/generators/setup-mfe/lib/fix-bootstrap.js +3 -3
  76. package/src/generators/setup-mfe/lib/fix-bootstrap.js.map +1 -1
  77. package/src/generators/setup-mfe/lib/generate-config.js +1 -1
  78. package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
  79. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js +3 -3
  80. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map +1 -1
  81. package/src/generators/setup-mfe/lib/setup-serve-target.js +3 -23
  82. package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
  83. package/src/generators/utils/dependencies.d.ts +2 -0
  84. package/src/generators/utils/dependencies.js +15 -0
  85. package/src/generators/utils/dependencies.js.map +1 -0
  86. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js +2 -2
  87. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js.map +1 -1
  88. package/src/migrations/update-14-0-0/rename-mf-config.d.ts +2 -0
  89. package/src/migrations/update-14-0-0/rename-mf-config.js +27 -0
  90. package/src/migrations/update-14-0-0/rename-mf-config.js.map +1 -0
  91. package/src/utils/{get-mfe-projects.d.ts → get-mf-projects.d.ts} +1 -1
  92. package/src/utils/{get-mfe-projects.js → get-mf-projects.js} +4 -4
  93. package/src/utils/get-mf-projects.js.map +1 -0
  94. package/src/utils/mfe/mfe-webpack.js +3 -3
  95. package/src/utils/mfe/mfe-webpack.js.map +1 -1
  96. package/src/utils/versions.js +1 -1
  97. package/src/generators/mfe-host/mfe-host.compat.js +0 -6
  98. package/src/generators/mfe-host/mfe-host.compat.js.map +0 -1
  99. package/src/generators/mfe-host/mfe-host.d.ts +0 -3
  100. package/src/generators/mfe-host/mfe-host.js +0 -22
  101. package/src/generators/mfe-host/mfe-host.js.map +0 -1
  102. package/src/generators/mfe-remote/mfe-remote.compat.js +0 -6
  103. package/src/generators/mfe-remote/mfe-remote.compat.js.map +0 -1
  104. package/src/generators/mfe-remote/mfe-remote.d.ts +0 -3
  105. package/src/generators/mfe-remote/mfe-remote.js +0 -31
  106. package/src/generators/mfe-remote/mfe-remote.js.map +0 -1
  107. package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +0 -1
  108. package/src/utils/get-mfe-projects.js.map +0 -1
@@ -0,0 +1,2 @@
1
+ export declare const workspaceMigrationErrorHeading = "The workspace cannot be migrated because of the following issues:";
2
+ export declare function arrayToString(array: string[]): string;
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.arrayToString = exports.workspaceMigrationErrorHeading = void 0;
4
+ exports.workspaceMigrationErrorHeading = 'The workspace cannot be migrated because of the following issues:';
5
+ function arrayToString(array) {
6
+ if (array.length === 0) {
7
+ return '';
8
+ }
9
+ if (array.length === 1) {
10
+ return quote(array[0]);
11
+ }
12
+ const last = array[array.length - 1];
13
+ const rest = array.slice(0, array.length - 1);
14
+ return `${rest.map(quote).join(', ')} and ${quote(last)}`;
15
+ }
16
+ exports.arrayToString = arrayToString;
17
+ function quote(str) {
18
+ return `"${str}"`;
19
+ }
20
+ //# sourceMappingURL=validation-logging.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"validation-logging.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/validation-logging.ts"],"names":[],"mappings":";;;AAAa,QAAA,8BAA8B,GACzC,mEAAmE,CAAC;AAEtE,SAAgB,aAAa,CAAC,KAAe;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAC5D,CAAC;AAZD,sCAYC;AAED,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,IAAI,GAAG,GAAG,CAAC;AACpB,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { Tree } from '@nrwl/devkit';
2
2
  import { GeneratorOptions } from '../schema';
3
3
  import { WorkspaceCapabilities, WorkspaceProjects } from './types';
4
- export declare function validateWorkspace(tree: Tree, projects: WorkspaceProjects): void;
4
+ export declare function validateWorkspace(tree: Tree): void;
5
5
  export declare function createNxJson(tree: Tree, options: GeneratorOptions, setWorkspaceLayoutAsNewProjectRoot?: boolean): void;
6
6
  export declare function decorateAngularCli(tree: Tree): void;
7
7
  export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
@@ -12,25 +12,21 @@ const versions_1 = require("@nrwl/workspace/src/utils/versions");
12
12
  const fs_1 = require("fs");
13
13
  const path_1 = require("path");
14
14
  const versions_2 = require("../../../utils/versions");
15
- function validateWorkspace(tree, projects) {
16
- try {
17
- if (!tree.exists('package.json')) {
18
- throw new Error('Cannot find package.json');
19
- }
20
- if (!tree.exists('angular.json')) {
21
- throw new Error('Cannot find angular.json');
22
- }
23
- // TODO: this restrictions will be removed when support for multiple
24
- // projects is added
25
- if (projects.apps.length > 2 || projects.libs.length > 0) {
26
- throw new Error('Can only convert projects with one app');
27
- }
15
+ const validation_logging_1 = require("./validation-logging");
16
+ function validateWorkspace(tree) {
17
+ const errors = [];
18
+ if (!tree.exists('package.json')) {
19
+ errors.push('The "package.json" file could not be found.');
28
20
  }
29
- catch (e) {
30
- console.error(e.message);
31
- console.error('Your workspace could not be converted into an Nx Workspace because of the above error.');
32
- throw e;
21
+ if (!tree.exists('angular.json')) {
22
+ errors.push('The "angular.json" file could not be found.');
23
+ }
24
+ if (!errors.length) {
25
+ return;
33
26
  }
27
+ throw new Error(`${validation_logging_1.workspaceMigrationErrorHeading}
28
+
29
+ - ${errors.join('\n ')}`);
34
30
  }
35
31
  exports.validateWorkspace = validateWorkspace;
36
32
  function createNxJson(tree, options, setWorkspaceLayoutAsNewProjectRoot = false) {
@@ -1 +1 @@
1
- {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const devkit_1 = require("@nrwl/devkit");
4
+ const remote_1 = require("./remote");
5
+ exports.default = (0, devkit_1.convertNxGenerator)(remote_1.default);
6
+ //# sourceMappingURL=remote.compat.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remote.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,qCAA8B;AAE9B,kBAAe,IAAA,2BAAkB,EAAC,gBAAM,CAAC,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import type { Schema } from './schema';
3
+ export default function remote(tree: Tree, options: Schema): Promise<() => void>;
@@ -0,0 +1,76 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const devkit_2 = require("@nrwl/devkit");
6
+ const application_1 = require("../application/application");
7
+ const get_mf_projects_1 = require("../../utils/get-mf-projects");
8
+ function findNextAvailablePort(tree) {
9
+ var _a, _b, _c;
10
+ const mfeProjects = (0, get_mf_projects_1.getMFProjects)(tree);
11
+ const ports = new Set([4200]);
12
+ for (const mfeProject of mfeProjects) {
13
+ const { targets } = (0, devkit_2.readProjectConfiguration)(tree, mfeProject);
14
+ const port = (_c = (_b = (_a = targets === null || targets === void 0 ? void 0 : targets.serve) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200;
15
+ ports.add(port);
16
+ }
17
+ const nextAvailablePort = Math.max(...ports) + 1;
18
+ return nextAvailablePort;
19
+ }
20
+ function remote(tree, options) {
21
+ var _a;
22
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
+ const projects = (0, devkit_2.getProjects)(tree);
24
+ if (options.host && !projects.has(options.host)) {
25
+ throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
26
+ }
27
+ const installTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { mfe: true, mfeType: 'remote', routing: true, host: options.host, port: (_a = options.port) !== null && _a !== void 0 ? _a : findNextAvailablePort(tree) }));
28
+ removeDeadCode(tree, options);
29
+ return installTask;
30
+ });
31
+ }
32
+ exports.default = remote;
33
+ function removeDeadCode(tree, options) {
34
+ const project = (0, devkit_2.readProjectConfiguration)(tree, options.name);
35
+ ['css', 'less', 'scss', 'sass'].forEach((style) => {
36
+ const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
37
+ if (tree.exists(pathToComponentStyle)) {
38
+ tree.delete(pathToComponentStyle);
39
+ }
40
+ });
41
+ tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/nx-welcome.component.ts'));
42
+ tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.spec.ts'));
43
+ tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.html'));
44
+ const pathToComponent = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.ts');
45
+ const component = tree.read(pathToComponent, 'utf-8').split('templateUrl')[0] +
46
+ `template: '<router-outlet></router-outlet>'
47
+ })
48
+ export class AppComponent {}`;
49
+ tree.write(pathToComponent, component);
50
+ tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts'), `/*
51
+ * This RemoteEntryModule is imported here to allow TS to find the Module during
52
+ * compilation, allowing it to be included in the built bundle. This is required
53
+ * for the Module Federation Plugin to expose the Module correctly.
54
+ * */
55
+ import { RemoteEntryModule } from './remote-entry/entry.module';
56
+ import { NgModule } from '@angular/core';
57
+ import { BrowserModule } from '@angular/platform-browser';
58
+
59
+ import { AppComponent } from './app.component';
60
+ import { RouterModule } from '@angular/router';
61
+
62
+ @NgModule({
63
+ declarations: [AppComponent],
64
+ imports: [
65
+ BrowserModule,
66
+ RouterModule.forRoot([{
67
+ path: '',
68
+ loadChildren: () => import('./remote-entry/entry.module').then(m => m.RemoteEntryModule)
69
+ }], { initialNavigation: 'enabledBlocking' }),
70
+ ],
71
+ providers: [],
72
+ bootstrap: [AppComponent],
73
+ })
74
+ export class AppModule {}`);
75
+ }
76
+ //# sourceMappingURL=remote.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "$schema": "http://json-schema.org/schema",
3
- "$id": "NxMFERemote",
3
+ "$id": "NxMFRemote",
4
4
  "cli": "nx",
5
- "title": "Nx MFE Remote App",
6
- "description": "Create an Angular Remote Micro Frontend Application.",
5
+ "title": "Nx Module Federation Remote App",
6
+ "description": "Create an Angular Remote Module Federation Application.",
7
7
  "type": "object",
8
8
  "examples": [
9
9
  {
10
- "command": "nx g @nrwl/angular:mfe-remote appName --host=host --port=4201",
11
- "description": "Create an Angular app with configuration in place for MFE. If host is provided, attach this remote app to host app's configuration."
10
+ "command": "nx g @nrwl/angular:remote appName --host=host --port=4201",
11
+ "description": "Create an Angular app with configuration in place for Module Federation. If host is provided, attach this remote app to host app's configuration."
12
12
  }
13
13
  ],
14
14
  "properties": {
@@ -1,3 +1,3 @@
1
1
  const { withModuleFederation } = require('@nrwl/angular/module-federation');
2
- const config = require('./mfe.config');
2
+ const config = require('./module-federation.config');
3
3
  module.exports = withModuleFederation(config);
@@ -1,5 +1,5 @@
1
1
  const { withModuleFederation } = require('@nrwl/angular/module-federation');
2
- const config = require('./mfe.config');
2
+ const config = require('./module-federation.config');
3
3
  module.exports = withModuleFederation({
4
4
  ...config,
5
5
  /*
@@ -19,13 +19,13 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
19
19
  function addRemoteToHost(tree, options) {
20
20
  if (options.mfeType === 'remote' && options.host) {
21
21
  const hostProject = (0, devkit_2.readProjectConfiguration)(tree, options.host);
22
- const pathToMfeManifest = (0, devkit_2.joinPathFragments)(hostProject.sourceRoot, 'assets/mfe.manifest.json');
23
- const hostFederationType = determineHostFederationType(tree, pathToMfeManifest);
22
+ const pathToMFManifest = (0, devkit_2.joinPathFragments)(hostProject.sourceRoot, 'assets/module-federation.manifest.json');
23
+ const hostFederationType = determineHostFederationType(tree, pathToMFManifest);
24
24
  if (hostFederationType === 'static') {
25
25
  addRemoteToStaticHost(tree, options, hostProject);
26
26
  }
27
27
  else if (hostFederationType === 'dynamic') {
28
- addRemoteToDynamicHost(tree, options, pathToMfeManifest);
28
+ addRemoteToDynamicHost(tree, options, pathToMFManifest);
29
29
  }
30
30
  const declarationFilePath = (0, devkit_2.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
31
31
  const declarationFileContent = (tree.exists(declarationFilePath)
@@ -40,17 +40,17 @@ function determineHostFederationType(tree, pathToMfeManifest) {
40
40
  return tree.exists(pathToMfeManifest) ? 'dynamic' : 'static';
41
41
  }
42
42
  function addRemoteToStaticHost(tree, options, hostProject) {
43
- const hostMfeConfigPath = (0, devkit_2.joinPathFragments)(hostProject.root, 'mfe.config.js');
44
- if (!hostMfeConfigPath || !tree.exists(hostMfeConfigPath)) {
45
- throw new Error(`The selected host application, ${options.host}, does not contain a mfe.config.js or mfe.manifest.json file. Are you sure it has been set up as a host application?`);
43
+ const hostMFConfigPath = (0, devkit_2.joinPathFragments)(hostProject.root, 'module-federation.config.js');
44
+ if (!hostMFConfigPath || !tree.exists(hostMFConfigPath)) {
45
+ throw new Error(`The selected host application, ${options.host}, does not contain a module-federation.config.js or module-federation.manifest.json file. Are you sure it has been set up as a host application?`);
46
46
  }
47
- const hostMFEConfig = tree.read(hostMfeConfigPath, 'utf-8');
48
- const webpackAst = tsquery_1.tsquery.ast(hostMFEConfig);
47
+ const hostMFConfig = tree.read(hostMFConfigPath, 'utf-8');
48
+ const webpackAst = tsquery_1.tsquery.ast(hostMFConfig);
49
49
  const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
50
50
  const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
51
51
  const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
52
- const updatedConfig = `${hostMFEConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFEConfig.slice(endOfPropertiesPos)}`;
53
- tree.write(hostMfeConfigPath, updatedConfig);
52
+ const updatedConfig = `${hostMFConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFConfig.slice(endOfPropertiesPos)}`;
53
+ tree.write(hostMFConfigPath, updatedConfig);
54
54
  }
55
55
  function addRemoteToDynamicHost(tree, options, pathToMfeManifest) {
56
56
  (0, devkit_1.updateJson)(tree, pathToMfeManifest, (manifest) => {
@@ -1 +1 @@
1
- {"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
@@ -7,14 +7,14 @@ function fixBootstrap(tree, appRoot, options) {
7
7
  const bootstrapCode = tree.read(mainFilePath, 'utf-8');
8
8
  tree.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
9
9
  const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err))`;
10
- const fetchMfeManifestCode = `import { setRemoteDefinitions } from '@nrwl/angular/mfe';
10
+ const fetchMFManifestCode = `import { setRemoteDefinitions } from '@nrwl/angular/mfe';
11
11
 
12
- fetch('/assets/mfe.manifest.json')
12
+ fetch('/assets/module-federation.manifest.json')
13
13
  .then((res) => res.json())
14
14
  .then(definitions => setRemoteDefinitions(definitions))
15
15
  .then(() => ${bootstrapImportCode})`;
16
16
  tree.write(mainFilePath, options.mfeType === 'host' && options.federationType === 'dynamic'
17
- ? fetchMfeManifestCode
17
+ ? fetchMFManifestCode
18
18
  : bootstrapImportCode);
19
19
  }
20
20
  exports.fixBootstrap = fixBootstrap;
@@ -1 +1 @@
1
- {"version":3,"file":"fix-bootstrap.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/fix-bootstrap.ts"],"names":[],"mappings":";;;AAGA,yCAAiD;AAEjD,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;IACvE,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,aAAa,CAAC,CAAC;IAE1E,MAAM,mBAAmB,GAAG,wDAAwD,CAAC;IAErF,MAAM,oBAAoB,GAAG;;;;;gBAKf,mBAAmB,GAAG,CAAC;IAErC,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;QAChE,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,mBAAmB,CACxB,CAAC;AACJ,CAAC;AApBD,oCAoBC"}
1
+ {"version":3,"file":"fix-bootstrap.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/fix-bootstrap.ts"],"names":[],"mappings":";;;AAGA,yCAAiD;AAEjD,SAAgB,YAAY,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;IACvE,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,aAAa,CAAC,CAAC;IAE1E,MAAM,mBAAmB,GAAG,wDAAwD,CAAC;IAErF,MAAM,mBAAmB,GAAG;;;;;gBAKd,mBAAmB,GAAG,CAAC;IAErC,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS;QAChE,CAAC,CAAC,mBAAmB;QACrB,CAAC,CAAC,mBAAmB,CACxB,CAAC;AACJ,CAAC;AApBD,oCAoBC"}
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateWebpackConfig = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  function generateWebpackConfig(host, options, appRoot, remotesWithPorts) {
6
- if (host.exists(`${appRoot}/mfe.config.js`) ||
6
+ if (host.exists(`${appRoot}/module-federation.config.js`) ||
7
7
  host.exists(`${appRoot}/webpack.config.js`) ||
8
8
  host.exists(`${appRoot}/webpack.prod.config.js`)) {
9
9
  devkit_1.logger.warn(`NOTE: We encountered an existing webpack config for the app ${options.appName}. We have overwritten this file with the Module Federation Config.\n
@@ -1 +1 @@
1
- {"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,yCAAwE;AAGxE,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,gBAAwD;IAExD,IACE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,gBAAgB,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oBAAoB,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,yBAAyB,CAAC,EAChD;QACA,eAAM,CAAC,IAAI,CACT,+DAA+D,OAAO,CAAC,OAAO;qKACiF,CAChK,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,EACP;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,OAAO,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE;QAC/B,WAAW,EAAE,OAAO;KACrB,CACF,CAAC;AACJ,CAAC;AA7BD,sDA6BC"}
1
+ {"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,yCAAwE;AAGxE,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,gBAAwD;IAExD,IACE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,8BAA8B,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oBAAoB,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,yBAAyB,CAAC,EAChD;QACA,eAAM,CAAC,IAAI,CACT,+DAA+D,OAAO,CAAC,OAAO;qKACiF,CAChK,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,kBAAkB,CAAC,EAChD,OAAO,EACP;QACE,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,IAAI,EAAE,OAAO,CAAC,OAAO;QACrB,OAAO,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,EAAE;QAC/B,WAAW,EAAE,OAAO;KACrB,CACF,CAAC;AACJ,CAAC;AA7BD,sDA6BC"}
@@ -6,9 +6,9 @@ function setupHostIfDynamic(tree, options) {
6
6
  if (options.federationType === 'static' || options.mfeType === 'remote') {
7
7
  return;
8
8
  }
9
- const pathToMfeManifest = (0, devkit_1.joinPathFragments)((0, devkit_1.readProjectConfiguration)(tree, options.appName).sourceRoot, 'assets/mfe.manifest.json');
10
- if (!tree.exists(pathToMfeManifest)) {
11
- tree.write(pathToMfeManifest, '{}');
9
+ const pathToMFManifest = (0, devkit_1.joinPathFragments)((0, devkit_1.readProjectConfiguration)(tree, options.appName).sourceRoot, 'assets/module-federation.manifest.json');
10
+ if (!tree.exists(pathToMFManifest)) {
11
+ tree.write(pathToMFManifest, '{}');
12
12
  }
13
13
  }
14
14
  exports.setupHostIfDynamic = setupHostIfDynamic;
@@ -1 +1 @@
1
- {"version":3,"file":"setup-host-if-dynamic.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-host-if-dynamic.ts"],"names":[],"mappings":";;;AAGA,yCAA2E;AAE3E,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAAe;IAC5D,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;QACvE,OAAO;KACR;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAC1D,0BAA0B,CAC3B,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QACnC,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;KACrC;AACH,CAAC;AAbD,gDAaC"}
1
+ {"version":3,"file":"setup-host-if-dynamic.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-host-if-dynamic.ts"],"names":[],"mappings":";;;AAGA,yCAA2E;AAE3E,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAAe;IAC5D,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE;QACvE,OAAO;KACR;IAED,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAC1D,wCAAwC,CACzC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QAClC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;KACpC;AACH,CAAC;AAbD,gDAaC"}
@@ -5,30 +5,10 @@ const devkit_1 = require("@nrwl/devkit");
5
5
  function setupServeTarget(host, options) {
6
6
  var _a, _b;
7
7
  const appConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
8
- appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: '@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}` }) });
9
- if (options.mfeType === 'host') {
10
- const remoteServeCommands = options.remotes
11
- ? options.remotes.map((r) => `nx serve ${r}`)
12
- : undefined;
13
- const commands = remoteServeCommands
14
- ? [...remoteServeCommands, `nx serve ${options.appName}`]
15
- : [`nx serve ${options.appName}`];
16
- appConfig.targets['serve-mfe'] = {
17
- executor: '@nrwl/workspace:run-commands',
18
- options: {
19
- commands,
20
- },
21
- };
22
- }
8
+ appConfig.targets['serve'] = Object.assign(Object.assign({}, appConfig.targets['serve']), { executor: options.mfeType === 'host'
9
+ ? '@nrwl/angular:module-federation-dev-server'
10
+ : '@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}` }) });
23
11
  (0, devkit_1.updateProjectConfiguration)(host, options.appName, appConfig);
24
- if (options.mfeType === 'remote' && options.host) {
25
- const hostAppConfig = (0, devkit_1.readProjectConfiguration)(host, options.host);
26
- hostAppConfig.targets['serve-mfe'] = Object.assign(Object.assign({}, hostAppConfig.targets['serve-mfe']), { options: Object.assign(Object.assign({}, hostAppConfig.targets['serve-mfe'].options), { commands: [
27
- `nx serve ${options.appName}`,
28
- ...hostAppConfig.targets['serve-mfe'].options.commands,
29
- ] }) });
30
- (0, devkit_1.updateProjectConfiguration)(host, options.host, hostAppConfig);
31
- }
32
12
  }
33
13
  exports.setupServeTarget = setupServeTarget;
34
14
  //# sourceMappingURL=setup-serve-target.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,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,EAAE,8BAA8B,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,OAAO,KAAK,MAAM,EAAE;QAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO;YACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,QAAQ,GAAG,mBAAmB;YAClC,CAAC,CAAC,CAAC,GAAG,mBAAmB,EAAE,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;YAC/B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE;gBACP,QAAQ;aACT;SACF,CAAC;KACH;IACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,mCAC7B,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KACrC,OAAO,kCACF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,KAC7C,QAAQ,EAAE;oBACR,YAAY,OAAO,CAAC,OAAO,EAAE;oBAC7B,GAAG,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ;iBACvD,MAEJ,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC/D;AACH,CAAC;AA9CD,4CA8CC"}
1
+ {"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AAGA,yCAGsB;AAEtB,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,OAAO,KAAK,MAAM;YACxB,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,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAjBD,4CAiBC"}
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export declare function addBuildableLibrariesPostCssDependencies(tree: Tree): void;
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.addBuildableLibrariesPostCssDependencies = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const versions_1 = require("../../utils/versions");
6
+ function addBuildableLibrariesPostCssDependencies(tree) {
7
+ (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
8
+ postcss: versions_1.postcssVersion,
9
+ 'postcss-import': '^14.0.2',
10
+ 'postcss-preset-env': '^6.7.0',
11
+ 'postcss-url': '^10.1.1',
12
+ });
13
+ }
14
+ exports.addBuildableLibrariesPostCssDependencies = addBuildableLibrariesPostCssDependencies;
15
+ //# sourceMappingURL=dependencies.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,mDAAsD;AAEtD,SAAgB,wCAAwC,CAAC,IAAU;IACjE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;QACE,OAAO,EAAE,yBAAc;QACvB,gBAAgB,EAAE,SAAS;QAC3B,oBAAoB,EAAE,QAAQ;QAC9B,aAAa,EAAE,SAAS;KACzB,CACF,CAAC;AACJ,CAAC;AAXD,4FAWC"}
@@ -2,10 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  const devkit_1 = require("@nrwl/devkit");
5
- const get_mfe_projects_1 = require("../../utils/get-mfe-projects");
5
+ const get_mf_projects_1 = require("../../utils/get-mf-projects");
6
6
  function default_1(tree) {
7
7
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
- const projects = (0, get_mfe_projects_1.getMfeProjects)(tree);
8
+ const projects = (0, get_mf_projects_1.getMFProjects)(tree);
9
9
  for (const project of projects) {
10
10
  const e2eProjectName = `${project}-e2e`;
11
11
  let e2eProject;
@@ -1 +1 @@
1
- {"version":3,"file":"add-cypress-mfe-workaround.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-8-1/add-cypress-mfe-workaround.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,mEAA8D;AAE9D,mBAA+B,IAAU;;QACvC,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QAEtC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,cAAc,GAAG,GAAG,OAAO,MAAM,CAAC;YACxC,IAAI,UAAgC,CAAC;YACrC,IAAI;gBACF,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;aAC7D;YAAC,WAAM;gBACN,SAAS;aACV;YAED,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,uBAAuB,EAAE;gBAC/D,kCAAkC;gBAClC,OAAO;aACR;YAED,MAAM,YAAY,GAAG;;;;;UAKf,CAAC;YAEP,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,UAAU,CAAC,UAAU,EACrB,kBAAkB,CACnB,CAAC;YAEF,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBACrD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;gBACxC,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,eAAe,KAAK,YAAY,EAAE,CAAC,CAAC;SACvE;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApCD,4BAoCC"}
1
+ {"version":3,"file":"add-cypress-mfe-workaround.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-8-1/add-cypress-mfe-workaround.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,iEAA4D;AAE5D,mBAA+B,IAAU;;QACvC,MAAM,QAAQ,GAAG,IAAA,+BAAa,EAAC,IAAI,CAAC,CAAC;QAErC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,cAAc,GAAG,GAAG,OAAO,MAAM,CAAC;YACxC,IAAI,UAAgC,CAAC;YACrC,IAAI;gBACF,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;aAC7D;YAAC,WAAM;gBACN,SAAS;aACV;YAED,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,uBAAuB,EAAE;gBAC/D,kCAAkC;gBAClC,OAAO;aACR;YAED,MAAM,YAAY,GAAG;;;;;UAKf,CAAC;YAEP,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,UAAU,CAAC,UAAU,EACrB,kBAAkB,CACnB,CAAC;YAEF,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBACrD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;gBACxC,CAAC,CAAC,EAAE,CAAC;YACP,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,eAAe,KAAK,YAAY,EAAE,CAAC,CAAC;SACvE;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AApCD,4BAoCC"}
@@ -0,0 +1,2 @@
1
+ import type { Tree } from '@nrwl/devkit';
2
+ export default function renameMfeConfigToModuleFederation(tree: Tree): void;
@@ -0,0 +1,27 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const devkit_1 = require("@nrwl/devkit");
4
+ const get_mf_projects_1 = require("../../utils/get-mf-projects");
5
+ function renameMfeConfigToModuleFederation(tree) {
6
+ const mfProjects = (0, get_mf_projects_1.getMFProjects)(tree);
7
+ for (const project of mfProjects) {
8
+ const { root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
9
+ const pathToOldConfig = (0, devkit_1.joinPathFragments)(root, 'mfe.config.js');
10
+ const pathToOldManifest = (0, devkit_1.joinPathFragments)(sourceRoot, 'assets/', 'mfe.manifest.json');
11
+ const pathToMain = (0, devkit_1.joinPathFragments)(sourceRoot, 'main.ts');
12
+ if (tree.exists(pathToOldConfig)) {
13
+ tree.rename(pathToOldConfig, (0, devkit_1.joinPathFragments)(root, 'module-federation.config.js'));
14
+ }
15
+ if (tree.exists(pathToOldManifest)) {
16
+ tree.rename(pathToOldManifest, (0, devkit_1.joinPathFragments)(sourceRoot, 'assets/', 'module-federation.config.json'));
17
+ }
18
+ if (tree.exists(pathToMain) &&
19
+ tree.read(pathToMain, 'utf-8').includes('mfe.manifest.json')) {
20
+ tree.write(pathToMain, tree
21
+ .read(pathToMain, 'utf-8')
22
+ .replace('mfe.manifest', 'module-federation.manifest'));
23
+ }
24
+ }
25
+ }
26
+ exports.default = renameMfeConfigToModuleFederation;
27
+ //# sourceMappingURL=rename-mf-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rename-mf-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-0-0/rename-mf-config.ts"],"names":[],"mappings":";;AACA,yCAA2E;AAC3E,iEAA4D;AAE5D,SAAwB,iCAAiC,CAAC,IAAU;IAClE,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,CAAC,CAAC;IAEvC,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE;QAChC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,UAAU,EACV,SAAS,EACT,mBAAmB,CACpB,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC5D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YAChC,IAAI,CAAC,MAAM,CACT,eAAe,EACf,IAAA,0BAAiB,EAAC,IAAI,EAAE,6BAA6B,CAAC,CACvD,CAAC;SACH;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YAClC,IAAI,CAAC,MAAM,CACT,iBAAiB,EACjB,IAAA,0BAAiB,EACf,UAAU,EACV,SAAS,EACT,+BAA+B,CAChC,CACF,CAAC;SACH;QAED,IACE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAC5D;YACA,IAAI,CAAC,KAAK,CACR,UAAU,EACV,IAAI;iBACD,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;iBACzB,OAAO,CAAC,cAAc,EAAE,4BAA4B,CAAC,CACzD,CAAC;SACH;KACF;AACH,CAAC;AA1CD,oDA0CC"}
@@ -1,4 +1,4 @@
1
1
  import type { Tree } from '@nrwl/devkit';
2
- export declare function getMfeProjects(tree: Tree, { legacy }?: {
2
+ export declare function getMFProjects(tree: Tree, { legacy }?: {
3
3
  legacy: boolean;
4
4
  }): string[];
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getMfeProjects = void 0;
3
+ exports.getMFProjects = void 0;
4
4
  const tsquery_1 = require("@phenomnomnominal/tsquery");
5
5
  const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
6
- function getMfeProjects(tree, { legacy } = { legacy: false }) {
6
+ function getMFProjects(tree, { legacy } = { legacy: false }) {
7
7
  const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
8
8
  const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
9
9
  const MODULE_FEDERATION_IDENTIFIER = legacy
@@ -29,5 +29,5 @@ function getMfeProjects(tree, { legacy } = { legacy: false }) {
29
29
  });
30
30
  return projects;
31
31
  }
32
- exports.getMfeProjects = getMfeProjects;
33
- //# sourceMappingURL=get-mfe-projects.js.map
32
+ exports.getMFProjects = getMFProjects;
33
+ //# sourceMappingURL=get-mf-projects.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iGAA8F;AAE9F,SAAgB,aAAa,CAC3B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,4BAA4B,GAAG,+BAA+B,CAAC;IACrE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,IAAA,iBAAO,EAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAxCD,sCAwCC"}
@@ -24,7 +24,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
24
24
  const pathMappings = [];
25
25
  for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
26
26
  if (libraries && libraries.includes(key)) {
27
- const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, paths[0]));
27
+ const pathToLib = (0, path_1.normalize)((0, path_1.join)(devkit_1.workspaceRoot, paths[0]));
28
28
  pathMappings.push({
29
29
  name: key,
30
30
  path: pathToLib,
@@ -39,9 +39,9 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
39
39
  return;
40
40
  }
41
41
  const from = req.context;
42
- const to = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(req.context, req.request));
42
+ const to = (0, path_1.normalize)((0, path_1.join)(req.context, req.request));
43
43
  for (const library of pathMappings) {
44
- const libFolder = (0, devkit_1.normalizePath)((0, path_1.dirname)(library.path));
44
+ const libFolder = (0, path_1.normalize)((0, path_1.dirname)(library.path));
45
45
  if (!from.startsWith(libFolder) && to.startsWith(libFolder)) {
46
46
  req.request = library.name;
47
47
  }