@nrwl/angular 13.10.2 → 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.
- package/README.md +1 -1
- package/executors.json +10 -0
- package/generators.d.ts +2 -4
- package/generators.js +2 -4
- package/generators.js.map +1 -1
- package/generators.json +16 -40
- package/migrations.json +6 -0
- package/module-federation/index.d.ts +1 -0
- package/module-federation/index.js +2 -0
- package/module-federation/index.js.map +1 -1
- package/ng-package.json +1 -0
- package/package.json +8 -6
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +6 -0
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +38 -0
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -0
- package/src/builders/module-federation-dev-server/schema.d.ts +20 -0
- package/src/builders/module-federation-dev-server/schema.json +108 -0
- package/src/generators/add-linting/schema.json +1 -0
- package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -7
- package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
- package/src/generators/application/lib/update-editor-tsconfig.js +14 -2
- package/src/generators/application/lib/update-editor-tsconfig.js.map +1 -1
- package/src/generators/application/schema.json +11 -5
- package/src/generators/component/schema.json +1 -1
- package/src/generators/component-cypress-spec/schema.json +1 -0
- package/src/generators/component-story/schema.json +1 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +4 -4
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
- package/src/generators/convert-to-with-mf/schema.json +1 -1
- package/src/generators/convert-tslint-to-eslint/schema.json +1 -1
- package/src/generators/downgrade-module/schema.json +1 -1
- package/src/generators/{mfe-host/mfe-host.compat.d.ts → host/host.compat.d.ts} +0 -0
- package/src/generators/host/host.compat.js +6 -0
- package/src/generators/host/host.compat.js.map +1 -0
- package/src/generators/host/host.d.ts +3 -0
- package/src/generators/host/host.js +34 -0
- package/src/generators/host/host.js.map +1 -0
- package/src/generators/{mfe-host → host}/schema.d.ts +0 -0
- package/src/generators/{mfe-host → host}/schema.json +5 -5
- package/src/generators/init/schema.json +1 -1
- package/src/generators/karma/karma.js +1 -0
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/library/library.js +2 -7
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +32 -10
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/schema.d.ts +0 -1
- package/src/generators/ng-add/schema.json +0 -7
- package/src/generators/ng-add/utilities/app.migrator.d.ts +2 -3
- package/src/generators/ng-add/utilities/app.migrator.js +92 -56
- package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/{e2e-project.migrator.d.ts → e2e.migrator.d.ts} +5 -1
- package/src/generators/ng-add/utilities/e2e.migrator.js +298 -0
- package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -0
- package/src/generators/ng-add/utilities/lib.migrator.d.ts +26 -0
- package/src/generators/ng-add/utilities/lib.migrator.js +351 -0
- package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -0
- package/src/generators/ng-add/utilities/logger.d.ts +8 -0
- package/src/generators/ng-add/utilities/logger.js +21 -0
- package/src/generators/ng-add/utilities/logger.js.map +1 -0
- package/src/generators/ng-add/utilities/normalize-options.js +5 -2
- package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
- package/src/generators/ng-add/utilities/project.migrator.d.ts +13 -2
- package/src/generators/ng-add/utilities/project.migrator.js +83 -3
- package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/types.d.ts +13 -1
- package/src/generators/ng-add/utilities/validate-projects.d.ts +2 -0
- package/src/generators/ng-add/utilities/validate-projects.js +46 -0
- package/src/generators/ng-add/utilities/validate-projects.js.map +1 -0
- package/src/generators/ng-add/utilities/validation-logging.d.ts +2 -0
- package/src/generators/ng-add/utilities/validation-logging.js +20 -0
- package/src/generators/ng-add/utilities/validation-logging.js.map +1 -0
- package/src/generators/ng-add/utilities/workspace.d.ts +5 -3
- package/src/generators/ng-add/utilities/workspace.js +105 -67
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/{mfe-remote/mfe-remote.compat.d.ts → remote/remote.compat.d.ts} +0 -0
- package/src/generators/remote/remote.compat.js +6 -0
- package/src/generators/remote/remote.compat.js.map +1 -0
- package/src/generators/remote/remote.d.ts +3 -0
- package/src/generators/remote/remote.js +76 -0
- package/src/generators/remote/remote.js.map +1 -0
- package/src/generators/{mfe-remote → remote}/schema.d.ts +0 -0
- package/src/generators/{mfe-remote → remote}/schema.json +5 -5
- package/src/generators/scam/schema.json +1 -1
- package/src/generators/scam-directive/schema.json +1 -1
- package/src/generators/scam-pipe/schema.json +1 -1
- package/src/generators/setup-mfe/files/webpack/{mfe.config.js__tmpl__ → module-federation.config.js__tmpl__} +0 -0
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +1 -1
- package/src/generators/setup-mfe/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
- package/src/generators/setup-mfe/lib/add-remote-to-host.js +10 -10
- package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mfe/lib/fix-bootstrap.js +3 -3
- package/src/generators/setup-mfe/lib/fix-bootstrap.js.map +1 -1
- package/src/generators/setup-mfe/lib/generate-config.js +1 -1
- package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
- package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js +3 -3
- package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map +1 -1
- package/src/generators/setup-mfe/lib/setup-serve-target.js +3 -23
- package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
- package/src/generators/stories/schema.json +1 -1
- package/src/generators/utils/dependencies.d.ts +2 -0
- package/src/generators/utils/dependencies.js +15 -0
- package/src/generators/utils/dependencies.js.map +1 -0
- package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js +2 -2
- package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js.map +1 -1
- package/src/migrations/update-14-0-0/rename-mf-config.d.ts +2 -0
- package/src/migrations/update-14-0-0/rename-mf-config.js +27 -0
- package/src/migrations/update-14-0-0/rename-mf-config.js.map +1 -0
- package/src/utils/{get-mfe-projects.d.ts → get-mf-projects.d.ts} +1 -1
- package/src/utils/{get-mfe-projects.js → get-mf-projects.js} +4 -4
- package/src/utils/get-mf-projects.js.map +1 -0
- package/src/utils/mfe/mfe-webpack.js +3 -3
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/mfe-host/mfe-host.compat.js +0 -6
- package/src/generators/mfe-host/mfe-host.compat.js.map +0 -1
- package/src/generators/mfe-host/mfe-host.d.ts +0 -3
- package/src/generators/mfe-host/mfe-host.js +0 -22
- package/src/generators/mfe-host/mfe-host.js.map +0 -1
- package/src/generators/mfe-remote/mfe-remote.compat.js +0 -6
- package/src/generators/mfe-remote/mfe-remote.compat.js.map +0 -1
- package/src/generators/mfe-remote/mfe-remote.d.ts +0 -3
- package/src/generators/mfe-remote/mfe-remote.js +0 -31
- package/src/generators/mfe-remote/mfe-remote.js.map +0 -1
- package/src/generators/ng-add/utilities/e2e-project.migrator.js +0 -186
- package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +0 -1
- package/src/generators/ng-add/utilities/e2e-utils.d.ts +0 -7
- package/src/generators/ng-add/utilities/e2e-utils.js +0 -46
- package/src/generators/ng-add/utilities/e2e-utils.js.map +0 -1
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.d.ts +0 -2
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.js +0 -6
- package/src/generators/storybook-migrate-defaults-5-to-6/compat.js.map +0 -1
- package/src/generators/storybook-migrate-defaults-5-to-6/schema.d.ts +0 -5
- package/src/generators/storybook-migrate-defaults-5-to-6/schema.json +0 -30
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts +0 -4
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js +0 -14
- package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/compat.d.ts +0 -2
- package/src/generators/storybook-migrate-stories-to-6-2/compat.js +0 -6
- package/src/generators/storybook-migrate-stories-to-6-2/compat.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.d.ts +0 -3
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js +0 -13
- package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js.map +0 -1
- package/src/generators/storybook-migrate-stories-to-6-2/schema.json +0 -11
- package/src/utils/get-mfe-projects.js.map +0 -1
|
@@ -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}/
|
|
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,
|
|
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
|
|
10
|
-
if (!tree.exists(
|
|
11
|
-
tree.write(
|
|
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,
|
|
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:
|
|
9
|
-
|
|
10
|
-
|
|
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,
|
|
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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxAngularStorybookStoriesGenerator",
|
|
4
4
|
"title": "Create Storybook stories/specs",
|
|
5
|
-
"description": "Creates Storybook stories/specs for all components declared in a project.",
|
|
5
|
+
"description": "Creates Storybook stories/specs for all Angular components declared in a project.",
|
|
6
6
|
"cli": "nx",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
@@ -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
|
|
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,
|
|
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,
|
|
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,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,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
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
|
|
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.
|
|
33
|
-
//# sourceMappingURL=get-
|
|
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,
|
|
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,
|
|
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,
|
|
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
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,qCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,qCAAwD;AACxD,yCAAgE;AAChE,+BAAgD;AAEhD,yEAGkD;AASlD,SAAgB,uBAAuB,CACrC,SAAmB,EACnB,YAAoE;;iCAApE,EAAA,qBAAe,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAI,IAAA,gCAAmB,GAAE;IAEpE,IAAI,CAAC,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,kEAAkE,YAAY,GAAG,CAClF,CAAC;KACH;IAED,MAAM,QAAQ,GAAsB,IAAA,yBAAY,EAAC,YAAY,CAAC,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,CAAC;IAEpD,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO;YACL,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE;YACpB,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;YACtB,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC;SACnD,CAAC;KACH;IAED,MAAM,YAAY,GAAqC,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;QAC9D,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CACf,YAAY,CAAC,MAAM,CACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,IAAG,EACpE,EAAE,CACH;QACH,YAAY,EAAE,CAAC,KAAe,EAAuC,EAAE,CACrE,YAAY,CAAC,MAAM,CACjB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,iCACnB,SAAS,KACZ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,IACjD,EACF,EAAE,CACH;QACH,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO;aACR;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,MAAM,EAAE,GAAG,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAErD,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC3D,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;iBAC5B;aACF;QACH,CAAC,CAAC;KACL,CAAC;AACJ,CAAC;AAhED,0DAgEC;AAED,SAAgB,aAAa,CAC3B,QAAkB;IAElB,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;KACH;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAE/D,OAAO,QAAQ,CAAC,MAAM,CACpB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,iCAChB,MAAM,KACT,CAAC,OAAO,CAAC,EAAE;YACT,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;SAC/C,IACD,EACF,EAAE,CACH,CAAC;AACJ,CAAC;AAvBD,sCAuBC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '
|
|
4
|
+
exports.nxVersion = '14.0.0-beta.1';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
4
|
-
const mfe_host_1 = require("./mfe-host");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxGenerator)(mfe_host_1.default);
|
|
6
|
-
//# sourceMappingURL=mfe-host.compat.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-host.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-host/mfe-host.compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,yCAAiC;AAEjC,kBAAe,IAAA,2BAAkB,EAAC,kBAAO,CAAC,CAAC"}
|
|
@@ -1,22 +0,0 @@
|
|
|
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 application_1 = require("../application/application");
|
|
6
|
-
function mfeHost(tree, options) {
|
|
7
|
-
var _a;
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const projects = (0, devkit_1.getProjects)(tree);
|
|
10
|
-
if (options.remotes && options.remotes.length > 0) {
|
|
11
|
-
options.remotes.forEach((remote) => {
|
|
12
|
-
if (!projects.has(remote)) {
|
|
13
|
-
throw new Error(`Could not find specified remote application (${remote})`);
|
|
14
|
-
}
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
const installTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { mfe: true, mfeType: 'host', routing: true, remotes: (_a = options.remotes) !== null && _a !== void 0 ? _a : [], port: 4200, federationType: options.dynamic ? 'dynamic' : 'static' }));
|
|
18
|
-
return installTask;
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
exports.default = mfeHost;
|
|
22
|
-
//# sourceMappingURL=mfe-host.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-host/mfe-host.ts"],"names":[],"mappings":";;;AAGA,yCAA2C;AAC3C,4DAA8D;AAE9D,SAA8B,OAAO,CAAC,IAAU,EAAE,OAAe;;;QAC/D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CACb,gDAAgD,MAAM,GAAG,CAC1D,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC9C,OAAO,KACV,GAAG,EAAE,IAAI,EACT,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,EAC9B,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,IACtD,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAxBD,0BAwBC"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
4
|
-
const mfe_remote_1 = require("./mfe-remote");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxGenerator)(mfe_remote_1.default);
|
|
6
|
-
//# sourceMappingURL=mfe-remote.compat.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-remote.compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-remote/mfe-remote.compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,6CAAqC;AAErC,kBAAe,IAAA,2BAAkB,EAAC,oBAAS,CAAC,CAAC"}
|
|
@@ -1,31 +0,0 @@
|
|
|
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 application_1 = require("../application/application");
|
|
6
|
-
const get_mfe_projects_1 = require("../../utils/get-mfe-projects");
|
|
7
|
-
function findNextAvailablePort(tree) {
|
|
8
|
-
var _a, _b, _c;
|
|
9
|
-
const mfeProjects = (0, get_mfe_projects_1.getMfeProjects)(tree);
|
|
10
|
-
const ports = new Set([4200]);
|
|
11
|
-
for (const mfeProject of mfeProjects) {
|
|
12
|
-
const { targets } = (0, devkit_1.readProjectConfiguration)(tree, mfeProject);
|
|
13
|
-
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;
|
|
14
|
-
ports.add(port);
|
|
15
|
-
}
|
|
16
|
-
const nextAvailablePort = Math.max(...ports) + 1;
|
|
17
|
-
return nextAvailablePort;
|
|
18
|
-
}
|
|
19
|
-
function mfeRemote(tree, options) {
|
|
20
|
-
var _a;
|
|
21
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const projects = (0, devkit_1.getProjects)(tree);
|
|
23
|
-
if (options.host && !projects.has(options.host)) {
|
|
24
|
-
throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
|
|
25
|
-
}
|
|
26
|
-
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) }));
|
|
27
|
-
return installTask;
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
exports.default = mfeRemote;
|
|
31
|
-
//# sourceMappingURL=mfe-remote.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;AAEA,yCAAqE;AACrE,4DAA8D;AAC9D,mEAA8D;AAE9D,SAAS,qBAAqB,CAAC,IAAU;;IACvC,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACtC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;QACnD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACjB;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAEjD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAA8B,SAAS,CAAC,IAAU,EAAE,OAAe;;;QACjE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC9C,OAAO,KACV,GAAG,EAAE,IAAI,EACT,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,IAAI,EACb,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,qBAAqB,CAAC,IAAI,CAAC,IACjD,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAlBD,4BAkBC"}
|
|
@@ -1,186 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.E2eProjectMigrator = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
|
-
const path_1 = require("path");
|
|
8
|
-
const e2e_utils_1 = require("./e2e-utils");
|
|
9
|
-
const project_migrator_1 = require("./project.migrator");
|
|
10
|
-
class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
|
|
11
|
-
constructor(tree, options, project) {
|
|
12
|
-
super(tree, options, project, 'apps');
|
|
13
|
-
this.appConfig = project.config;
|
|
14
|
-
this.appName = this.project.name;
|
|
15
|
-
this.initializeProject();
|
|
16
|
-
}
|
|
17
|
-
migrate() {
|
|
18
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
|
-
if (!this.project) {
|
|
20
|
-
console.warn('No e2e project was migrated because there was none declared in angular.json.');
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
|
|
24
|
-
this.migrateProtractorE2eProject();
|
|
25
|
-
}
|
|
26
|
-
else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
|
|
27
|
-
this.migrateCypressE2eProject();
|
|
28
|
-
}
|
|
29
|
-
const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
|
|
30
|
-
const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
|
|
31
|
-
(0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
|
|
32
|
-
json.extends = `${rootOffset}${(0, typescript_1.getRootTsConfigPathInTree)(this.tree)}`;
|
|
33
|
-
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
|
|
34
|
-
return json;
|
|
35
|
-
});
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
validate() {
|
|
39
|
-
// TODO: implement validation when multiple apps are supported
|
|
40
|
-
return null;
|
|
41
|
-
}
|
|
42
|
-
initializeProject() {
|
|
43
|
-
var _a;
|
|
44
|
-
if (!((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
|
|
45
|
-
this.project = null;
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
|
-
const name = this.project.name.endsWith('-e2e')
|
|
49
|
-
? this.project.name
|
|
50
|
-
: `${this.project.name}-e2e`;
|
|
51
|
-
const newRoot = (0, devkit_1.joinPathFragments)('apps', name);
|
|
52
|
-
if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
|
|
53
|
-
this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'), newRoot });
|
|
54
|
-
}
|
|
55
|
-
else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
|
|
56
|
-
this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot });
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
migrateProtractorE2eProject() {
|
|
60
|
-
this.moveDir(this.project.oldRoot, this.project.newRoot);
|
|
61
|
-
this.projectConfig = {
|
|
62
|
-
root: this.project.newRoot,
|
|
63
|
-
projectType: 'application',
|
|
64
|
-
targets: {
|
|
65
|
-
e2e: Object.assign(Object.assign({}, this.projectConfig.targets.e2e), { options: Object.assign(Object.assign({}, this.projectConfig.targets.e2e.options), { protractorConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'protractor.conf.js') }) }),
|
|
66
|
-
lint: {
|
|
67
|
-
executor: '@angular-devkit/build-angular:tslint',
|
|
68
|
-
options: Object.assign(Object.assign({}, this.projectConfig.targets.lint), { tsConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json') }),
|
|
69
|
-
},
|
|
70
|
-
},
|
|
71
|
-
implicitDependencies: [this.appName],
|
|
72
|
-
tags: [],
|
|
73
|
-
};
|
|
74
|
-
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
|
|
75
|
-
// remove e2e target from the app config
|
|
76
|
-
delete this.appConfig.targets.e2e;
|
|
77
|
-
(0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
|
|
78
|
-
}
|
|
79
|
-
migrateCypressE2eProject() {
|
|
80
|
-
const oldCypressConfigFilePath = (0, e2e_utils_1.getCypressConfigFile)(this.projectConfig);
|
|
81
|
-
const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
|
|
82
|
-
this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'tsconfig.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'));
|
|
83
|
-
this.moveDir(this.project.oldRoot, (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'));
|
|
84
|
-
this.updateCypressProjectConfiguration(cypressConfigFilePath);
|
|
85
|
-
}
|
|
86
|
-
updateOrCreateCypressConfigFile(configFile) {
|
|
87
|
-
let cypressConfigFilePath;
|
|
88
|
-
if (configFile) {
|
|
89
|
-
cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
|
|
90
|
-
this.updateCypressConfigFilePaths(configFile);
|
|
91
|
-
this.moveFile(configFile, cypressConfigFilePath);
|
|
92
|
-
}
|
|
93
|
-
else {
|
|
94
|
-
cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json');
|
|
95
|
-
this.tree.write(cypressConfigFilePath, JSON.stringify({
|
|
96
|
-
fileServerFolder: '.',
|
|
97
|
-
fixturesFolder: './src/fixtures',
|
|
98
|
-
integrationFolder: './src/integration',
|
|
99
|
-
modifyObstructiveCode: false,
|
|
100
|
-
supportFile: './src/support/index.ts',
|
|
101
|
-
pluginsFile: './src/plugins/index.ts',
|
|
102
|
-
video: true,
|
|
103
|
-
videosFolder: `../../dist/cypress/${this.project.newRoot}/videos`,
|
|
104
|
-
screenshotsFolder: `../../dist/cypress/${this.project.newRoot}/screenshots`,
|
|
105
|
-
chromeWebSecurity: false,
|
|
106
|
-
}));
|
|
107
|
-
}
|
|
108
|
-
return cypressConfigFilePath;
|
|
109
|
-
}
|
|
110
|
-
updateCypressProjectConfiguration(cypressConfigPath) {
|
|
111
|
-
this.projectConfig = {
|
|
112
|
-
root: this.project.newRoot,
|
|
113
|
-
sourceRoot: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'),
|
|
114
|
-
projectType: 'application',
|
|
115
|
-
targets: {
|
|
116
|
-
e2e: this.updateE2eCypressTarget(this.projectConfig.targets.e2e, cypressConfigPath),
|
|
117
|
-
},
|
|
118
|
-
implicitDependencies: [this.appName],
|
|
119
|
-
tags: [],
|
|
120
|
-
};
|
|
121
|
-
if (this.appConfig.targets['cypress-run']) {
|
|
122
|
-
this.projectConfig.targets['cypress-run'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-run'], cypressConfigPath);
|
|
123
|
-
}
|
|
124
|
-
if (this.appConfig.targets['cypress-open']) {
|
|
125
|
-
this.projectConfig.targets['cypress-open'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-open'], cypressConfigPath);
|
|
126
|
-
}
|
|
127
|
-
(0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
|
|
128
|
-
delete this.appConfig.targets['cypress-run'];
|
|
129
|
-
delete this.appConfig.targets['cypress-open'];
|
|
130
|
-
delete this.appConfig.targets.e2e;
|
|
131
|
-
(0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
|
|
132
|
-
}
|
|
133
|
-
updateE2eCypressTarget(target, cypressConfig) {
|
|
134
|
-
const updatedTarget = Object.assign(Object.assign({}, target), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, target.options), { cypressConfig }) });
|
|
135
|
-
delete updatedTarget.options.configFile;
|
|
136
|
-
delete updatedTarget.options.tsConfig;
|
|
137
|
-
if (updatedTarget.options.headless && updatedTarget.options.watch) {
|
|
138
|
-
updatedTarget.options.headed = false;
|
|
139
|
-
}
|
|
140
|
-
else if (updatedTarget.options.headless === false &&
|
|
141
|
-
!updatedTarget.options.watch) {
|
|
142
|
-
updatedTarget.options.headed = true;
|
|
143
|
-
}
|
|
144
|
-
delete updatedTarget.options.headless;
|
|
145
|
-
return updatedTarget;
|
|
146
|
-
}
|
|
147
|
-
updateCypressConfigFilePaths(configFilePath) {
|
|
148
|
-
const srcFoldersAndFiles = [
|
|
149
|
-
'integrationFolder',
|
|
150
|
-
'supportFile',
|
|
151
|
-
'pluginsFile',
|
|
152
|
-
'fixturesFolder',
|
|
153
|
-
];
|
|
154
|
-
const distFolders = ['videosFolder', 'screenshotsFolder'];
|
|
155
|
-
const stringOrArrayGlobs = ['ignoreTestFiles', 'testFiles'];
|
|
156
|
-
const cypressConfig = (0, devkit_1.readJson)(this.tree, configFilePath);
|
|
157
|
-
cypressConfig.fileServerFolder = '.';
|
|
158
|
-
srcFoldersAndFiles.forEach((folderOrFile) => {
|
|
159
|
-
if (cypressConfig[folderOrFile]) {
|
|
160
|
-
cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folderOrFile])}`;
|
|
161
|
-
}
|
|
162
|
-
});
|
|
163
|
-
distFolders.forEach((folder) => {
|
|
164
|
-
if (cypressConfig[folder]) {
|
|
165
|
-
cypressConfig[folder] = `../../dist/cypress/${this.project.newRoot}/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folder])}`;
|
|
166
|
-
}
|
|
167
|
-
});
|
|
168
|
-
stringOrArrayGlobs.forEach((stringOrArrayGlob) => {
|
|
169
|
-
if (!cypressConfig[stringOrArrayGlob]) {
|
|
170
|
-
return;
|
|
171
|
-
}
|
|
172
|
-
if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
|
|
173
|
-
cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.replaceCypressGlobConfig(glob));
|
|
174
|
-
}
|
|
175
|
-
else {
|
|
176
|
-
cypressConfig[stringOrArrayGlob] = this.replaceCypressGlobConfig(cypressConfig[stringOrArrayGlob]);
|
|
177
|
-
}
|
|
178
|
-
});
|
|
179
|
-
(0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
|
|
180
|
-
}
|
|
181
|
-
replaceCypressGlobConfig(globPattern) {
|
|
182
|
-
return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${this.project.oldRoot}\\/`), './src/');
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
exports.E2eProjectMigrator = E2eProjectMigrator;
|
|
186
|
-
//# sourceMappingURL=e2e-project.migrator.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"e2e-project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-project.migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { ProjectConfiguration } from '@nrwl/devkit';
|
|
2
|
-
import { MigrationProjectConfiguration, WorkspaceProjects } from './types';
|
|
3
|
-
export declare function getE2eKey(projects: WorkspaceProjects): string | null;
|
|
4
|
-
export declare function getE2eProject(projects: WorkspaceProjects): MigrationProjectConfiguration | null;
|
|
5
|
-
export declare function getCypressConfigFile(e2eProject: ProjectConfiguration): string | undefined;
|
|
6
|
-
export declare function isCypressE2eProject(e2eProject: ProjectConfiguration): boolean;
|
|
7
|
-
export declare function isProtractorE2eProject(e2eProject: ProjectConfiguration): boolean;
|