@nrwl/angular 14.2.0-beta.1 → 14.2.0-beta.2
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/CHANGELOG.md +1 -1
- package/migrations.json +62 -2
- package/package.json +8 -8
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +1 -2
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/executors/utilities/tailwindcss.js +14 -9
- package/src/executors/utilities/tailwindcss.js.map +1 -1
- package/src/generators/component/component.d.ts +1 -1
- package/src/generators/component/component.js +29 -37
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/entry-point.d.ts +3 -0
- package/src/generators/component/lib/entry-point.js +35 -0
- package/src/generators/component/lib/entry-point.js.map +1 -0
- package/src/generators/component/lib/index.d.ts +3 -0
- package/src/generators/component/lib/index.js +7 -0
- package/src/generators/component/lib/index.js.map +1 -0
- package/src/generators/component/lib/module.d.ts +3 -0
- package/src/generators/component/lib/module.js +64 -0
- package/src/generators/component/lib/module.js.map +1 -0
- package/src/generators/component/lib/path.d.ts +1 -0
- package/src/generators/component/lib/path.js +11 -0
- package/src/generators/component/lib/path.js.map +1 -0
- package/src/generators/component/schema.json +1 -1
- package/src/utils/mfe/with-module-federation.js +2 -3
- package/src/utils/mfe/with-module-federation.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.2.0-beta.
|
|
6
|
+
# [14.2.0-beta.2](https://github.com/nrwl/nx/compare/14.1.9...14.2.0-beta.2) (2022-05-31)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/migrations.json
CHANGED
|
@@ -1119,8 +1119,8 @@
|
|
|
1119
1119
|
}
|
|
1120
1120
|
}
|
|
1121
1121
|
},
|
|
1122
|
-
"14.2.0": {
|
|
1123
|
-
"version": "14.2.0-beta.
|
|
1122
|
+
"14.2.0-beta.1": {
|
|
1123
|
+
"version": "14.2.0-beta.1",
|
|
1124
1124
|
"packages": {
|
|
1125
1125
|
"@angular-devkit/architect": {
|
|
1126
1126
|
"version": "~0.1400.0-rc.2",
|
|
@@ -1146,10 +1146,70 @@
|
|
|
1146
1146
|
"version": "~14.0.0-rc.2",
|
|
1147
1147
|
"alwaysAddToPackageJson": true
|
|
1148
1148
|
},
|
|
1149
|
+
"@angular/common": {
|
|
1150
|
+
"version": "~14.0.0-rc.2",
|
|
1151
|
+
"alwaysAddToPackageJson": false
|
|
1152
|
+
},
|
|
1153
|
+
"@angular/forms": {
|
|
1154
|
+
"version": "~14.0.0-rc.2",
|
|
1155
|
+
"alwaysAddToPackageJson": false
|
|
1156
|
+
},
|
|
1157
|
+
"@angular/elements": {
|
|
1158
|
+
"version": "~14.0.0-rc.2",
|
|
1159
|
+
"alwaysAddToPackageJson": false
|
|
1160
|
+
},
|
|
1161
|
+
"@angular/compiler": {
|
|
1162
|
+
"version": "~14.0.0-rc.2",
|
|
1163
|
+
"alwaysAddToPackageJson": false
|
|
1164
|
+
},
|
|
1165
|
+
"@angular/compiler-cli": {
|
|
1166
|
+
"version": "~14.0.0-rc.2",
|
|
1167
|
+
"alwaysAddToPackageJson": false
|
|
1168
|
+
},
|
|
1169
|
+
"@angular/localize": {
|
|
1170
|
+
"version": "~14.0.0-rc.2",
|
|
1171
|
+
"alwaysAddToPackageJson": false
|
|
1172
|
+
},
|
|
1173
|
+
"@angular/platform-browser": {
|
|
1174
|
+
"version": "~14.0.0-rc.2",
|
|
1175
|
+
"alwaysAddToPackageJson": false
|
|
1176
|
+
},
|
|
1177
|
+
"@angular/platform-browser-dynamic": {
|
|
1178
|
+
"version": "~14.0.0-rc.2",
|
|
1179
|
+
"alwaysAddToPackageJson": false
|
|
1180
|
+
},
|
|
1181
|
+
"@angular/platform-server": {
|
|
1182
|
+
"version": "~14.0.0-rc.2",
|
|
1183
|
+
"alwaysAddToPackageJson": false
|
|
1184
|
+
},
|
|
1185
|
+
"@angular/router": {
|
|
1186
|
+
"version": "~14.0.0-rc.2",
|
|
1187
|
+
"alwaysAddToPackageJson": false
|
|
1188
|
+
},
|
|
1189
|
+
"@angular/upgrade": {
|
|
1190
|
+
"version": "~14.0.0-rc.2",
|
|
1191
|
+
"alwaysAddToPackageJson": false
|
|
1192
|
+
},
|
|
1193
|
+
"@angular/language-service": {
|
|
1194
|
+
"version": "~14.0.0-rc.2",
|
|
1195
|
+
"alwaysAddToPackageJson": false
|
|
1196
|
+
},
|
|
1197
|
+
"@angular/animations": {
|
|
1198
|
+
"version": "~14.0.0-rc.2",
|
|
1199
|
+
"alwaysAddToPackageJson": false
|
|
1200
|
+
},
|
|
1201
|
+
"@angular/service-worker": {
|
|
1202
|
+
"version": "~14.0.0-rc.2",
|
|
1203
|
+
"alwaysAddToPackageJson": false
|
|
1204
|
+
},
|
|
1149
1205
|
"@angular/material": {
|
|
1150
1206
|
"version": "~14.0.0-rc.1",
|
|
1151
1207
|
"alwaysAddToPackageJson": false
|
|
1152
1208
|
},
|
|
1209
|
+
"@angular/cdk": {
|
|
1210
|
+
"version": "~14.0.0-rc.1",
|
|
1211
|
+
"alwaysAddToPackageJson": false
|
|
1212
|
+
},
|
|
1153
1213
|
"ng-packagr": {
|
|
1154
1214
|
"version": "~14.0.0-rc.0",
|
|
1155
1215
|
"alwaysAddToPackageJson": false
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.2.0-beta.
|
|
3
|
+
"version": "14.2.0-beta.2",
|
|
4
4
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,12 +65,12 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~14.0.0-rc.2",
|
|
68
|
-
"@nrwl/cypress": "14.2.0-beta.
|
|
69
|
-
"@nrwl/devkit": "14.2.0-beta.
|
|
70
|
-
"@nrwl/jest": "14.2.0-beta.
|
|
71
|
-
"@nrwl/linter": "14.2.0-beta.
|
|
72
|
-
"@nrwl/storybook": "14.2.0-beta.
|
|
73
|
-
"@nrwl/workspace": "14.2.0-beta.
|
|
68
|
+
"@nrwl/cypress": "14.2.0-beta.2",
|
|
69
|
+
"@nrwl/devkit": "14.2.0-beta.2",
|
|
70
|
+
"@nrwl/jest": "14.2.0-beta.2",
|
|
71
|
+
"@nrwl/linter": "14.2.0-beta.2",
|
|
72
|
+
"@nrwl/storybook": "14.2.0-beta.2",
|
|
73
|
+
"@nrwl/workspace": "14.2.0-beta.2",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
75
|
"@schematics/angular": "~14.0.0-rc.2",
|
|
76
76
|
"chalk": "4.1.0",
|
|
@@ -93,5 +93,5 @@
|
|
|
93
93
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
94
94
|
"typings": "index.d.ts",
|
|
95
95
|
"sideEffects": false,
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "e491c6f7382064fb1f17c0dcd2e642428ca822e4"
|
|
97
97
|
}
|
|
@@ -34,8 +34,7 @@ function getDynamicRemotesIfExists(context, p) {
|
|
|
34
34
|
return [];
|
|
35
35
|
}
|
|
36
36
|
function executeModuleFederationDevServerBuilder(schema, context) {
|
|
37
|
-
const
|
|
38
|
-
const workspaceConfig = workspaces.readWorkspaceConfiguration();
|
|
37
|
+
const workspaceConfig = (0, devkit_1.readAllWorkspaceConfiguration)();
|
|
39
38
|
const p = workspaceConfig.projects[context.target.project];
|
|
40
39
|
const mfConfigPath = (0, path_1.join)(context.workspaceRoot, p.root, 'module-federation.config.js');
|
|
41
40
|
let mfeConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ function executeWebpackServerBuilder(schema, context) {
|
|
|
13
13
|
var _a;
|
|
14
14
|
process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
|
|
15
15
|
const options = (0, lib_1.normalizeOptions)(schema);
|
|
16
|
-
const workspaceConfig =
|
|
16
|
+
const workspaceConfig = (0, devkit_1.readAllWorkspaceConfiguration)();
|
|
17
17
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
|
|
18
18
|
const buildTarget = workspaceConfig.projects[parsedBrowserTarget.project].targets[parsedBrowserTarget.target];
|
|
19
19
|
const selectedConfiguration = parsedBrowserTarget.configuration
|
|
@@ -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,
|
|
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,yCAKsB;AACtB,2BAAgC;AAChC,iDAAsC;AACtC,kDAAkE;AAClE,+BAAyC;AAGzC,SAAgB,2BAA2B,CACzC,MAAc,EACd,OAAuB;;IAEvB,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,IAAA,sCAA6B,GAAE,CAAC;IAExD,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,gFAAgF;oBAChF,yFAAyF;oBACzF,4CAA4C;oBAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;oBAEhD,0FAA0F;oBAC1F,4DAA4D;oBAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;wBAChC,OAAO,MAAM,CACX,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,CAAC,MAAM,CACf,CAAC;qBACH;yBAAM;wBACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;qBACzC;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,kEA0EC;AAED,kBAAe,IAAA,yBAAa,EAC1B,2BAA2B,CACrB,CAAC"}
|
|
@@ -17,15 +17,7 @@ exports.tailwindDirectives = [
|
|
|
17
17
|
function getTailwindSetup(basePath, tailwindConfig) {
|
|
18
18
|
let tailwindConfigPath = tailwindConfig;
|
|
19
19
|
if (!tailwindConfigPath) {
|
|
20
|
-
|
|
21
|
-
const tailwindConfigFile = 'tailwind.config.js';
|
|
22
|
-
for (const path of [basePath, devkit_2.workspaceRoot]) {
|
|
23
|
-
const fullPath = (0, path_1.join)(path, tailwindConfigFile);
|
|
24
|
-
if ((0, fs_1.existsSync)(fullPath)) {
|
|
25
|
-
tailwindConfigPath = fullPath;
|
|
26
|
-
break;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
20
|
+
tailwindConfigPath = getTailwindConfigPath(basePath, devkit_2.workspaceRoot);
|
|
29
21
|
}
|
|
30
22
|
// Only load Tailwind CSS plugin if configuration file was found.
|
|
31
23
|
if (!tailwindConfigPath) {
|
|
@@ -48,6 +40,19 @@ function getTailwindSetup(basePath, tailwindConfig) {
|
|
|
48
40
|
return { tailwindConfigPath, tailwindPackagePath };
|
|
49
41
|
}
|
|
50
42
|
exports.getTailwindSetup = getTailwindSetup;
|
|
43
|
+
function getTailwindConfigPath(projectRoot, workspaceRoot) {
|
|
44
|
+
// valid tailwind config files https://github.com/tailwindlabs/tailwindcss/blob/master/src/util/resolveConfigPath.js#L46
|
|
45
|
+
const tailwindConfigFiles = ['tailwind.config.js', 'tailwind.config.cjs'];
|
|
46
|
+
for (const basePath of [projectRoot, workspaceRoot]) {
|
|
47
|
+
for (const configFile of tailwindConfigFiles) {
|
|
48
|
+
const fullPath = (0, path_1.join)(basePath, configFile);
|
|
49
|
+
if ((0, fs_1.existsSync)(fullPath)) {
|
|
50
|
+
return fullPath;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
51
56
|
function getTailwindPostCssPlugins({ tailwindConfigPath, tailwindPackagePath }, includePaths, watch) {
|
|
52
57
|
if (process.env['TAILWIND_MODE'] === undefined) {
|
|
53
58
|
process.env['TAILWIND_MODE'] = watch ? 'watch' : 'build';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,yCAA6C;AAC7C,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB
|
|
1
|
+
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,yCAA6C;AAC7C,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,kBAAkB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,sBAAa,CAAC,CAAC;KACrE;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAa,EACb,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AArCD,4CAqCC;AAED,SAAS,qBAAqB,CAC5B,WAAmB,EACnB,aAAqB;IAErB,wHAAwH;IACxH,MAAM,mBAAmB,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;IAE1E,KAAK,MAAM,QAAQ,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE;QACnD,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC5C,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
|
|
@@ -4,15 +4,15 @@ exports.componentGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
7
|
-
const devkit_2 = require("@nrwl/devkit");
|
|
8
7
|
const path_1 = require("../utils/path");
|
|
8
|
+
const lib_1 = require("./lib");
|
|
9
9
|
function componentGenerator(tree, schema) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
checkPathUnderProjectRoot(tree, schema);
|
|
12
12
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
13
13
|
yield angularComponentSchematic(tree, Object.assign({}, schema));
|
|
14
|
-
|
|
15
|
-
yield (0,
|
|
14
|
+
exportComponentInEntryPoint(tree, schema);
|
|
15
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
exports.componentGenerator = componentGenerator;
|
|
@@ -21,57 +21,49 @@ function checkPathUnderProjectRoot(tree, schema) {
|
|
|
21
21
|
if (!schema.path) {
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0,
|
|
25
|
-
const { root } = (0,
|
|
26
|
-
let pathToComponent = (0,
|
|
24
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
25
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
26
|
+
let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
|
|
27
27
|
pathToComponent = pathToComponent.startsWith('/')
|
|
28
28
|
? pathToComponent.slice(1)
|
|
29
29
|
: pathToComponent;
|
|
30
30
|
if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
|
|
31
|
-
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root})
|
|
31
|
+
throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
|
|
32
|
+
`Please make sure to provide a path that exists under the project root.`);
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
|
-
function
|
|
35
|
-
var _a, _b
|
|
35
|
+
function exportComponentInEntryPoint(tree, schema) {
|
|
36
|
+
var _a, _b;
|
|
36
37
|
if (!schema.export || schema.skipImport) {
|
|
37
38
|
return;
|
|
38
39
|
}
|
|
39
|
-
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0,
|
|
40
|
-
const { root, sourceRoot, projectType } = (0,
|
|
40
|
+
const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
41
|
+
const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
41
42
|
if (projectType === 'application') {
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
44
45
|
const componentNames = (0, devkit_1.names)(schema.name);
|
|
45
|
-
const componentFileName = `${componentNames.fileName}.${
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
? (0, devkit_2.normalizePath)(schema.path)
|
|
52
|
-
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
53
|
-
}
|
|
46
|
+
const componentFileName = `${componentNames.fileName}.${schema.type ? (0, devkit_1.names)(schema.type).fileName : 'component'}`;
|
|
47
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
48
|
+
(_b = schema.path) !== null && _b !== void 0 ? _b : (schema.path = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'lib'));
|
|
49
|
+
const componentDirectory = schema.flat
|
|
50
|
+
? (0, devkit_1.normalizePath)(schema.path)
|
|
51
|
+
: (0, devkit_1.joinPathFragments)(schema.path, componentNames.fileName);
|
|
54
52
|
const componentFilePath = (0, devkit_1.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (!
|
|
63
|
-
// Let's not error, simply warn the user
|
|
64
|
-
// It's not too much effort to manually do this
|
|
65
|
-
// It would be more frustrating to have to find the correct path and re-run the command
|
|
66
|
-
devkit_1.logger.warn(`Could not export the component in the library's entry point. Unable to determine project's entry point. The path ${projectEntryPoint} does not exist. The component has still been created.`);
|
|
53
|
+
const entryPointPath = (0, lib_1.locateLibraryEntryPointFromDirectory)(tree, componentDirectory, root, projectSourceRoot);
|
|
54
|
+
if (!entryPointPath) {
|
|
55
|
+
devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
|
|
56
|
+
`The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const modulePath = (0, lib_1.findModuleFromOptions)(tree, schema, root);
|
|
60
|
+
if (!(0, lib_1.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
|
|
67
61
|
return;
|
|
68
62
|
}
|
|
69
|
-
const relativePathFromEntryPoint =
|
|
70
|
-
|
|
71
|
-
.replace('.ts', '')}`;
|
|
72
|
-
const updateEntryPointContent = `${tree.read(projectEntryPoint, 'utf-8')}
|
|
63
|
+
const relativePathFromEntryPoint = (0, lib_1.getRelativeImportToFile)(entryPointPath, componentFilePath);
|
|
64
|
+
const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
|
|
73
65
|
export * from "${relativePathFromEntryPoint}";`;
|
|
74
|
-
tree.write(
|
|
66
|
+
tree.write(entryPointPath, updateEntryPointContent);
|
|
75
67
|
}
|
|
76
68
|
exports.default = componentGenerator;
|
|
77
69
|
//# sourceMappingURL=component.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { Tree } from '@nrwl/devkit';
|
|
2
|
+
export declare function locateLibraryEntryPointFromDirectory(tree: Tree, directory: string, projectRoot: string, projectSourceRoot: string): string | null;
|
|
3
|
+
export declare function shouldExportInEntryPoint(tree: Tree, entryPoint: string, modulePath: string): boolean;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldExportInEntryPoint = exports.locateLibraryEntryPointFromDirectory = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const path_2 = require("./path");
|
|
8
|
+
function locateLibraryEntryPointFromDirectory(tree, directory, projectRoot, projectSourceRoot) {
|
|
9
|
+
var _a;
|
|
10
|
+
const ngPackageJsonPath = (0, devkit_1.joinPathFragments)(directory, 'ng-package.json');
|
|
11
|
+
let entryPointFile = tree.exists(ngPackageJsonPath)
|
|
12
|
+
? (_a = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _a === void 0 ? void 0 : _a.entryFile
|
|
13
|
+
: null;
|
|
14
|
+
if (entryPointFile) {
|
|
15
|
+
return (0, devkit_1.joinPathFragments)(directory, entryPointFile);
|
|
16
|
+
}
|
|
17
|
+
if (directory === projectRoot) {
|
|
18
|
+
const indexFile = (0, devkit_1.joinPathFragments)(projectSourceRoot, 'index.ts');
|
|
19
|
+
return tree.exists(indexFile) ? indexFile : null;
|
|
20
|
+
}
|
|
21
|
+
return locateLibraryEntryPointFromDirectory(tree, (0, path_1.dirname)(directory), projectRoot, projectSourceRoot);
|
|
22
|
+
}
|
|
23
|
+
exports.locateLibraryEntryPointFromDirectory = locateLibraryEntryPointFromDirectory;
|
|
24
|
+
function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
|
|
25
|
+
if (!modulePath) {
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
const moduleImportPath = (0, path_2.getRelativeImportToFile)(entryPoint, modulePath);
|
|
29
|
+
const entryPointContent = tree.read(entryPoint, 'utf-8');
|
|
30
|
+
const entryPointAst = tsquery_1.tsquery.ast(entryPointContent);
|
|
31
|
+
const moduleExport = (0, tsquery_1.tsquery)(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
|
|
32
|
+
return Boolean(moduleExport);
|
|
33
|
+
}
|
|
34
|
+
exports.shouldExportInEntryPoint = shouldExportInEntryPoint;
|
|
35
|
+
//# sourceMappingURL=entry-point.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/entry-point.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAC3D,uDAAoD;AACpD,+BAA+B;AAE/B,iCAAiD;AAEjD,SAAgB,oCAAoC,CAClD,IAAU,EACV,SAAiB,EACjB,WAAmB,EACnB,iBAAyB;;IAEzB,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC1E,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;QACjD,CAAC,CAAC,MAAA,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,GAAG,0CAAE,SAAS;QAClD,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,cAAc,EAAE;QAClB,OAAO,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;KACrD;IAED,IAAI,SAAS,KAAK,WAAW,EAAE;QAC7B,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAEnE,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;KAClD;IAED,OAAO,oCAAoC,CACzC,IAAI,EACJ,IAAA,cAAO,EAAC,SAAS,CAAC,EAClB,WAAW,EACX,iBAAiB,CAClB,CAAC;AACJ,CAAC;AA3BD,oFA2BC;AAED,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAA,iBAAO,EAC1B,aAAa,EACb,0CAA0C,gBAAgB,IAAI,EAC9D,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAkB,CAAC;IAEtB,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AAnBD,4DAmBC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
tslib_1.__exportStar(require("./entry-point"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./module"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./path"), exports);
|
|
7
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,mDAAyB;AACzB,iDAAuB"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.findModuleFromOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
// Adapted from https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/find-module.ts#L29
|
|
7
|
+
// to match the logic in the component schematic. It doesn't throw if it can't
|
|
8
|
+
// find a module since the schematic would have thrown before getting here.
|
|
9
|
+
const moduleExt = '.module.ts';
|
|
10
|
+
const routingModuleExt = '-routing.module.ts';
|
|
11
|
+
function findModuleFromOptions(tree, options, projectRoot) {
|
|
12
|
+
if (!options.module) {
|
|
13
|
+
const pathToCheck = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
14
|
+
return (0, devkit_1.normalizePath)(findModule(tree, pathToCheck, projectRoot));
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
const modulePath = (0, devkit_1.joinPathFragments)(options.path, options.module);
|
|
18
|
+
const componentPath = (0, devkit_1.joinPathFragments)(options.path, options.name);
|
|
19
|
+
const moduleBaseName = (0, path_1.basename)(modulePath);
|
|
20
|
+
const candidateSet = new Set([options.path]);
|
|
21
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
22
|
+
for (let dir = modulePath; dir !== projectRootParent; dir = (0, path_1.dirname)(dir)) {
|
|
23
|
+
candidateSet.add(dir);
|
|
24
|
+
}
|
|
25
|
+
for (let dir = componentPath; dir !== projectRoot; dir = (0, path_1.dirname)(dir)) {
|
|
26
|
+
candidateSet.add(dir);
|
|
27
|
+
}
|
|
28
|
+
const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
|
|
29
|
+
for (const c of candidatesDirs) {
|
|
30
|
+
const candidateFiles = [
|
|
31
|
+
'',
|
|
32
|
+
`${moduleBaseName}.ts`,
|
|
33
|
+
`${moduleBaseName}${moduleExt}`,
|
|
34
|
+
].map((x) => (0, devkit_1.joinPathFragments)(c, x));
|
|
35
|
+
for (const sc of candidateFiles) {
|
|
36
|
+
if (tree.isFile(sc)) {
|
|
37
|
+
return (0, devkit_1.normalizePath)(sc);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.findModuleFromOptions = findModuleFromOptions;
|
|
45
|
+
function findModule(tree, generateDir, projectRoot) {
|
|
46
|
+
let dir = generateDir;
|
|
47
|
+
const projectRootParent = (0, path_1.dirname)(projectRoot);
|
|
48
|
+
while (dir !== projectRootParent) {
|
|
49
|
+
const allMatches = tree
|
|
50
|
+
.children(dir)
|
|
51
|
+
.map((path) => (0, devkit_1.joinPathFragments)(dir, path))
|
|
52
|
+
.filter((path) => tree.isFile(path) && path.endsWith(moduleExt));
|
|
53
|
+
const filteredMatches = allMatches.filter((path) => !path.endsWith(routingModuleExt));
|
|
54
|
+
if (filteredMatches.length == 1) {
|
|
55
|
+
return filteredMatches[0];
|
|
56
|
+
}
|
|
57
|
+
else if (filteredMatches.length > 1) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
dir = (0, path_1.dirname)(dir);
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=module.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAChE,+BAAyC;AAGzC,uHAAuH;AACvH,8EAA8E;AAC9E,2EAA2E;AAC3E,MAAM,SAAS,GAAG,YAAY,CAAC;AAC/B,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAE9C,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAAe,EACf,WAAmB;IAEnB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAElE,OAAO,IAAA,sBAAa,EAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;KAClE;SAAM;QACL,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAA,eAAQ,EAAC,UAAU,CAAC,CAAC;QAE5C,MAAM,YAAY,GAAG,IAAI,GAAG,CAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAErD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;QAC/C,KAAK,IAAI,GAAG,GAAG,UAAU,EAAE,GAAG,KAAK,iBAAiB,EAAE,GAAG,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,EAAE;YACxE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;QACD,KAAK,IAAI,GAAG,GAAG,aAAa,EAAE,GAAG,KAAK,WAAW,EAAE,GAAG,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,EAAE;YACrE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACvB;QAED,MAAM,cAAc,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAC9B,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE;YAC9B,MAAM,cAAc,GAAG;gBACrB,EAAE;gBACF,GAAG,cAAc,KAAK;gBACtB,GAAG,cAAc,GAAG,SAAS,EAAE;aAChC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAiB,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAEtC,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE;gBAC/B,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;oBACnB,OAAO,IAAA,sBAAa,EAAC,EAAE,CAAC,CAAC;iBAC1B;aACF;SACF;QAED,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AA3CD,sDA2CC;AAED,SAAS,UAAU,CACjB,IAAU,EACV,WAAmB,EACnB,WAAmB;IAEnB,IAAI,GAAG,GAAG,WAAW,CAAC;IACtB,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;IAE/C,OAAO,GAAG,KAAK,iBAAiB,EAAE;QAChC,MAAM,UAAU,GAAG,IAAI;aACpB,QAAQ,CAAC,GAAG,CAAC;aACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,0BAAiB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;aAC3C,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAC3C,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC/B,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;SAC3B;aAAM,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;QAED,GAAG,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getRelativeImportToFile = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
function getRelativeImportToFile(sourceFilePath, targetFilePath) {
|
|
7
|
+
const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
|
|
8
|
+
return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
|
|
9
|
+
}
|
|
10
|
+
exports.getRelativeImportToFile = getRelativeImportToFile;
|
|
11
|
+
//# sourceMappingURL=path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/path.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAAmD;AAEnD,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC"}
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
},
|
|
109
109
|
"export": {
|
|
110
110
|
"type": "boolean",
|
|
111
|
-
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`).",
|
|
111
|
+
"description": "Specifies if the component should be exported in the declaring `NgModule`. Additionally, if the project is a library, the component will be exported from the project's entry point (normally `index.ts`) if the module it belongs to is also exported.",
|
|
112
112
|
"default": false
|
|
113
113
|
}
|
|
114
114
|
},
|
|
@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const mfe_webpack_1 = require("./mfe-webpack");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
|
-
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
9
8
|
const utils_1 = require("./utils");
|
|
10
9
|
const path_1 = require("path");
|
|
11
10
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
@@ -31,7 +30,7 @@ function collectDependencies(projectGraph, name, dependencies = {
|
|
|
31
30
|
}
|
|
32
31
|
function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
33
32
|
var _a, _b;
|
|
34
|
-
const { projects } =
|
|
33
|
+
const { projects } = (0, devkit_1.readAllWorkspaceConfiguration)();
|
|
35
34
|
const tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)();
|
|
36
35
|
const tsConfig = (0, typescript_1.readTsConfig)(tsConfigPath);
|
|
37
36
|
const tsconfigPathAliases = (_b = tsConfig.options) === null || _b === void 0 ? void 0 : _b.paths;
|
|
@@ -67,7 +66,7 @@ function getDependentPackagesForProject(projectGraph, name) {
|
|
|
67
66
|
});
|
|
68
67
|
}
|
|
69
68
|
function determineRemoteUrl(remote) {
|
|
70
|
-
const workspace = (0,
|
|
69
|
+
const workspace = (0, devkit_1.readAllWorkspaceConfiguration)();
|
|
71
70
|
let publicHost = '';
|
|
72
71
|
try {
|
|
73
72
|
publicHost = workspace.projects[remote].targets.serve.options.publicHost;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,+CAKuB;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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"}
|