@nrwl/angular 14.2.2 → 14.2.3
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
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.3](https://github.com/nrwl/nx/compare/14.2.2...14.2.3) (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.3",
|
|
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.3",
|
|
69
|
+
"@nrwl/devkit": "14.2.3",
|
|
70
|
+
"@nrwl/jest": "14.2.3",
|
|
71
|
+
"@nrwl/linter": "14.2.3",
|
|
72
|
+
"@nrwl/storybook": "14.2.3",
|
|
73
|
+
"@nrwl/workspace": "14.2.3",
|
|
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": "48246e8ba71770e0903774e513d528447af944d3"
|
|
97
97
|
}
|
|
@@ -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":"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
|
|
1
|
+
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":"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"}
|