@nrwl/angular 13.8.5 → 13.8.8-beta.0
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/LICENSE +22 -0
- package/generators.d.ts +2 -0
- package/generators.js +2 -0
- package/generators.js.map +1 -1
- package/generators.json +24 -0
- package/ng-package.json +2 -1
- package/package.json +7 -6
- package/src/builders/webpack-server/webpack-server.impl.js +1 -0
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/application/application.js +5 -16
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/tsconfig.json +1 -1
- package/src/generators/application/lib/add-e2e.d.ts +1 -10
- package/src/generators/application/lib/add-e2e.js +2 -11
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/create-files.d.ts +1 -1
- package/src/generators/application/lib/create-files.js +3 -3
- package/src/generators/application/lib/create-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +16 -1
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/normalized-schema.d.ts +2 -0
- package/src/generators/application/lib/update-config-files.js +12 -10
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +2 -1
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/library/files/lib/tsconfig.json__tpl__ +1 -1
- package/src/generators/library/lib/normalize-options.js +12 -1
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/lib/normalized-schema.d.ts +1 -0
- package/src/generators/library/lib/update-project.js +11 -8
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -1
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.js +3 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js +2 -1
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js.map +1 -1
- package/src/generators/mfe-host/mfe-host.compat.d.ts +2 -0
- package/src/generators/mfe-host/mfe-host.compat.js +6 -0
- package/src/generators/mfe-host/mfe-host.compat.js.map +1 -0
- package/src/generators/mfe-host/mfe-host.d.ts +3 -0
- package/src/generators/mfe-host/mfe-host.js +29 -0
- package/src/generators/mfe-host/mfe-host.js.map +1 -0
- package/src/generators/mfe-host/schema.d.ts +4 -0
- package/src/generators/mfe-host/schema.json +33 -0
- package/src/generators/mfe-remote/mfe-remote.compat.d.ts +2 -0
- package/src/generators/mfe-remote/mfe-remote.compat.js +6 -0
- package/src/generators/mfe-remote/mfe-remote.compat.js.map +1 -0
- package/src/generators/mfe-remote/mfe-remote.d.ts +3 -0
- package/src/generators/mfe-remote/mfe-remote.js +25 -0
- package/src/generators/mfe-remote/mfe-remote.js.map +1 -0
- package/src/generators/mfe-remote/schema.d.ts +5 -0
- package/src/generators/mfe-remote/schema.json +33 -0
- package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +1 -1
- package/src/generators/setup-mfe/lib/generate-config.js +2 -0
- package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
- package/src/generators/setup-mfe/lib/get-remotes-with-ports.js +2 -2
- package/src/generators/setup-mfe/lib/get-remotes-with-ports.js.map +1 -1
- package/src/generators/web-worker/lib/update-tsconfig.js +3 -2
- package/src/generators/web-worker/lib/update-tsconfig.js.map +1 -1
- package/src/utils/mfe-webpack.d.ts +7 -0
- package/src/utils/mfe-webpack.js +66 -0
- package/src/utils/mfe-webpack.js.map +1 -0
- package/src/utils/versions.js +1 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
(The MIT License)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2017-2022 Narwhal Technologies Inc.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
+
a copy of this software and associated documentation files (the
|
|
7
|
+
'Software'), to deal in the Software without restriction, including
|
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
+
the following conditions:
|
|
12
|
+
|
|
13
|
+
The above copyright notice and this permission notice shall be
|
|
14
|
+
included in all copies or substantial portions of the Software.
|
|
15
|
+
|
|
16
|
+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
package/generators.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export * from './src/generators/storybook-migrate-defaults-5-to-6/storybook-migr
|
|
|
15
15
|
export * from './src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2';
|
|
16
16
|
export * from './src/generators/upgrade-module/upgrade-module';
|
|
17
17
|
export * from './src/generators/setup-mfe/setup-mfe';
|
|
18
|
+
export * from './src/generators/mfe-host/mfe-host';
|
|
18
19
|
export * from './src/generators/scam/scam';
|
|
19
20
|
export * from './src/generators/scam-directive/scam-directive';
|
|
20
21
|
export * from './src/generators/scam-pipe/scam-pipe';
|
|
@@ -22,3 +23,4 @@ export * from './src/generators/add-linting/add-linting';
|
|
|
22
23
|
export * from './src/generators/component-cypress-spec/component-cypress-spec';
|
|
23
24
|
export * from './src/generators/component-story/component-story';
|
|
24
25
|
export * from './src/generators/web-worker/web-worker';
|
|
26
|
+
export * from './src/generators/mfe-remote/mfe-remote';
|
package/generators.js
CHANGED
|
@@ -18,6 +18,7 @@ const tslib_1 = require("tslib");
|
|
|
18
18
|
(0, tslib_1.__exportStar)(require("./src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2"), exports);
|
|
19
19
|
(0, tslib_1.__exportStar)(require("./src/generators/upgrade-module/upgrade-module"), exports);
|
|
20
20
|
(0, tslib_1.__exportStar)(require("./src/generators/setup-mfe/setup-mfe"), exports);
|
|
21
|
+
(0, tslib_1.__exportStar)(require("./src/generators/mfe-host/mfe-host"), exports);
|
|
21
22
|
(0, tslib_1.__exportStar)(require("./src/generators/scam/scam"), exports);
|
|
22
23
|
(0, tslib_1.__exportStar)(require("./src/generators/scam-directive/scam-directive"), exports);
|
|
23
24
|
(0, tslib_1.__exportStar)(require("./src/generators/scam-pipe/scam-pipe"), exports);
|
|
@@ -25,4 +26,5 @@ const tslib_1 = require("tslib");
|
|
|
25
26
|
(0, tslib_1.__exportStar)(require("./src/generators/component-cypress-spec/component-cypress-spec"), exports);
|
|
26
27
|
(0, tslib_1.__exportStar)(require("./src/generators/component-story/component-story"), exports);
|
|
27
28
|
(0, tslib_1.__exportStar)(require("./src/generators/web-worker/web-worker"), exports);
|
|
29
|
+
(0, tslib_1.__exportStar)(require("./src/generators/mfe-remote/mfe-remote"), exports);
|
|
28
30
|
//# sourceMappingURL=generators.js.map
|
package/generators.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,8FAA+D;AAC/D,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD;AACrD,0EAA2C;AAC3C,8FAA+D;AAC/D,oFAAqD;AACrD,wFAAyD;AACzD,8GAA+E;AAC/E,gGAAiE;AACjE,sFAAuD"}
|
|
1
|
+
{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/angular/generators.ts"],"names":[],"mappings":";;;AAAA,wFAAyD;AACzD,kHAAmF;AACnF,kGAAmE;AACnE,0EAA2C;AAC3C,4EAA6C;AAC7C,4FAA6D;AAC7D,gFAAiD;AACjD,4HAA6F;AAC7F,0EAA2C;AAC3C,0EAA2C;AAC3C,8FAA+D;AAC/D,gFAAiD;AACjD,gHAAiF;AACjF,oIAAqG;AACrG,wHAAyF;AACzF,8FAA+D;AAC/D,oFAAqD;AACrD,kFAAmD;AACnD,0EAA2C;AAC3C,8FAA+D;AAC/D,oFAAqD;AACrD,wFAAyD;AACzD,8GAA+E;AAC/E,gGAAiE;AACjE,sFAAuD;AACvD,sFAAuD"}
|
package/generators.json
CHANGED
|
@@ -68,12 +68,24 @@
|
|
|
68
68
|
"aliases": ["secondary-entry-point", "entry-point"],
|
|
69
69
|
"description": "Creates a secondary entry point for an Angular publishable library."
|
|
70
70
|
},
|
|
71
|
+
"mfe-remote": {
|
|
72
|
+
"factory": "./src/generators/mfe-remote/mfe-remote.compat",
|
|
73
|
+
"schema": "./src/generators/mfe-remote/schema.json",
|
|
74
|
+
"aliases": ["remote"],
|
|
75
|
+
"description": "Generate a Remote Angular Micro-Frontend Application."
|
|
76
|
+
},
|
|
71
77
|
"move": {
|
|
72
78
|
"factory": "./src/generators/move/move#angularMoveSchematic",
|
|
73
79
|
"schema": "./src/generators/move/schema.json",
|
|
74
80
|
"aliases": ["mv"],
|
|
75
81
|
"description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
|
|
76
82
|
},
|
|
83
|
+
"mfe-host": {
|
|
84
|
+
"factory": "./src/generators/mfe-host/mfe-host.compat",
|
|
85
|
+
"schema": "./src/generators/mfe-host/schema.json",
|
|
86
|
+
"aliases": ["host"],
|
|
87
|
+
"description": "Generate a Host Angular Micro Frontend Application."
|
|
88
|
+
},
|
|
77
89
|
"ngrx": {
|
|
78
90
|
"factory": "./src/generators/ngrx/compat",
|
|
79
91
|
"schema": "./src/generators/ngrx/schema.json",
|
|
@@ -201,12 +213,24 @@
|
|
|
201
213
|
"aliases": ["secondary-entry-point", "entry-point"],
|
|
202
214
|
"description": "Creates a secondary entry point for an Angular publishable library."
|
|
203
215
|
},
|
|
216
|
+
"mfe-remote": {
|
|
217
|
+
"factory": "./src/generators/mfe-remote/mfe-remote",
|
|
218
|
+
"schema": "./src/generators/mfe-remote/schema.json",
|
|
219
|
+
"aliases": ["remote"],
|
|
220
|
+
"description": "Generate a Remote Angular Micro-Frontend Application."
|
|
221
|
+
},
|
|
204
222
|
"move": {
|
|
205
223
|
"factory": "./src/generators/move/move#angularMoveGenerator",
|
|
206
224
|
"schema": "./src/generators/move/schema.json",
|
|
207
225
|
"aliases": ["mv"],
|
|
208
226
|
"description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
|
|
209
227
|
},
|
|
228
|
+
"mfe-host": {
|
|
229
|
+
"factory": "./src/generators/mfe-host/mfe-host",
|
|
230
|
+
"schema": "./src/generators/mfe-host/schema.json",
|
|
231
|
+
"aliases": ["host"],
|
|
232
|
+
"description": "Generate a Host Angular Micro Frontend Application."
|
|
233
|
+
},
|
|
210
234
|
"ngrx": {
|
|
211
235
|
"factory": "./src/generators/ngrx/ngrx",
|
|
212
236
|
"schema": "./src/generators/ngrx/schema.json",
|
package/ng-package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.8.
|
|
3
|
+
"version": "13.8.8-beta.0",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
58
|
"@angular-devkit/schematics": "~13.2.0",
|
|
59
|
-
"@nrwl/cypress": "13.8.
|
|
60
|
-
"@nrwl/devkit": "13.8.
|
|
61
|
-
"@nrwl/jest": "13.8.
|
|
62
|
-
"@nrwl/linter": "13.8.
|
|
63
|
-
"@nrwl/storybook": "13.8.
|
|
59
|
+
"@nrwl/cypress": "13.8.8-beta.0",
|
|
60
|
+
"@nrwl/devkit": "13.8.8-beta.0",
|
|
61
|
+
"@nrwl/jest": "13.8.8-beta.0",
|
|
62
|
+
"@nrwl/linter": "13.8.8-beta.0",
|
|
63
|
+
"@nrwl/storybook": "13.8.8-beta.0",
|
|
64
64
|
"@schematics/angular": "~13.2.0",
|
|
65
65
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
66
66
|
"ignore": "^5.0.4",
|
|
@@ -70,6 +70,7 @@
|
|
|
70
70
|
"ts-node": "~9.1.1",
|
|
71
71
|
"tsconfig-paths": "^3.9.0",
|
|
72
72
|
"semver": "7.3.4",
|
|
73
|
+
"webpack": "^5.58.1",
|
|
73
74
|
"tslib": "^2.3.0"
|
|
74
75
|
},
|
|
75
76
|
"module": "fesm2015/nrwl-angular.mjs",
|
|
@@ -12,6 +12,7 @@ const webpack_1 = require("../utilities/webpack");
|
|
|
12
12
|
const lib_1 = require("./lib");
|
|
13
13
|
function webpackServer(schema, context) {
|
|
14
14
|
var _a;
|
|
15
|
+
process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
|
|
15
16
|
const options = (0, lib_1.normalizeOptions)(schema);
|
|
16
17
|
const workspaceConfig = new workspace_1.Workspaces(context.workspaceRoot).readWorkspaceConfiguration();
|
|
17
18
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,sFAG+D;AAE/D,yCAAoE;AACpE,8DAA4D;AAC5D,2BAAgC;AAChC,iDAAsC;AACtC,kDAAkE;AAClE,+BAAyC;AAGzC,SAAgB,aAAa,CAAC,MAAc,EAAE,OAAuB;;IACnE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAI,sBAAU,CACpC,OAAO,CAAC,aAAa,CACtB,CAAC,0BAA0B,EAAE,CAAC;IAE/B,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,WAAW,GACf,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAC3D,mBAAmB,CAAC,MAAM,CAC3B,CAAC;IAEJ,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,aAAa;QAC7D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IAExB,MAAM,mBAAmB,GACvB,MAAA,qBAAqB,CAAC,mBAAmB,mCACzC,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,EACd;gBACE,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;oBAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,WAAW,CAAC,OAAO,CAAC,QAAQ,CAC7B,CAAC;oBACF,0FAA0F;oBAC1F,4DAA4D;oBAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;wBACpD,OAAO,0BAA0B,CAC/B,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,CAAC,MAAM,CACf,CAAC;qBACH;yBAAM;wBACL,OAAO,IAAA,qBAAK,EACV,iBAAiB;wBACjB,gFAAgF;wBAChF,yFAAyF;wBACzF,4CAA4C;wBAC5C,MAAM,0BAA0B,CACjC,CAAC;qBACH;gBACH,CAAC,CAAA;aACF,CACF,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,CACf,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,sFAG+D;AAE/D,yCAAoE;AACpE,8DAA4D;AAC5D,2BAAgC;AAChC,iDAAsC;AACtC,kDAAkE;AAClE,+BAAyC;AAGzC,SAAgB,aAAa,CAAC,MAAc,EAAE,OAAuB;;IACnE,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAI,sBAAU,CACpC,OAAO,CAAC,aAAa,CACtB,CAAC,0BAA0B,EAAE,CAAC;IAE/B,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,WAAW,GACf,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAC3D,mBAAmB,CAAC,MAAM,CAC3B,CAAC;IAEJ,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,aAAa;QAC7D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IAExB,MAAM,mBAAmB,GACvB,MAAA,qBAAqB,CAAC,mBAAmB,mCACzC,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,EACd;gBACE,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;oBAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,WAAW,CAAC,OAAO,CAAC,QAAQ,CAC7B,CAAC;oBACF,0FAA0F;oBAC1F,4DAA4D;oBAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;wBACpD,OAAO,0BAA0B,CAC/B,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,CAAC,MAAM,CACf,CAAC;qBACH;yBAAM;wBACL,OAAO,IAAA,qBAAK,EACV,iBAAiB;wBACjB,gFAAgF;wBAChF,yFAAyF;wBACzF,4CAA4C;wBAC5C,MAAM,0BAA0B,CACjC,CAAC;qBACH;gBACH,CAAC,CAAA;aACF,CACF,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,gCAAmB,EACxB,OAAkC,EAClC,OAAc,CACf,CAAC;AACJ,CAAC;AA1ED,sCA0EC;AAED,kBAAe,IAAA,yBAAa,EAAsB,aAAa,CAAQ,CAAC"}
|
|
@@ -11,19 +11,6 @@ const lib_1 = require("./lib");
|
|
|
11
11
|
function applicationGenerator(host, schema) {
|
|
12
12
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
13
|
const options = (0, lib_1.normalizeOptions)(host, schema);
|
|
14
|
-
// Determine the roots where @schematics/angular will place the projects
|
|
15
|
-
// This is not where the projects actually end up
|
|
16
|
-
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
17
|
-
let newProjectRoot = null;
|
|
18
|
-
if (workspaceJsonPath) {
|
|
19
|
-
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
20
|
-
}
|
|
21
|
-
const appProjectRoot = newProjectRoot
|
|
22
|
-
? `${newProjectRoot}/${options.name}`
|
|
23
|
-
: options.name;
|
|
24
|
-
const e2eProjectRoot = newProjectRoot
|
|
25
|
-
? `${newProjectRoot}/${options.e2eProjectName}`
|
|
26
|
-
: `${options.name}/e2e`;
|
|
27
14
|
yield (0, init_1.angularInitGenerator)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
28
15
|
const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
|
|
29
16
|
yield angularAppSchematic(host, {
|
|
@@ -38,8 +25,10 @@ function applicationGenerator(host, schema) {
|
|
|
38
25
|
skipInstall: true,
|
|
39
26
|
skipPackageJson: options.skipPackageJson,
|
|
40
27
|
});
|
|
41
|
-
(
|
|
42
|
-
|
|
28
|
+
if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
|
|
29
|
+
(0, devkit_1.moveFilesToNewDirectory)(host, options.ngCliSchematicAppRoot, options.appProjectRoot);
|
|
30
|
+
}
|
|
31
|
+
(0, lib_1.createFiles)(host, options);
|
|
43
32
|
(0, lib_1.updateConfigFiles)(host, options);
|
|
44
33
|
(0, lib_1.updateAppComponentTemplate)(host, options);
|
|
45
34
|
// Create the NxWelcomeComponent
|
|
@@ -71,7 +60,7 @@ function applicationGenerator(host, schema) {
|
|
|
71
60
|
}
|
|
72
61
|
(0, lib_1.addLinting)(host, options);
|
|
73
62
|
yield (0, lib_1.addUnitTestRunner)(host, options);
|
|
74
|
-
yield (0, lib_1.addE2e)(host, options
|
|
63
|
+
yield (0, lib_1.addE2e)(host, options);
|
|
75
64
|
(0, lib_1.updateEditorTsConfig)(host, options);
|
|
76
65
|
if (options.backendProject) {
|
|
77
66
|
(0, lib_1.addProxyConfig)(host, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { NormalizedSchema } from './normalized-schema';
|
|
3
|
-
|
|
4
|
-
* Add E2E Config
|
|
5
|
-
*
|
|
6
|
-
* @param tree Nx Devkit Virtual Tree
|
|
7
|
-
* @param options Normalized Schema
|
|
8
|
-
* @param e2eProjectRoot Raw E2E Project Root that Angular tries to write to
|
|
9
|
-
*
|
|
10
|
-
* @returns Function to run to add Cypres config after intial app files have been moved to correct location
|
|
11
|
-
*/
|
|
12
|
-
export declare function addE2e(tree: Tree, options: NormalizedSchema, e2eProjectRoot: string): Promise<void>;
|
|
3
|
+
export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<void>;
|
|
@@ -9,23 +9,14 @@ const update_e2e_project_1 = require("./update-e2e-project");
|
|
|
9
9
|
const workspace_1 = require("@nrwl/workspace");
|
|
10
10
|
const linter_1 = require("@nrwl/linter");
|
|
11
11
|
const devkit_1 = require("@nrwl/devkit");
|
|
12
|
-
|
|
13
|
-
* Add E2E Config
|
|
14
|
-
*
|
|
15
|
-
* @param tree Nx Devkit Virtual Tree
|
|
16
|
-
* @param options Normalized Schema
|
|
17
|
-
* @param e2eProjectRoot Raw E2E Project Root that Angular tries to write to
|
|
18
|
-
*
|
|
19
|
-
* @returns Function to run to add Cypres config after intial app files have been moved to correct location
|
|
20
|
-
*/
|
|
21
|
-
function addE2e(tree, options, e2eProjectRoot) {
|
|
12
|
+
function addE2e(tree, options) {
|
|
22
13
|
var _a;
|
|
23
14
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
24
15
|
if (options.e2eTestRunner === "protractor" /* Protractor */) {
|
|
25
16
|
yield (0, add_protractor_1.addProtractor)(tree, options);
|
|
26
17
|
}
|
|
27
18
|
else {
|
|
28
|
-
(0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options,
|
|
19
|
+
(0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
|
|
29
20
|
}
|
|
30
21
|
if (options.e2eTestRunner === 'cypress') {
|
|
31
22
|
yield (0, cypress_1.cypressProjectGenerator)(tree, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAqE;AAErE
|
|
1
|
+
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAqE;AAErE,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;;QAChE,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;gBACA,MAAM,IAAA,uCAA2B,EAAC,IAAI,EAAE;oBACtC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;oBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;aACJ;SACF;;CACF;AA1CD,wBA0CC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { NormalizedSchema } from './normalized-schema';
|
|
3
|
-
export declare function createFiles(host: Tree, options: NormalizedSchema
|
|
3
|
+
export declare function createFiles(host: Tree, options: NormalizedSchema): void;
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), {
|
|
5
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
|
+
function createFiles(host, options) {
|
|
7
|
+
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot), tpl: '' }));
|
|
8
8
|
}
|
|
9
9
|
exports.createFiles = createFiles;
|
|
10
10
|
//# sourceMappingURL=create-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAChE,yEAAyF;AAGzF,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EACxC,OAAO,CAAC,cAAc,kCAEjB,OAAO,KACV,gBAAgB,EAAE,IAAA,0CAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,EACD,GAAG,EAAE,EAAE,IAEV,CAAC;AACJ,CAAC;AAdD,kCAcC"}
|
|
@@ -24,11 +24,26 @@ function normalizeOptions(host, options) {
|
|
|
24
24
|
: [];
|
|
25
25
|
const defaultPrefix = npmScope;
|
|
26
26
|
options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
|
|
27
|
+
// Determine the roots where @schematics/angular will place the projects
|
|
28
|
+
// This might not be where the projects actually end up
|
|
29
|
+
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
30
|
+
let newProjectRoot = null;
|
|
31
|
+
if (workspaceJsonPath) {
|
|
32
|
+
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
33
|
+
}
|
|
34
|
+
const ngCliSchematicAppRoot = newProjectRoot
|
|
35
|
+
? `${newProjectRoot}/${appProjectName}`
|
|
36
|
+
: appProjectName;
|
|
37
|
+
const ngCliSchematicE2ERoot = newProjectRoot
|
|
38
|
+
? `${newProjectRoot}/${e2eProjectName}`
|
|
39
|
+
: `${appProjectName}/e2e`;
|
|
27
40
|
// Set defaults and then overwrite with user options
|
|
28
41
|
return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: appProjectName, appProjectRoot,
|
|
29
42
|
e2eProjectRoot,
|
|
30
43
|
e2eProjectName,
|
|
31
|
-
parsedTags
|
|
44
|
+
parsedTags,
|
|
45
|
+
ngCliSchematicAppRoot,
|
|
46
|
+
ngCliSchematicE2ERoot });
|
|
32
47
|
}
|
|
33
48
|
exports.normalizeOptions = normalizeOptions;
|
|
34
49
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY;SAChC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,cAAc,CAAC;IACnB,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE5B,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AAjED,4CAiEC"}
|
|
@@ -17,21 +17,23 @@ function updateTsConfigOptions(host, options) {
|
|
|
17
17
|
}
|
|
18
18
|
function updateAppAndE2EProjectConfigurations(host, options) {
|
|
19
19
|
// workspace.json
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
21
|
+
if (options.ngCliSchematicAppRoot !== options.appProjectRoot) {
|
|
22
|
+
project = (0, workspace_1.replaceAppNameWithPath)(project, options.ngCliSchematicAppRoot, options.appProjectRoot);
|
|
23
|
+
}
|
|
24
|
+
delete project.targets.test;
|
|
23
25
|
// Ensure the outputs property comes after the executor for
|
|
24
26
|
// better readability.
|
|
25
|
-
const _a =
|
|
26
|
-
|
|
27
|
-
if (
|
|
28
|
-
delete
|
|
27
|
+
const _a = project.targets.build, { executor } = _a, rest = (0, tslib_1.__rest)(_a, ["executor"]);
|
|
28
|
+
project.targets.build = Object.assign({ executor, outputs: ['{options.outputPath}'] }, rest);
|
|
29
|
+
if (project.generators) {
|
|
30
|
+
delete project.generators;
|
|
29
31
|
}
|
|
30
32
|
if (options.port) {
|
|
31
|
-
|
|
33
|
+
project.targets.serve = Object.assign(Object.assign({}, project.targets.serve), { options: Object.assign(Object.assign({}, project.targets.serve.options), { port: options.port }) });
|
|
32
34
|
}
|
|
33
|
-
|
|
34
|
-
(0, devkit_1.updateProjectConfiguration)(host, options.name,
|
|
35
|
+
project.tags = options.parsedTags;
|
|
36
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.name, project);
|
|
35
37
|
if (options.unitTestRunner === "none" /* None */) {
|
|
36
38
|
host.delete(`${options.appProjectRoot}/src/app/app.component.spec.ts`);
|
|
37
39
|
host.delete(`${options.appProjectRoot}/tsconfig.spec.json`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AAGA,yCAOsB;AACtB,+CAAyD;AAGzD,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,8CAGC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAC/D,MAAM,EAAE,QAAQ,KAElB,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,IACD,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateE2eProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
5
6
|
function updateE2eProject(tree, options) {
|
|
6
7
|
const spec = `${options.e2eProjectRoot}/src/app.e2e-spec.ts`;
|
|
7
8
|
const content = tree.read(spec, 'utf-8');
|
|
@@ -33,7 +34,7 @@ function updateE2eProject(tree, options) {
|
|
|
33
34
|
});
|
|
34
35
|
// update tsconfig
|
|
35
36
|
(0, devkit_1.updateJson)(tree, `${options.e2eProjectRoot}/tsconfig.json`, (json) => {
|
|
36
|
-
return Object.assign(Object.assign({}, json), { extends:
|
|
37
|
+
return Object.assign(Object.assign({}, json), { extends: (0, typescript_1.getRelativePathToRootTsConfig)(tree, options.e2eProjectRoot) });
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
40
|
exports.updateE2eProject = updateE2eProject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;
|
|
1
|
+
{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,yEAAyF;AAGzF,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,WAAW,OAAO,CAAC,IAAI,EAAE,CAC1B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,IACpE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4CAuDC"}
|
|
@@ -30,12 +30,23 @@ function normalizeOptions(host, schema) {
|
|
|
30
30
|
const defaultPrefix = npmScope;
|
|
31
31
|
options.standaloneConfig = (_c = options.standaloneConfig) !== null && _c !== void 0 ? _c : standaloneAsDefault;
|
|
32
32
|
const importPath = options.importPath || `@${defaultPrefix}/${projectDirectory}`;
|
|
33
|
+
// Determine the roots where @schematics/angular will place the projects
|
|
34
|
+
// This might not be where the projects actually end up
|
|
35
|
+
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
36
|
+
let newProjectRoot = null;
|
|
37
|
+
if (workspaceJsonPath) {
|
|
38
|
+
({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
|
|
39
|
+
}
|
|
40
|
+
const ngCliSchematicLibRoot = newProjectRoot
|
|
41
|
+
? `${newProjectRoot}/${projectName}`
|
|
42
|
+
: projectName;
|
|
33
43
|
return Object.assign(Object.assign({}, options), { linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, unitTestRunner: (_e = options.unitTestRunner) !== null && _e !== void 0 ? _e : "jest" /* Jest */, prefix: (_f = options.prefix) !== null && _f !== void 0 ? _f : defaultPrefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
34
44
|
projectDirectory,
|
|
35
45
|
modulePath,
|
|
36
46
|
parsedTags,
|
|
37
47
|
fileName,
|
|
38
|
-
importPath
|
|
48
|
+
importPath,
|
|
49
|
+
ngCliSchematicLibRoot });
|
|
39
50
|
}
|
|
40
51
|
exports.normalizeOptions = normalizeOptions;
|
|
41
52
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.updateProject = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const workspace_1 = require("@nrwl/workspace");
|
|
7
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
7
8
|
const path = require("path");
|
|
8
9
|
const update_ng_package_1 = require("./update-ng-package");
|
|
9
10
|
function updateProject(host, options) {
|
|
@@ -86,28 +87,30 @@ function updateFiles(host, options) {
|
|
|
86
87
|
`);
|
|
87
88
|
}
|
|
88
89
|
function createFiles(host, options) {
|
|
89
|
-
(0, devkit_1.generateFiles)(host, path.join(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), {
|
|
90
|
+
(0, devkit_1.generateFiles)(host, path.join(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot), tpl: '' }));
|
|
90
91
|
}
|
|
91
92
|
function fixProjectWorkspaceConfig(host, options) {
|
|
92
|
-
|
|
93
|
+
let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
|
93
94
|
project.tags = options.parsedTags;
|
|
94
|
-
|
|
95
|
+
if (options.ngCliSchematicLibRoot !== options.projectRoot) {
|
|
96
|
+
project = (0, workspace_1.replaceAppNameWithPath)(project, options.ngCliSchematicLibRoot, options.projectRoot);
|
|
97
|
+
}
|
|
95
98
|
if (!options.publishable && !options.buildable) {
|
|
96
|
-
delete
|
|
99
|
+
delete project.targets.build;
|
|
97
100
|
}
|
|
98
101
|
else {
|
|
99
102
|
// Set the right builder for the type of library.
|
|
100
103
|
// Ensure the outputs property comes after the builder for
|
|
101
104
|
// better readability.
|
|
102
|
-
const _a =
|
|
103
|
-
|
|
105
|
+
const _a = project.targets.build, { executor } = _a, rest = (0, tslib_1.__rest)(_a, ["executor"]);
|
|
106
|
+
project.targets.build = Object.assign({ executor: options.publishable
|
|
104
107
|
? '@nrwl/angular:package'
|
|
105
108
|
: '@nrwl/angular:ng-packagr-lite', outputs: [
|
|
106
109
|
(0, devkit_1.joinPathFragments)('dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory),
|
|
107
110
|
] }, rest);
|
|
108
111
|
}
|
|
109
|
-
delete
|
|
110
|
-
(0, devkit_1.updateProjectConfiguration)(host, options.name,
|
|
112
|
+
delete project.targets.test;
|
|
113
|
+
(0, devkit_1.updateProjectConfiguration)(host, options.name, project);
|
|
111
114
|
}
|
|
112
115
|
function updateProjectTsConfig(host, options) {
|
|
113
116
|
if (!host.exists(`${options.projectRoot}/tsconfig.lib.json`)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
5
6
|
function updateRootConfig(host, options) {
|
|
6
|
-
(0, devkit_1.updateJson)(host,
|
|
7
|
+
(0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
7
8
|
const c = json.compilerOptions;
|
|
8
9
|
c.paths = c.paths || {};
|
|
9
10
|
delete c.paths[options.name];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
|
|
@@ -40,7 +40,9 @@ function libraryGenerator(host, schema) {
|
|
|
40
40
|
skipPackageJson: !(options.publishable || options.buildable),
|
|
41
41
|
skipTsConfig: true,
|
|
42
42
|
});
|
|
43
|
-
|
|
43
|
+
if (options.ngCliSchematicLibRoot !== options.projectRoot) {
|
|
44
|
+
(0, devkit_1.moveFilesToNewDirectory)(host, options.ngCliSchematicLibRoot, options.projectRoot);
|
|
45
|
+
}
|
|
44
46
|
yield (0, update_project_1.updateProject)(host, options);
|
|
45
47
|
(0, update_tsconfig_1.updateTsConfig)(host, options);
|
|
46
48
|
yield addUnitTestRunner(host, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,8DAAwE;AACxE,qCAAkD;AAClD,yCAAsC;AACtC,+CAA8D;AAC9D,qDAA8C;AAC9C,mDAAsD;AACtD,4DAA6D;AAC7D,kEAAmE;AACnE,qEAAsE;AACtE,iDAA6C;AAC7C,mFAG2C;AAC3C,+DAA2D;AAE3D,qFAA8E;AAC9E,yDAAqD;AACrD,2DAAuD;AAGvD,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,4BAA4B;QAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,IAAI,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACrD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QAED,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAClE,MAAM,IAAI,KAAK,CACb,yFAAyF,CAC1F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,IAAA,cAAI,EAAC,IAAI,kCACV,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,0BAA0B,GAAG,IAAA,0CAA0B,EAC3D,qBAAqB,EACrB,SAAS,CACV,CAAC;QACF,MAAM,0BAA0B,CAAC,IAAI,EAAE;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO;YAClB,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;YAC5D,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAA,gCAAuB,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addPathMapping = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
5
6
|
function addPathMapping(tree, options) {
|
|
6
|
-
(0, devkit_1.updateJson)(tree,
|
|
7
|
+
(0, devkit_1.updateJson)(tree, (0, typescript_1.getRootTsConfigPathInTree)(tree), (json) => {
|
|
7
8
|
const c = json.compilerOptions;
|
|
8
9
|
c.paths = c.paths || {};
|
|
9
10
|
c.paths[options.secondaryEntryPoint] = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;
|
|
1
|
+
{"version":3,"file":"add-path-mapping.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library-secondary-entry-point/lib/add-path-mapping.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,yEAAqF;AAGrF,SAAgB,cAAc,CAC5B,IAAU,EACV,OAAmC;IAEnC,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG;YACrC,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,eAAe;SAC9D,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAbD,wCAaC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
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 (0, 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, {
|
|
18
|
+
name: options.name,
|
|
19
|
+
mfe: true,
|
|
20
|
+
mfeType: 'host',
|
|
21
|
+
routing: true,
|
|
22
|
+
remotes: (_a = options.remotes) !== null && _a !== void 0 ? _a : [],
|
|
23
|
+
port: 4200,
|
|
24
|
+
});
|
|
25
|
+
return installTask;
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
exports.default = mfeHost;
|
|
29
|
+
//# sourceMappingURL=mfe-host.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE;YAC9B,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAvBD,0BAuBC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"$id": "NxMFEHost",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Nx MFE Host App",
|
|
6
|
+
"description": "Create an Angular Host Micro Frontend Application",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"examples": [
|
|
9
|
+
{
|
|
10
|
+
"command": "g @nrwl/angular:mfe-host appName --remotes=remote1",
|
|
11
|
+
"description": "Create an Angular app with configuration in place for MFE. If remotes is provided, attach the remote app to this app's configuration."
|
|
12
|
+
}
|
|
13
|
+
],
|
|
14
|
+
"properties": {
|
|
15
|
+
"name": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "The name to give to the host Angular app.",
|
|
18
|
+
"$default": {
|
|
19
|
+
"$source": "argv",
|
|
20
|
+
"index": 0
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
"host": {
|
|
24
|
+
"type": "string",
|
|
25
|
+
"description": "The name of the host app to attach this host app to."
|
|
26
|
+
},
|
|
27
|
+
"port": {
|
|
28
|
+
"type": "string",
|
|
29
|
+
"description": "The port on which this app should be served."
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
"required": ["name"]
|
|
33
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
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 mfeRemote(tree, options) {
|
|
7
|
+
var _a;
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
10
|
+
if (options.host && !projects.has(options.host)) {
|
|
11
|
+
throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
|
|
12
|
+
}
|
|
13
|
+
const installTask = yield (0, application_1.default)(tree, {
|
|
14
|
+
name: options.name,
|
|
15
|
+
mfe: true,
|
|
16
|
+
mfeType: 'remote',
|
|
17
|
+
routing: true,
|
|
18
|
+
host: options.host,
|
|
19
|
+
port: (_a = options.port) !== null && _a !== void 0 ? _a : 4200,
|
|
20
|
+
});
|
|
21
|
+
return installTask;
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
exports.default = mfeRemote;
|
|
25
|
+
//# sourceMappingURL=mfe-remote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mfe-remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/mfe-remote/mfe-remote.ts"],"names":[],"mappings":";;;AAEA,yCAA2C;AAC3C,4DAA8D;AAE9D,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,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI;SAC3B,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;;CACpB;AAlBD,4BAkBC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"$id": "NxMFERemote",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Nx MFE Remote App",
|
|
6
|
+
"description": "Create an Angular Remote Micro Frontend Application",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"examples": [
|
|
9
|
+
{
|
|
10
|
+
"command": "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."
|
|
12
|
+
}
|
|
13
|
+
],
|
|
14
|
+
"properties": {
|
|
15
|
+
"name": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "The name to give to the remote Angular app.",
|
|
18
|
+
"$default": {
|
|
19
|
+
"$source": "argv",
|
|
20
|
+
"index": 0
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
"host": {
|
|
24
|
+
"type": "string",
|
|
25
|
+
"description": "The name of the host app to attach this remote app to."
|
|
26
|
+
},
|
|
27
|
+
"port": {
|
|
28
|
+
"type": "string",
|
|
29
|
+
"description": "The port on which this app should be served."
|
|
30
|
+
}
|
|
31
|
+
},
|
|
32
|
+
"required": ["name"]
|
|
33
|
+
}
|
|
@@ -12,7 +12,7 @@ const share = mf.share;
|
|
|
12
12
|
* This NX_TSCONFIG_PATH environment variable is set by the @nrwl/angular:webpack-browser and it contains
|
|
13
13
|
* the location of the generated temporary tsconfig file.
|
|
14
14
|
*/
|
|
15
|
-
const tsConfigPath = process.env.NX_TSCONFIG_PATH ?? path.join(__dirname, '<%=
|
|
15
|
+
const tsConfigPath = process.env.NX_TSCONFIG_PATH ?? path.join(__dirname, '<%= rootTsConfigPath %>');
|
|
16
16
|
|
|
17
17
|
const workspaceRootPath = path.join(__dirname, '<%= offsetFromRoot %>');
|
|
18
18
|
const sharedMappings = new mf.SharedMappings();
|
|
@@ -2,6 +2,7 @@
|
|
|
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");
|
|
5
6
|
const SHARED_SINGLETON_LIBRARIES = [
|
|
6
7
|
'@angular/core',
|
|
7
8
|
'@angular/common',
|
|
@@ -23,6 +24,7 @@ function generateWebpackConfig(host, options, appRoot, remotesWithPorts) {
|
|
|
23
24
|
sourceRoot: appRoot,
|
|
24
25
|
sharedLibraries: SHARED_SINGLETON_LIBRARIES,
|
|
25
26
|
offsetFromRoot: (0, devkit_1.offsetFromRoot)(appRoot),
|
|
27
|
+
rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, appRoot),
|
|
26
28
|
});
|
|
27
29
|
}
|
|
28
30
|
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":";;;
|
|
1
|
+
{"version":3,"file":"generate-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/generate-config.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,yEAAyF;AAGzF,MAAM,0BAA0B,GAAG;IACjC,eAAe;IACf,iBAAiB;IACjB,sBAAsB;IACtB,iBAAiB;IACjB,MAAM;CACP,CAAC;AAEF,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,UAAU,EAAE,OAAO;QACnB,eAAe,EAAE,0BAA0B;QAC3C,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC;QACvC,gBAAgB,EAAE,IAAA,0CAA6B,EAAC,IAAI,EAAE,OAAO,CAAC;KAC/D,CACF,CAAC;AACJ,CAAC;AA/BD,sDA+BC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getRemotesWithPorts = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function getRemotesWithPorts(host, options) {
|
|
6
|
-
var _a, _b;
|
|
6
|
+
var _a, _b, _c;
|
|
7
7
|
// If type is host and remotes supplied, check remotes exist
|
|
8
8
|
const remotesWithPort = [];
|
|
9
9
|
if (options.mfeType === 'host' &&
|
|
@@ -13,7 +13,7 @@ function getRemotesWithPorts(host, options) {
|
|
|
13
13
|
const remoteConfig = (0, devkit_1.readProjectConfiguration)(host, remote);
|
|
14
14
|
remotesWithPort.push({
|
|
15
15
|
remoteName: remote,
|
|
16
|
-
port: (_b = (_a = remoteConfig.targets['
|
|
16
|
+
port: (_c = (_b = (_a = remoteConfig.targets['serve']) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.port) !== null && _c !== void 0 ? _c : 4200,
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-remotes-with-ports.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/get-remotes-with-ports.ts"],"names":[],"mappings":";;;AAGA,yCAAwD;AAExD,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;;IAC7D,4DAA4D;IAC5D,MAAM,eAAe,GAA2C,EAAE,CAAC;IACnE,IACE,OAAO,CAAC,OAAO,KAAK,MAAM;QAC1B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC9B,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAC1B;QACA,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACpC,MAAM,YAAY,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5D,eAAe,CAAC,IAAI,CAAC;gBACnB,UAAU,EAAE,MAAM;gBAClB,IAAI,EAAE,MAAA,MAAA,YAAY,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"get-remotes-with-ports.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mfe/lib/get-remotes-with-ports.ts"],"names":[],"mappings":";;;AAGA,yCAAwD;AAExD,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;;IAC7D,4DAA4D;IAC5D,MAAM,eAAe,GAA2C,EAAE,CAAC;IACnE,IACE,OAAO,CAAC,OAAO,KAAK,MAAM;QAC1B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC9B,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAC1B;QACA,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACpC,MAAM,YAAY,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5D,eAAe,CAAC,IAAI,CAAC;gBACnB,UAAU,EAAE,MAAM;gBAClB,IAAI,EAAE,MAAA,MAAA,MAAA,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,OAAO,0CAAE,IAAI,mCAAI,IAAI;aAC3D,CAAC,CAAC;SACJ;KACF;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAjBD,kDAiBC"}
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTsConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
5
6
|
function updateTsConfig(tree, project) {
|
|
6
|
-
const workerTsConfigPath = (0, devkit_1.joinPathFragments)((0, devkit_1.getWorkspaceLayout)(tree).appsDir, project, 'tsconfig.worker.json');
|
|
7
7
|
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
8
|
+
const workerTsConfigPath = (0, devkit_1.joinPathFragments)(root, 'tsconfig.worker.json');
|
|
8
9
|
(0, devkit_1.updateJson)(tree, workerTsConfigPath, (json) => {
|
|
9
|
-
json.extends =
|
|
10
|
+
json.extends = (0, typescript_1.getRelativePathToRootTsConfig)(tree, root);
|
|
10
11
|
return json;
|
|
11
12
|
});
|
|
12
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/web-worker/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/web-worker/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,yEAAyF;AAEzF,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAe;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,IAAA,mBAAU,EAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,wCAOC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { NormalModuleReplacementPlugin } from 'webpack';
|
|
2
|
+
export declare function shareWorkspaceLibraries(libraries: string[], tsConfigPath?: string): {
|
|
3
|
+
getAliases: () => {};
|
|
4
|
+
getLibraries: (eager?: boolean) => {};
|
|
5
|
+
getReplacementPlugin: () => NormalModuleReplacementPlugin;
|
|
6
|
+
};
|
|
7
|
+
export declare function sharePackages(packages: string[]): {};
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sharePackages = exports.shareWorkspaceLibraries = void 0;
|
|
4
|
+
const workspace_1 = require("@nrwl/workspace");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const webpack_1 = require("webpack");
|
|
7
|
+
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
8
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
function shareWorkspaceLibraries(libraries, tsConfigPath = process.env.NX_TSCONFIG_PATH) {
|
|
11
|
+
var _a;
|
|
12
|
+
if (!(0, fs_1.existsSync)(tsConfigPath)) {
|
|
13
|
+
throw new Error(`NX MFE: TsConfig Path for workspace libraries does not exist! (${tsConfigPath})`);
|
|
14
|
+
}
|
|
15
|
+
const tsConfig = (0, workspace_1.readTsConfig)(tsConfigPath);
|
|
16
|
+
const tsconfigPathAliases = (_a = tsConfig.options) === null || _a === void 0 ? void 0 : _a.paths;
|
|
17
|
+
if (!tsconfigPathAliases) {
|
|
18
|
+
return {
|
|
19
|
+
getAliases: () => [],
|
|
20
|
+
getLibraries: () => [],
|
|
21
|
+
getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, () => { }),
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
const pathMappings = [];
|
|
25
|
+
for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
|
|
26
|
+
if (libraries && libraries.includes(key)) {
|
|
27
|
+
const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(app_root_1.appRootPath, paths[0]));
|
|
28
|
+
pathMappings.push({
|
|
29
|
+
name: key,
|
|
30
|
+
path: pathToLib,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return {
|
|
35
|
+
getAliases: () => pathMappings.reduce((aliases, library) => (Object.assign(Object.assign({}, aliases), { [library.name]: library.path })), {}),
|
|
36
|
+
getLibraries: (eager) => pathMappings.reduce((libraries, library) => (Object.assign(Object.assign({}, libraries), { [library.name]: { requiredVersion: false, eager } })), {}),
|
|
37
|
+
getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, (req) => {
|
|
38
|
+
if (!req.request.startsWith('.')) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const from = req.context;
|
|
42
|
+
const to = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(req.context, req.request));
|
|
43
|
+
for (const library of pathMappings) {
|
|
44
|
+
const libFolder = (0, devkit_1.normalizePath)((0, path_1.dirname)(library.path));
|
|
45
|
+
if (!from.startsWith(libFolder) && to.startsWith(libFolder)) {
|
|
46
|
+
req.request = library.name;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
|
|
53
|
+
function sharePackages(packages) {
|
|
54
|
+
const pkgJsonPath = (0, devkit_1.joinPathFragments)(app_root_1.appRootPath, 'package.json');
|
|
55
|
+
if (!(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
56
|
+
throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
|
|
57
|
+
}
|
|
58
|
+
const pkgJson = JSON.parse((0, fs_1.readFileSync)(pkgJsonPath, 'utf-8'));
|
|
59
|
+
return packages.reduce((shared, pkgName) => (Object.assign(Object.assign({}, shared), { [pkgName]: {
|
|
60
|
+
singleton: true,
|
|
61
|
+
strictVersion: true,
|
|
62
|
+
requiredVersion: pkgJson.dependencies[pkgName],
|
|
63
|
+
} })), {});
|
|
64
|
+
}
|
|
65
|
+
exports.sharePackages = sharePackages;
|
|
66
|
+
//# sourceMappingURL=mfe-webpack.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/mfe-webpack.ts"],"names":[],"mappings":"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"}
|
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.angularArchitectsModuleFederationPluginVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.8.
|
|
4
|
+
exports.nxVersion = '13.8.8-beta.0';
|
|
5
5
|
exports.angularVersion = '~13.2.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.2.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|