@nrwl/angular 13.10.0-beta.1 → 13.10.0-beta.4
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/esm2020/mfe/index.mjs +2 -0
- package/esm2020/mfe/mfe.mjs +45 -0
- package/esm2020/mfe/nrwl-angular-mfe.mjs +5 -0
- package/executors.json +4 -4
- package/fesm2015/nrwl-angular-mfe.mjs +57 -0
- package/fesm2015/nrwl-angular-mfe.mjs.map +1 -0
- package/fesm2020/nrwl-angular-mfe.mjs +51 -0
- package/fesm2020/nrwl-angular-mfe.mjs.map +1 -0
- package/generators.json +10 -0
- package/mfe/index.d.ts +1 -0
- package/mfe/index.js +7 -0
- package/mfe/index.js.map +1 -0
- package/mfe/mfe.d.ts +4 -0
- package/mfe/mfe.js +56 -0
- package/mfe/mfe.js.map +1 -0
- package/mfe/ng-package.json +6 -0
- package/mfe/nrwl-angular-mfe.d.ts +5 -0
- package/mfe/package.json +10 -0
- package/module-federation/index.d.ts +1 -0
- package/module-federation/index.js +6 -0
- package/module-federation/index.js.map +1 -0
- package/package.json +15 -7
- package/scripts/nx-cli-warning.js +1 -1
- package/src/builders/webpack-browser/schema.json +3 -2
- package/src/builders/webpack-browser/webpack-browser.impl.js +3 -3
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-server/schema.json +3 -2
- package/src/builders/webpack-server/webpack-server.impl.js +1 -2
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/delegate-build/delegate-build.impl.js +2 -2
- package/src/executors/delegate-build/delegate-build.impl.js.map +1 -1
- package/src/executors/package/package.impl.js +4 -4
- package/src/executors/package/package.impl.js.map +1 -1
- package/src/executors/utilities/tailwindcss.js +3 -3
- package/src/executors/utilities/tailwindcss.js.map +1 -1
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.d.ts +2 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.js +6 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.compat.js.map +1 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.d.ts +3 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js +32 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.d.ts +5 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.js +449 -0
- package/src/generators/convert-to-with-mf/convert-to-with-mf.test-data.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +24 -0
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +49 -0
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js +20 -0
- package/src/generators/convert-to-with-mf/lib/get-webpack-config-path.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/index.d.ts +6 -0
- package/src/generators/convert-to-with-mf/lib/index.js +10 -0
- package/src/generators/convert-to-with-mf/lib/index.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts +5 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +63 -0
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.d.ts +2 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +13 -0
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.d.ts +3 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +48 -0
- package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js.map +1 -0
- package/src/generators/convert-to-with-mf/schema.d.ts +3 -0
- package/src/generators/convert-to-with-mf/schema.json +20 -0
- package/src/generators/mfe-host/schema.json +1 -1
- package/src/generators/mfe-remote/mfe-remote.js +14 -1
- package/src/generators/mfe-remote/mfe-remote.js.map +1 -1
- package/src/generators/mfe-remote/schema.json +1 -1
- package/src/generators/move/lib/update-ng-package.js +2 -2
- package/src/generators/move/lib/update-ng-package.js.map +1 -1
- package/src/generators/ng-add/files/decorate-angular-cli/decorate-angular-cli.js__tmpl__ +1 -1
- package/src/generators/ng-add/files/root/nx.json__tmpl__ +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +2 -8
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +8 -59
- package/src/generators/setup-mfe/lib/add-remote-to-host.d.ts +1 -0
- package/src/generators/setup-mfe/lib/add-remote-to-host.js +15 -6
- package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mfe/lib/generate-config.js +1 -12
- package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
- package/src/generators/setup-mfe/setup-mfe.d.ts +2 -2
- package/src/generators/setup-mfe/setup-mfe.js +0 -9
- package/src/generators/setup-mfe/setup-mfe.js.map +1 -1
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js +2 -2
- package/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.js.map +1 -1
- package/src/utils/get-mfe-projects.d.ts +3 -1
- package/src/utils/get-mfe-projects.js +5 -2
- package/src/utils/get-mfe-projects.js.map +1 -1
- package/src/utils/mfe/mfe-webpack.js +2 -3
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/mfe/with-module-federation.js +6 -9
- package/src/utils/mfe/with-module-federation.js.map +1 -1
- package/src/utils/versions.d.ts +0 -1
- package/src/utils/versions.js +2 -3
- package/src/utils/versions.js.map +1 -1
|
@@ -1,59 +1,8 @@
|
|
|
1
|
-
const
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
* shared libraries.
|
|
10
|
-
* A remapping will occur when a library is buildable, as webpack needs to know the location of the
|
|
11
|
-
* built files for the buildable library.
|
|
12
|
-
* This NX_TSCONFIG_PATH environment variable is set by the @nrwl/angular:webpack-browser and it contains
|
|
13
|
-
* the location of the generated temporary tsconfig file.
|
|
14
|
-
*/
|
|
15
|
-
const tsConfigPath = process.env.NX_TSCONFIG_PATH ?? path.join(__dirname, '<%= rootTsConfigPath %>');
|
|
16
|
-
|
|
17
|
-
const workspaceRootPath = path.join(__dirname, '<%= offsetFromRoot %>');
|
|
18
|
-
const sharedMappings = new mf.SharedMappings();
|
|
19
|
-
sharedMappings.register(tsConfigPath, [
|
|
20
|
-
/* mapped paths to share */
|
|
21
|
-
], workspaceRootPath);
|
|
22
|
-
|
|
23
|
-
module.exports = {
|
|
24
|
-
output: {
|
|
25
|
-
uniqueName: "<%= name %>",
|
|
26
|
-
publicPath: "auto",
|
|
27
|
-
},
|
|
28
|
-
optimization: {
|
|
29
|
-
runtimeChunk: false,
|
|
30
|
-
},
|
|
31
|
-
experiments: {
|
|
32
|
-
outputModule: true
|
|
33
|
-
},
|
|
34
|
-
resolve: {
|
|
35
|
-
alias: {
|
|
36
|
-
...sharedMappings.getAliases(),
|
|
37
|
-
},
|
|
38
|
-
},
|
|
39
|
-
plugins: [
|
|
40
|
-
new ModuleFederationPlugin({<% if(type === 'remote') { %>
|
|
41
|
-
name: "<%= name %>",
|
|
42
|
-
filename: "remoteEntry.js",
|
|
43
|
-
exposes: {
|
|
44
|
-
'./Module': '<%= sourceRoot %>/src/app/remote-entry/entry.module.ts',
|
|
45
|
-
},<% } %><% if(type === 'host') { %>
|
|
46
|
-
remotes: {
|
|
47
|
-
<% remotes.forEach(function(remote) { %>"<%= remote.remoteName %>": "http://localhost:<%= remote.port %>/remoteEntry.js",<% }); %>
|
|
48
|
-
},<% } %>
|
|
49
|
-
shared: share({<% sharedLibraries.forEach(function (lib) { %>
|
|
50
|
-
"<%= lib %>": { singleton: true, strictVersion: true, requiredVersion: 'auto', includeSecondaries: true },<% }); %>
|
|
51
|
-
...sharedMappings.getDescriptors(),
|
|
52
|
-
}),
|
|
53
|
-
library: {
|
|
54
|
-
type: 'module'
|
|
55
|
-
},
|
|
56
|
-
}),
|
|
57
|
-
sharedMappings.getPlugin(),
|
|
58
|
-
],
|
|
59
|
-
};
|
|
1
|
+
const { withModuleFederation } = require('@nrwl/angular/module-federation');
|
|
2
|
+
module.exports = withModuleFederation({
|
|
3
|
+
name: '<%= name %>',<% if(type === 'host') { %>
|
|
4
|
+
remotes: [<% remotes.forEach(function(remote) { %>'<%= remote.remoteName %>',<% }); %>]<% } %><% if(type === 'remote') { %>
|
|
5
|
+
exposes: {
|
|
6
|
+
'./Module': '<%= projectRoot %>/src/app/remote-entry/entry.module.ts',
|
|
7
|
+
},<% } %>
|
|
8
|
+
});
|
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addRemoteToHost = void 0;
|
|
3
|
+
exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const ts = require("typescript");
|
|
8
|
+
function checkIsCommaNeeded(mfeRemoteText) {
|
|
9
|
+
const remoteText = mfeRemoteText.replace(/\s+/g, '');
|
|
10
|
+
return !remoteText.endsWith(',]')
|
|
11
|
+
? remoteText === '[]'
|
|
12
|
+
? false
|
|
13
|
+
: true
|
|
14
|
+
: false;
|
|
15
|
+
}
|
|
16
|
+
exports.checkIsCommaNeeded = checkIsCommaNeeded;
|
|
8
17
|
function addRemoteToHost(host, options) {
|
|
9
|
-
var _a
|
|
18
|
+
var _a;
|
|
10
19
|
if (options.mfeType === 'remote' && options.host) {
|
|
11
20
|
const hostProject = (0, devkit_1.readProjectConfiguration)(host, options.host);
|
|
12
21
|
const hostWebpackPath = (_a = hostProject.targets['build'].options.customWebpackConfig) === null || _a === void 0 ? void 0 : _a.path;
|
|
@@ -15,10 +24,10 @@ function addRemoteToHost(host, options) {
|
|
|
15
24
|
}
|
|
16
25
|
const hostWebpackConfig = host.read(hostWebpackPath, 'utf-8');
|
|
17
26
|
const webpackAst = tsquery_1.tsquery.ast(hostWebpackConfig);
|
|
18
|
-
const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~
|
|
19
|
-
const endOfPropertiesPos = mfRemotesNode.
|
|
20
|
-
const
|
|
21
|
-
|
|
27
|
+
const mfRemotesNode = (0, tsquery_1.tsquery)(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
|
|
28
|
+
const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
|
|
29
|
+
const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
|
|
30
|
+
const updatedConfig = `${hostWebpackConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostWebpackConfig.slice(endOfPropertiesPos)}`;
|
|
22
31
|
host.write(hostWebpackPath, updatedConfig);
|
|
23
32
|
const declarationFilePath = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'decl.d.ts');
|
|
24
33
|
const declarationFileContent = (host.exists(declarationFilePath)
|
|
@@ -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":";;;AAGA,yCAA2E;AAC3E,uDAAoD;AAEpD,kEAA8D;AAE9D,iCAAiC;AAEjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,eAAe,GACnB,MAAA,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAC;QAEjE,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,gGAAgG,CAC/I,CAAC;SACH;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,IAAA,iBAAO,EAC3B,UAAU,EACV,
|
|
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":";;;AAGA,yCAA2E;AAC3E,uDAAoD;AAEpD,kEAA8D;AAE9D,iCAAiC;AAEjC,SAAgB,kBAAkB,CAAC,aAAqB;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC/B,CAAC,CAAC,UAAU,KAAK,IAAI;YACnB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,IAAI;QACR,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAPD,gDAOC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,IAAI,OAAO,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,eAAe,GACnB,MAAA,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,0CAAE,IAAI,CAAC;QAEjE,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,kCAAkC,OAAO,CAAC,IAAI,gGAAgG,CAC/I,CAAC;SACH;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,UAAU,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,IAAA,iBAAO,EAC3B,UAAU,EACV,mDAAmD,EACnD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAA2B,CAAC;QAE/B,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAElE,MAAM,aAAa,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,GACrE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACxB,IAAI,OAAO,CAAC,OAAO,KAAK,iBAAiB,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAEtE,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,WAAW,CAAC,UAAU,EACtB,WAAW,CACZ,CAAC;QAEF,MAAM,sBAAsB,GAC1B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC;YACzC,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,OAAO,CAAC,OAAO,WAAW,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAC;QAExD,iCAAiC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAClD;AACH,CAAC;AA1CD,0CA0CC;AAED,wEAAwE;AACxE,SAAS,iCAAiC,CAAC,IAAU,EAAE,OAAe;IACpE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,GAAG,aAAa,CAAC,UAAU,oBAAoB,CAAC;IAC5E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACrC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;QACpD,OAAO;KACR;IAED,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,mBAAmB,EACnB,aAAa,EACb,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,oBAAQ,EACnB,IAAI,EACJ,mBAAmB,EACnB,UAAU,EACV;kBACc,OAAO,CAAC,OAAO;uCACM,OAAO,CAAC,OAAO;OAC/C,CACJ,CAAC;AACJ,CAAC"}
|
|
@@ -2,14 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateWebpackConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
|
-
const SHARED_SINGLETON_LIBRARIES = [
|
|
7
|
-
'@angular/core',
|
|
8
|
-
'@angular/common',
|
|
9
|
-
'@angular/common/http',
|
|
10
|
-
'@angular/router',
|
|
11
|
-
'rxjs',
|
|
12
|
-
];
|
|
13
5
|
function generateWebpackConfig(host, options, appRoot, remotesWithPorts) {
|
|
14
6
|
if (host.exists(`${appRoot}/webpack.config.js`) ||
|
|
15
7
|
host.exists(`${appRoot}/webpack.prod.config.js`)) {
|
|
@@ -21,10 +13,7 @@ function generateWebpackConfig(host, options, appRoot, remotesWithPorts) {
|
|
|
21
13
|
type: options.mfeType,
|
|
22
14
|
name: options.appName,
|
|
23
15
|
remotes: remotesWithPorts !== null && remotesWithPorts !== void 0 ? remotesWithPorts : [],
|
|
24
|
-
|
|
25
|
-
sharedLibraries: SHARED_SINGLETON_LIBRARIES,
|
|
26
|
-
offsetFromRoot: (0, devkit_1.offsetFromRoot)(appRoot),
|
|
27
|
-
rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, appRoot),
|
|
16
|
+
projectRoot: appRoot,
|
|
28
17
|
});
|
|
29
18
|
}
|
|
30
19
|
exports.generateWebpackConfig = generateWebpackConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,
|
|
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,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;AA5BD,sDA4BC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Schema } from './schema';
|
|
3
|
-
export declare function setupMfe(host: Tree, options: Schema): Promise<
|
|
3
|
+
export declare function setupMfe(host: Tree, options: Schema): Promise<void>;
|
|
4
4
|
export default setupMfe;
|
|
@@ -4,7 +4,6 @@ exports.setupMfe = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const lib_1 = require("./lib");
|
|
7
|
-
const versions_1 = require("../../utils/versions");
|
|
8
7
|
function setupMfe(host, options) {
|
|
9
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
9
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.appName);
|
|
@@ -18,18 +17,10 @@ function setupMfe(host, options) {
|
|
|
18
17
|
(0, lib_1.setupServeTarget)(host, options);
|
|
19
18
|
(0, lib_1.fixBootstrap)(host, projectConfig.root);
|
|
20
19
|
(0, lib_1.addCypressOnErrorWorkaround)(host, options);
|
|
21
|
-
let installPackages = () => { };
|
|
22
|
-
if (!options.skipPackageJson) {
|
|
23
|
-
// add package to install
|
|
24
|
-
installPackages = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
25
|
-
'@angular-architects/module-federation': versions_1.angularArchitectsModuleFederationPluginVersion,
|
|
26
|
-
}, {});
|
|
27
|
-
}
|
|
28
20
|
// format files
|
|
29
21
|
if (!options.skipFormat) {
|
|
30
22
|
yield (0, devkit_1.formatFiles)(host);
|
|
31
23
|
}
|
|
32
|
-
return installPackages;
|
|
33
24
|
});
|
|
34
25
|
}
|
|
35
26
|
exports.setupMfe = setupMfe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,
|
|
1
|
+
{"version":3,"file":"setup-mfe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mfe/setup-mfe.ts"],"names":[],"mappings":";;;;AAGA,yCAAqE;AAErE,+BAWe;AAEf,SAAsB,QAAQ,CAAC,IAAU,EAAE,OAAe;;QACxD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE/B,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAtBD,4BAsBC;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -6,7 +6,7 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
6
6
|
const workspace_1 = require("@nrwl/workspace");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
|
-
const
|
|
9
|
+
const devkit_2 = require("@nrwl/devkit");
|
|
10
10
|
/**
|
|
11
11
|
* It was decided with Jason that we would do a simple replacement in this migration
|
|
12
12
|
* because Angular + ESLint support has been experimental until this point.
|
|
@@ -23,7 +23,7 @@ function addHTMLPatternToBuilderConfig(projectName, projectSourceRoot, targetNam
|
|
|
23
23
|
function updateProjectESLintConfigsAndBuilders(host) {
|
|
24
24
|
var _a;
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
const graph = yield (0,
|
|
26
|
+
const graph = yield (0, devkit_2.createProjectGraphAsync)();
|
|
27
27
|
/**
|
|
28
28
|
* Make sure user is already using ESLint and is up to date with
|
|
29
29
|
* previous migrations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AACjD,2DAA+D;AAC/D,+CAQyB;AACzB,+BAA4B;AAC5B,yCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"add-template-support-and-presets-to-eslint.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-10-5-0/add-template-support-and-presets-to-eslint.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getMfeProjects = 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) {
|
|
6
|
+
function getMfeProjects(tree, { legacy } = { legacy: false }) {
|
|
7
7
|
const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
|
|
8
8
|
const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
|
|
9
|
+
const MODULE_FEDERATION_IDENTIFIER = legacy
|
|
10
|
+
? 'Identifier[name=ModuleFederationPlugin]'
|
|
11
|
+
: 'Identifier[name=withModuleFederation]';
|
|
9
12
|
const projects = [];
|
|
10
13
|
(0, executor_options_utils_1.forEachExecutorOptions)(tree, NRWL_WEBPACK_BROWSER_BUILDER, (opts, projectName) => {
|
|
11
14
|
var _a;
|
|
@@ -15,7 +18,7 @@ function getMfeProjects(tree) {
|
|
|
15
18
|
}
|
|
16
19
|
const webpackConfig = tree.read(webpackPath, 'utf-8');
|
|
17
20
|
const ast = tsquery_1.tsquery.ast(webpackConfig);
|
|
18
|
-
const moduleFederationWebpackConfig = (0, tsquery_1.tsquery)(ast,
|
|
21
|
+
const moduleFederationWebpackConfig = (0, tsquery_1.tsquery)(ast, MODULE_FEDERATION_IDENTIFIER, {
|
|
19
22
|
visitAllChildren: true,
|
|
20
23
|
});
|
|
21
24
|
if (!moduleFederationWebpackConfig ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-mfe-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mfe-projects.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iGAA8F;AAE9F,SAAgB,cAAc,
|
|
1
|
+
{"version":3,"file":"get-mfe-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mfe-projects.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iGAA8F;AAE9F,SAAgB,cAAc,CAC5B,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,wCAwCC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.sharePackages = exports.shareWorkspaceLibraries = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const webpack_1 = require("webpack");
|
|
6
|
-
const app_root_1 = require("nx/src/utils/app-root");
|
|
7
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
@@ -25,7 +24,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
25
24
|
const pathMappings = [];
|
|
26
25
|
for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
|
|
27
26
|
if (libraries && libraries.includes(key)) {
|
|
28
|
-
const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(
|
|
27
|
+
const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(devkit_1.appRootPath, paths[0]));
|
|
29
28
|
pathMappings.push({
|
|
30
29
|
name: key,
|
|
31
30
|
path: pathToLib,
|
|
@@ -52,7 +51,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
52
51
|
}
|
|
53
52
|
exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
|
|
54
53
|
function sharePackages(packages) {
|
|
55
|
-
const pkgJsonPath = (0, devkit_1.joinPathFragments)(
|
|
54
|
+
const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.appRootPath, 'package.json');
|
|
56
55
|
if (!(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
57
56
|
throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
|
|
58
57
|
}
|
|
@@ -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":"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"}
|
|
@@ -3,13 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.withModuleFederation = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const mfe_webpack_1 = require("./mfe-webpack");
|
|
6
|
-
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
7
|
-
const file_utils_1 = require("@nrwl/workspace/src/core/file-utils");
|
|
8
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
|
-
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
10
|
-
const workspace_1 = require("nx/src/shared/workspace");
|
|
11
|
-
const app_root_1 = require("nx/src/utils/app-root");
|
|
12
7
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
|
+
const file_utils_1 = require("nx/src/core/file-utils");
|
|
9
|
+
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
13
10
|
function recursivelyResolveWorkspaceDependents(projectGraph, target, seenTargets = new Set()) {
|
|
14
11
|
var _a;
|
|
15
12
|
if (seenTargets.has(target)) {
|
|
@@ -30,7 +27,7 @@ function recursivelyResolveWorkspaceDependents(projectGraph, target, seenTargets
|
|
|
30
27
|
}
|
|
31
28
|
function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
32
29
|
var _a, _b;
|
|
33
|
-
const { projects } = new
|
|
30
|
+
const { projects } = new devkit_1.Workspaces(devkit_1.workspaceRoot).readWorkspaceConfiguration();
|
|
34
31
|
const tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)();
|
|
35
32
|
const tsConfig = (0, typescript_1.readTsConfig)(tsConfigPath);
|
|
36
33
|
const tsconfigPathAliases = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths;
|
|
@@ -58,10 +55,10 @@ function getDependentPackagesForProject(name) {
|
|
|
58
55
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
59
56
|
let projectGraph;
|
|
60
57
|
try {
|
|
61
|
-
projectGraph = (0,
|
|
58
|
+
projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
62
59
|
}
|
|
63
60
|
catch (e) {
|
|
64
|
-
projectGraph = yield (0,
|
|
61
|
+
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
65
62
|
}
|
|
66
63
|
const deps = projectGraph.dependencies[name].reduce((dependencies, dependency) => {
|
|
67
64
|
const workspaceLibraries = new Set(dependencies.workspaceLibraries);
|
|
@@ -96,7 +93,7 @@ function determineRemoteUrl(remote) {
|
|
|
96
93
|
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "publicHost" in the project's "serve" target.\n
|
|
97
94
|
You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
|
|
98
95
|
}
|
|
99
|
-
return (0,
|
|
96
|
+
return `${publicHost.endsWith('/') ? publicHost.slice(0, -1) : publicHost}/remoteEntry.mjs`;
|
|
100
97
|
}
|
|
101
98
|
function mapRemotes(remotes) {
|
|
102
99
|
const mappedRemotes = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,+CAIuB;AACvB,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -6,7 +6,6 @@ export declare const ngrxVersion = "~13.0.0";
|
|
|
6
6
|
export declare const rxjsVersion = "~7.4.0";
|
|
7
7
|
export declare const jestPresetAngularVersion = "11.1.1";
|
|
8
8
|
export declare const angularEslintVersion = "~13.1.0";
|
|
9
|
-
export declare const angularArchitectsModuleFederationPluginVersion = "^14.0.1";
|
|
10
9
|
export declare const tailwindVersion = "^3.0.2";
|
|
11
10
|
export declare const postcssVersion = "^8.4.5";
|
|
12
11
|
export declare const autoprefixerVersion = "^10.4.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.
|
|
4
|
-
exports.nxVersion = '13.10.0-beta.
|
|
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 = '13.10.0-beta.4';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|
|
@@ -9,7 +9,6 @@ exports.ngrxVersion = '~13.0.0';
|
|
|
9
9
|
exports.rxjsVersion = '~7.4.0';
|
|
10
10
|
exports.jestPresetAngularVersion = '11.1.1';
|
|
11
11
|
exports.angularEslintVersion = '~13.1.0';
|
|
12
|
-
exports.angularArchitectsModuleFederationPluginVersion = '^14.0.1';
|
|
13
12
|
exports.tailwindVersion = '^3.0.2';
|
|
14
13
|
exports.postcssVersion = '^8.4.5';
|
|
15
14
|
exports.autoprefixerVersion = '^10.4.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAChB,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,mBAAmB,GAAG,SAAS,CAAC"}
|