@nrwl/angular 14.2.1 → 14.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +8 -8
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +44 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js +2 -1
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js.map +1 -1
- package/src/utils/mfe/mfe-webpack.js +38 -0
- package/src/utils/mfe/mfe-webpack.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.
|
|
6
|
+
## [14.2.4](https://github.com/nrwl/nx/compare/14.2.2...14.2.4) (2022-06-09)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.2.
|
|
3
|
+
"version": "14.2.4",
|
|
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",
|
|
68
|
-
"@nrwl/cypress": "14.2.
|
|
69
|
-
"@nrwl/devkit": "14.2.
|
|
70
|
-
"@nrwl/jest": "14.2.
|
|
71
|
-
"@nrwl/linter": "14.2.
|
|
72
|
-
"@nrwl/storybook": "14.2.
|
|
73
|
-
"@nrwl/workspace": "14.2.
|
|
68
|
+
"@nrwl/cypress": "14.2.4",
|
|
69
|
+
"@nrwl/devkit": "14.2.4",
|
|
70
|
+
"@nrwl/jest": "14.2.4",
|
|
71
|
+
"@nrwl/linter": "14.2.4",
|
|
72
|
+
"@nrwl/storybook": "14.2.4",
|
|
73
|
+
"@nrwl/workspace": "14.2.4",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
75
|
"@schematics/angular": "~14.0.0",
|
|
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": "3e3ab094cf1a7cc7c126919622cc7dac011ddd97"
|
|
97
97
|
}
|
|
@@ -44,6 +44,7 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
|
|
|
44
44
|
es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
45
45
|
esm2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
46
46
|
typings: relativeUnixFromDestPath(destinationFiles.declarations),
|
|
47
|
+
exports: generatePackageExports(ngEntryPoint, graph),
|
|
47
48
|
// webpack v4+ specific flag to enable advanced optimizations and code splitting
|
|
48
49
|
sideEffects: (_a = ngEntryPoint.packageJson.sideEffects) !== null && _a !== void 0 ? _a : false,
|
|
49
50
|
}, !!options.watch);
|
|
@@ -225,4 +226,47 @@ function checkNonPeerDependencies(packageJson, property, allowed) {
|
|
|
225
226
|
}
|
|
226
227
|
}
|
|
227
228
|
}
|
|
229
|
+
/**
|
|
230
|
+
* Generates the `package.json` package exports following APF v13.
|
|
231
|
+
* This is supposed to match with: https://github.com/angular/angular/blob/e0667efa6eada64d1fb8b143840689090fc82e52/packages/bazel/src/ng_package/packager.ts#L415.
|
|
232
|
+
*/
|
|
233
|
+
function generatePackageExports({ destinationPath, packageJson }, graph) {
|
|
234
|
+
const exports = packageJson.exports
|
|
235
|
+
? JSON.parse(JSON.stringify(packageJson.exports))
|
|
236
|
+
: {};
|
|
237
|
+
const insertMappingOrError = (subpath, mapping) => {
|
|
238
|
+
if (exports[subpath] === undefined) {
|
|
239
|
+
exports[subpath] = {};
|
|
240
|
+
}
|
|
241
|
+
const subpathExport = exports[subpath];
|
|
242
|
+
// Go through all conditions that should be inserted. If the condition is already
|
|
243
|
+
// manually set of the subpath export, we throw an error. In general, we allow for
|
|
244
|
+
// additional conditions to be set. These will always precede the generated ones.
|
|
245
|
+
for (const conditionName of Object.keys(mapping)) {
|
|
246
|
+
if (subpathExport[conditionName] !== undefined) {
|
|
247
|
+
throw Error(`Found a conflicting export condition for "${subpath}". The "${conditionName}" ` +
|
|
248
|
+
`condition would be overridden by ng-packagr. Please unset it.`);
|
|
249
|
+
}
|
|
250
|
+
// **Note**: The order of the conditions is preserved even though we are setting
|
|
251
|
+
// the conditions once at a time (the latest assignment will be at the end).
|
|
252
|
+
subpathExport[conditionName] = mapping[conditionName];
|
|
253
|
+
}
|
|
254
|
+
};
|
|
255
|
+
const relativeUnixFromDestPath = (filePath) => './' + (0, path_1.ensureUnixPath)(path.relative(destinationPath, filePath));
|
|
256
|
+
insertMappingOrError('./package.json', { default: './package.json' });
|
|
257
|
+
const entryPoints = graph.filter(nodes_1.isEntryPoint);
|
|
258
|
+
for (const entryPoint of entryPoints) {
|
|
259
|
+
const { destinationFiles, isSecondaryEntryPoint } = entryPoint.data.entryPoint;
|
|
260
|
+
const subpath = isSecondaryEntryPoint
|
|
261
|
+
? `./${destinationFiles.directory}`
|
|
262
|
+
: '.';
|
|
263
|
+
insertMappingOrError(subpath, {
|
|
264
|
+
types: relativeUnixFromDestPath(destinationFiles.declarations),
|
|
265
|
+
es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
266
|
+
esm2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
267
|
+
default: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
return exports;
|
|
271
|
+
}
|
|
228
272
|
//# sourceMappingURL=write-package.transform.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,yCAAsC;AAEtC,oDAAiD;AACjD,8DAAsE;AAEtE,
|
|
1
|
+
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,8 @@ function default_1(tree) {
|
|
|
18
18
|
}
|
|
19
19
|
(0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
|
|
20
20
|
if ((0, path_1.basename)(filePath) !== 'package.json' ||
|
|
21
|
-
|
|
21
|
+
(0, devkit_1.normalizePath)(filePath) ===
|
|
22
|
+
(0, devkit_1.joinPathFragments)(project.root, 'package.json')) {
|
|
22
23
|
return;
|
|
23
24
|
}
|
|
24
25
|
const json = (0, devkit_1.readJson)(tree, filePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-libraries-secondary-entrypoints.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-libraries-secondary-entrypoints.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,+BAAyC;AAEzC,MAAM,gBAAgB,GAAG;IACvB,0CAA0C;IAC1C,+BAA+B;IAC/B,uBAAuB;CACxB,CAAC;AAEF,mBAA+B,IAAU;;;QACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAClC,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACpD,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAC3C,EACD;gBACA,SAAS;aACV;YAED,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACpD,IACE,IAAA,eAAQ,EAAC,QAAQ,CAAC,KAAK,cAAc;oBACrC,IAAA,sBAAa,EAAC,QAAQ,CAAC;wBACrB,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,EACjD;oBACA,OAAO;iBACR;gBAED,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACtC,IAAI,IAAI,CAAC,SAAS,EAAE;oBAClB,0DAA0D;oBAC1D,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,IAAA,cAAO,EAAC,QAAQ,CAAC,EACjB,iBAAiB,CAClB,CAAC;oBACF,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;iBACjD;gBAED,2DAA2D;gBAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AArCD,4BAqCC"}
|
|
@@ -8,6 +8,40 @@ const package_json_1 = require("nx/src/utils/package-json");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const webpack_1 = require("webpack");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
|
+
function traverseUpFileTreeAndPerformActionUntil(dirPath, endPath, action) {
|
|
12
|
+
while (dirPath !== endPath) {
|
|
13
|
+
if (action(dirPath)) {
|
|
14
|
+
break;
|
|
15
|
+
}
|
|
16
|
+
dirPath = (0, path_1.dirname)(dirPath);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function collectWorkspaceLibrarySecondaryEntryPoints(library, libraryPath, tsconfigPathAliases) {
|
|
20
|
+
let libraryRootDirPath = libraryPath;
|
|
21
|
+
traverseUpFileTreeAndPerformActionUntil((0, path_1.dirname)(libraryRootDirPath), devkit_1.workspaceRoot, (currentDirPath) => {
|
|
22
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(currentDirPath, 'package.json'))) {
|
|
23
|
+
libraryRootDirPath = currentDirPath;
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
const aliasesUnderLibrary = Object.keys(tsconfigPathAliases).filter((libName) => libName.startsWith(library) && libName !== library);
|
|
28
|
+
const secondaryEntryPoints = [];
|
|
29
|
+
for (const alias of aliasesUnderLibrary) {
|
|
30
|
+
const pathToLib = (0, path_1.dirname)((0, path_1.join)(devkit_1.workspaceRoot, tsconfigPathAliases[alias][0]));
|
|
31
|
+
let isSecondaryEntrypoint = false;
|
|
32
|
+
let searchDir = pathToLib;
|
|
33
|
+
traverseUpFileTreeAndPerformActionUntil(searchDir, libraryRootDirPath, (currentDirPath) => {
|
|
34
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(currentDirPath, 'ng-package.json'))) {
|
|
35
|
+
isSecondaryEntrypoint = true;
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
if (isSecondaryEntrypoint) {
|
|
40
|
+
secondaryEntryPoints.push({ name: alias, path: pathToLib });
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return secondaryEntryPoints;
|
|
44
|
+
}
|
|
11
45
|
function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
12
46
|
var _a, _b;
|
|
13
47
|
if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
|
|
@@ -27,6 +61,10 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
27
61
|
for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
|
|
28
62
|
if (libraries && libraries.includes(key)) {
|
|
29
63
|
const pathToLib = (0, path_1.normalize)((0, path_1.join)(devkit_1.workspaceRoot, paths[0]));
|
|
64
|
+
collectWorkspaceLibrarySecondaryEntryPoints(key, pathToLib, tsconfigPathAliases).forEach(({ name, path }) => pathMappings.push({
|
|
65
|
+
name,
|
|
66
|
+
path,
|
|
67
|
+
}));
|
|
30
68
|
pathMappings.push({
|
|
31
69
|
name: key,
|
|
32
70
|
path: pathToLib,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAGkD;AAClD,2BAAwD;AACxD,4DAA+E;AAC/E,+BAA0D;AAE1D,qCAAwD;AACxD,mCAA8C;AAS9C,SAAgB,uBAAuB,CACrC,SAAmB,EACnB,YAAoE;;iCAApE,EAAA,qBAAe,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAI,IAAA,gCAAmB,GAAE;IAEpE,IAAI,CAAC,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;QAC7B,MAAM,IAAI,KAAK,CACb,kEAAkE,YAAY,GAAG,CAClF,CAAC;KACH;IAED,MAAM,QAAQ,GAAsB,IAAA,yBAAY,EAAC,YAAY,CAAC,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,KAAK,CAAC;IAEpD,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO;YACL,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE;YACpB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;YACxB,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC;SACnD,CAAC;KACH;IAED,MAAM,YAAY,GAAqC,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;QAC9D,IAAI,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;SACJ;KACF;IAED,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CACf,YAAY,CAAC,MAAM,CACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,IAAG,EACpE,EAAE,CACH;QACH,YAAY,EAAE,CAAC,KAAe,EAAuC,EAAE,CACrE,YAAY,CAAC,MAAM,CACjB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,iCACnB,SAAS,KACZ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,IACjD,EACF,EAAyC,CAC1C;QACH,oBAAoB,EAAE,GAAG,EAAE,CACzB,IAAI,uCAA6B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAChC,OAAO;aACR;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;YACzB,MAAM,EAAE,GAAG,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAErD,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;gBAClC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnD,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;oBAC3B,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;oBACxB,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC5B;oBACA,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;iBAC5B;aACF;QACH,CAAC,CAAC;KACL,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":"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"}
|