@nx/angular 16.0.0-beta.7 → 16.0.0-rc.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/package.json +10 -11
- package/src/generators/setup-mf/lib/setup-serve-target.js +1 -0
- package/src/generators/setup-mf/lib/setup-serve-target.js.map +1 -1
- package/src/generators/utils/storybook-ast/tree-utilities.js.map +1 -1
- package/src/utils/mf/utils.d.ts +1 -1
- package/src/utils/mf/utils.js +7 -6
- package/src/utils/mf/utils.js.map +1 -1
- package/src/utils/mf/with-module-federation-ssr.d.ts +1 -1
- package/src/utils/mf/with-module-federation.d.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/angular",
|
|
3
|
-
"version": "16.0.0-
|
|
3
|
+
"version": "16.0.0-rc.0",
|
|
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, and Cypress. \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": {
|
|
@@ -72,14 +72,14 @@
|
|
|
72
72
|
"migrations": "./migrations.json"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"@nrwl/angular": "16.0.0-
|
|
76
|
-
"@nx/cypress": "16.0.0-
|
|
77
|
-
"@nx/devkit": "16.0.0-
|
|
78
|
-
"@nx/jest": "16.0.0-
|
|
79
|
-
"@nx/js": "16.0.0-
|
|
80
|
-
"@nx/linter": "16.0.0-
|
|
81
|
-
"@nx/webpack": "16.0.0-
|
|
82
|
-
"@nx/workspace": "16.0.0-
|
|
75
|
+
"@nrwl/angular": "16.0.0-rc.0",
|
|
76
|
+
"@nx/cypress": "16.0.0-rc.0",
|
|
77
|
+
"@nx/devkit": "16.0.0-rc.0",
|
|
78
|
+
"@nx/jest": "16.0.0-rc.0",
|
|
79
|
+
"@nx/js": "16.0.0-rc.0",
|
|
80
|
+
"@nx/linter": "16.0.0-rc.0",
|
|
81
|
+
"@nx/webpack": "16.0.0-rc.0",
|
|
82
|
+
"@nx/workspace": "16.0.0-rc.0",
|
|
83
83
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
84
84
|
"chalk": "^4.1.0",
|
|
85
85
|
"chokidar": "^3.5.1",
|
|
@@ -102,7 +102,6 @@
|
|
|
102
102
|
"@nguniversal/builders": ">= 14.0.0 < 16.0.0",
|
|
103
103
|
"@schematics/angular": ">= 14.0.0 < 16.0.0",
|
|
104
104
|
"convert-source-map": "1.9.0",
|
|
105
|
-
"find-cache-dir": "3.3.2",
|
|
106
105
|
"rxjs": "^6.5.3 || ^7.5.0"
|
|
107
106
|
},
|
|
108
107
|
"peerDependenciesMeta": {
|
|
@@ -120,5 +119,5 @@
|
|
|
120
119
|
"fesm2015": "fesm2015/nx-angular.mjs",
|
|
121
120
|
"typings": "index.d.ts",
|
|
122
121
|
"sideEffects": false,
|
|
123
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "19e34df1cd3e286cacc9e73781cbb8fbbcd6fc69"
|
|
124
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,uCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,0CAA0C;YAC5C,CAAC,CAAC,gCAAgC,EACtC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,qBAAqB;YAC/B,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"setup-serve-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/setup-serve-target.ts"],"names":[],"mappings":";;;AACA,uCAGoB;AAGpB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IAC1D,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAElE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,mCACrB,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAC7B,QAAQ,EACN,OAAO,CAAC,MAAM,KAAK,MAAM;YACvB,CAAC,CAAC,0CAA0C;YAC5C,CAAC,CAAC,gCAAgC,EACtC,OAAO,kCACF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,KACrC,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,SAAS,EAC/B,UAAU,EAAE,oBAAoB,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,MAEzD,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;QAC/B,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;YAClC,QAAQ,EAAE,qBAAqB;YAC/B,oBAAoB,EAAE,aAAa;YACnC,OAAO,EAAE;gBACP,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,QAAQ;gBACvC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,KAAK;aACb;YACD,cAAc,EAAE;gBACd,WAAW,EAAE;oBACX,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,oBAAoB;iBACpD;gBACD,UAAU,EAAE;oBACV,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,mBAAmB;iBACnD;aACF;SACF,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AArCD,4CAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-utilities.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/tree-utilities.ts"],"names":[],"mappings":";;;AACA,uCAA+C;
|
|
1
|
+
{"version":3,"file":"tree-utilities.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/tree-utilities.ts"],"names":[],"mappings":";;;AACA,uCAA+C;AAC/C,mCAA4B;AAE5B,SAAgB,6BAA6B,CAC3C,IAAU,EACV,GAAW;IAEX,IAAI,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACzB,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AApBD,sEAoBC;AAED,SAAS,aAAa,CAAC,IAAU,EAAE,IAAY;IAC7C,IAAI,EAA6B,CAAC;IAClC,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;QACd,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;KAC1C;IAED,OAAO,IAAI,KAAK,EAAE,KAAI,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,IAAI,CAAC,CAAA,CAAC;AAC1C,CAAC"}
|
package/src/utils/mf/utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig, SharedLibraryConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function applyDefaultEagerPackages(sharedConfig: Record<string, SharedLibraryConfig>): void;
|
|
3
3
|
export declare const DEFAULT_NPM_PACKAGES_TO_AVOID: string[];
|
|
4
4
|
export declare const DEFAULT_ANGULAR_PACKAGES_TO_SHARE: string[];
|
package/src/utils/mf/utils.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getModuleFederationConfig = exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = exports.applyDefaultEagerPackages = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const module_federation_1 = require("@nx/devkit/src/utils/module-federation");
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
6
7
|
function applyDefaultEagerPackages(sharedConfig) {
|
|
7
8
|
const DEFAULT_PACKAGES_TO_LOAD_EAGERLY = [
|
|
@@ -38,13 +39,13 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
|
|
|
38
39
|
if (!((_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data)) {
|
|
39
40
|
throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
|
|
40
41
|
}
|
|
41
|
-
const dependencies = (0,
|
|
42
|
+
const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
|
|
42
43
|
if (mfConfig.shared) {
|
|
43
44
|
dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
|
|
44
45
|
dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
|
|
45
46
|
}
|
|
46
|
-
const sharedLibraries = (0,
|
|
47
|
-
const npmPackages = (0,
|
|
47
|
+
const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
48
|
+
const npmPackages = (0, module_federation_1.sharePackages)(Array.from(new Set([
|
|
48
49
|
...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
|
|
49
50
|
...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
|
|
50
51
|
])));
|
|
@@ -55,9 +56,9 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
|
|
|
55
56
|
});
|
|
56
57
|
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
57
58
|
applyDefaultEagerPackages(sharedDependencies);
|
|
58
|
-
(0,
|
|
59
|
-
(0,
|
|
60
|
-
const mapRemotesFunction = options.isServer ?
|
|
59
|
+
(0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
|
|
60
|
+
(0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
|
|
61
|
+
const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
|
|
61
62
|
const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
|
|
62
63
|
? {}
|
|
63
64
|
: mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ModuleFederationConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function withModuleFederationForSSR(options: ModuleFederationConfig): Promise<(config: any) => any>;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { ModuleFederationConfig } from '@nx/devkit';
|
|
1
|
+
import { ModuleFederationConfig } from '@nx/devkit/src/utils/module-federation';
|
|
2
2
|
export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
|