@nrwl/angular 15.8.6 → 15.8.8
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/package.json +9 -9
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +12 -15
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/generators/storybook-configuration/schema.json +2 -1
- package/src/utils/mf/utils.js +8 -0
- package/src/utils/mf/utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.8.
|
|
3
|
+
"version": "15.8.8",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"repository": {
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.8.
|
|
67
|
-
"@nrwl/devkit": "15.8.
|
|
68
|
-
"@nrwl/jest": "15.8.
|
|
69
|
-
"@nrwl/js": "15.8.
|
|
70
|
-
"@nrwl/linter": "15.8.
|
|
71
|
-
"@nrwl/webpack": "15.8.
|
|
72
|
-
"@nrwl/workspace": "15.8.
|
|
66
|
+
"@nrwl/cypress": "15.8.8",
|
|
67
|
+
"@nrwl/devkit": "15.8.8",
|
|
68
|
+
"@nrwl/jest": "15.8.8",
|
|
69
|
+
"@nrwl/js": "15.8.8",
|
|
70
|
+
"@nrwl/linter": "15.8.8",
|
|
71
|
+
"@nrwl/webpack": "15.8.8",
|
|
72
|
+
"@nrwl/workspace": "15.8.8",
|
|
73
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
74
74
|
"chalk": "^4.1.0",
|
|
75
75
|
"chokidar": "^3.5.1",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
109
109
|
"typings": "index.d.ts",
|
|
110
110
|
"sideEffects": false,
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "6711c0ba67e76c42673240ed40e7125d9a61a127"
|
|
112
112
|
}
|
|
@@ -14,38 +14,35 @@ const rxjs_1 = require("rxjs");
|
|
|
14
14
|
const operators_2 = require("rxjs/operators");
|
|
15
15
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
16
16
|
function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
17
|
-
var _a, _b, _c
|
|
17
|
+
var _a, _b, _c;
|
|
18
18
|
process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
|
|
19
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
20
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
|
|
21
21
|
const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
|
|
22
22
|
const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
|
|
23
|
-
const
|
|
23
|
+
const buildTargetOptions = Object.assign(Object.assign({}, buildTarget.options), (parsedBrowserTarget.configuration
|
|
24
24
|
? buildTarget.configurations[parsedBrowserTarget.configuration]
|
|
25
25
|
: buildTarget.defaultConfiguration
|
|
26
26
|
? buildTarget.configurations[buildTarget.defaultConfiguration]
|
|
27
|
-
:
|
|
28
|
-
const buildLibsFromSource = (
|
|
29
|
-
const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
|
|
27
|
+
: {}));
|
|
28
|
+
const buildLibsFromSource = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetOptions.buildLibsFromSource) !== null && _b !== void 0 ? _b : true;
|
|
30
29
|
let pathToWebpackConfig;
|
|
31
|
-
if (customWebpackConfig
|
|
32
|
-
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
|
|
30
|
+
if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path) {
|
|
31
|
+
pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.customWebpackConfig.path);
|
|
33
32
|
if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
|
|
34
33
|
throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
|
|
35
34
|
}
|
|
36
35
|
}
|
|
37
|
-
const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
|
|
38
36
|
let pathToIndexFileTransformer;
|
|
39
|
-
if (indexFileTransformer) {
|
|
40
|
-
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
|
|
37
|
+
if (buildTargetOptions.indexFileTransformer) {
|
|
38
|
+
pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
|
|
41
39
|
if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
|
|
42
40
|
throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
43
|
let dependencies;
|
|
46
44
|
if (!buildLibsFromSource) {
|
|
47
|
-
const
|
|
48
|
-
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, {
|
|
45
|
+
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.tsConfig, context, {
|
|
49
46
|
target: parsedBrowserTarget.target,
|
|
50
47
|
});
|
|
51
48
|
dependencies = foundDependencies;
|
|
@@ -65,7 +62,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
65
62
|
// otherwise the build will fail if customWebpack function/file is referencing
|
|
66
63
|
// local libs. This synchronize the behavior with webpack-browser and
|
|
67
64
|
// webpack-server implementation.
|
|
68
|
-
|
|
65
|
+
buildTargetOptions.tsConfig = tsConfigPath;
|
|
69
66
|
}
|
|
70
67
|
return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
68
|
if (!buildLibsFromSource) {
|
|
@@ -83,10 +80,10 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
83
80
|
if (!pathToWebpackConfig) {
|
|
84
81
|
return baseWebpackConfig;
|
|
85
82
|
}
|
|
86
|
-
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig,
|
|
83
|
+
return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
|
|
87
84
|
}) }, (pathToIndexFileTransformer
|
|
88
85
|
? {
|
|
89
|
-
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer,
|
|
86
|
+
indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
|
|
90
87
|
}
|
|
91
88
|
: {})))));
|
|
92
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAG8B;AAC9B,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;AAC3C,wDAA8D;
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,8 @@
|
|
|
84
84
|
"description": "Configure your workspace to use Storybook 7, even though Storybook v7 is still in beta.",
|
|
85
85
|
"type": "boolean",
|
|
86
86
|
"default": false,
|
|
87
|
-
"hidden": true
|
|
87
|
+
"hidden": true,
|
|
88
|
+
"aliases": ["storybook7betaConfiguration"]
|
|
88
89
|
}
|
|
89
90
|
},
|
|
90
91
|
"additionalProperties": false,
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -22,6 +22,7 @@ exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = [
|
|
|
22
22
|
'@angular/common',
|
|
23
23
|
];
|
|
24
24
|
function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isServer: false }) {
|
|
25
|
+
var _a;
|
|
25
26
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
27
|
let projectGraph;
|
|
27
28
|
try {
|
|
@@ -30,7 +31,14 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
|
|
|
30
31
|
catch (e) {
|
|
31
32
|
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
32
33
|
}
|
|
34
|
+
if (!((_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
35
|
+
throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
|
|
36
|
+
}
|
|
33
37
|
const dependencies = (0, devkit_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
|
|
38
|
+
if (mfConfig.shared) {
|
|
39
|
+
dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.name, {}));
|
|
40
|
+
dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}));
|
|
41
|
+
}
|
|
34
42
|
const sharedLibraries = (0, devkit_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
35
43
|
const npmPackages = (0, devkit_1.sharePackages)(Array.from(new Set([
|
|
36
44
|
...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AAEtB,SAAgB,yBAAyB,CACvC,YAAiD;IAEjD,MAAM,gCAAgC,GAAG;QACvC,mBAAmB;QACnB,wBAAwB;KACzB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,gCAAgC,EAAE;QAClD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;YACtB,SAAS;SACV;QAED,YAAY,CAAC,GAAG,CAAC,mCAAQ,YAAY,CAAC,GAAG,CAAC,KAAE,KAAK,EAAE,IAAI,GAAE,CAAC;KAC3D;AACH,CAAC;AAdD,8DAcC;AAEY,QAAA,6BAA6B,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;AAChE,QAAA,iCAAiC,GAAG;IAC/C,qBAAqB;IACrB,iBAAiB;CAClB,CAAC;AAEF,SAAsB,yBAAyB,CAC7C,QAAgC,EAChC,kBAA8C,EAC9C,UAAiC,EAAE,QAAQ,EAAE,KAAK,EAAE
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":"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"}
|