@nrwl/react 14.1.4 → 14.1.5
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/generators.json +4 -4
- package/package.json +9 -9
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.d.ts +1 -5
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +10 -48
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/module-federation/models.d.ts +13 -7
- package/src/module-federation/package-json.d.ts +8 -0
- package/src/module-federation/package-json.js +14 -0
- package/src/module-federation/package-json.js.map +1 -0
- package/src/module-federation/webpack-utils.d.ts +1 -4
- package/src/module-federation/webpack-utils.js +19 -19
- package/src/module-federation/webpack-utils.js.map +1 -1
- package/src/module-federation/with-module-federation.js +62 -22
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/utils/async-iterator.d.ts +5 -0
- package/src/utils/async-iterator.js +76 -0
- package/src/utils/async-iterator.js.map +1 -0
- package/src/utils/versions.js +1 -1
package/generators.json
CHANGED
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"factory": "./src/generators/component/component#componentSchematic",
|
|
32
32
|
"schema": "./src/generators/component/schema.json",
|
|
33
33
|
"description": "Create a React component.",
|
|
34
|
-
"aliases": "c"
|
|
34
|
+
"aliases": ["c"]
|
|
35
35
|
},
|
|
36
36
|
|
|
37
37
|
"redux": {
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"factory": "./src/generators/hook/hook#chookSchematic",
|
|
74
74
|
"schema": "./src/generators/hook/schema.json",
|
|
75
75
|
"description": "Create a hook.",
|
|
76
|
-
"aliases": "h"
|
|
76
|
+
"aliases": ["h"]
|
|
77
77
|
}
|
|
78
78
|
},
|
|
79
79
|
"generators": {
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"factory": "./src/generators/component/component#componentGenerator",
|
|
106
106
|
"schema": "./src/generators/component/schema.json",
|
|
107
107
|
"description": "Create a React component.",
|
|
108
|
-
"aliases": "c"
|
|
108
|
+
"aliases": ["c"]
|
|
109
109
|
},
|
|
110
110
|
|
|
111
111
|
"redux": {
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
"factory": "./src/generators/hook/hook#hookGenerator",
|
|
148
148
|
"schema": "./src/generators/hook/schema.json",
|
|
149
149
|
"description": "Create a hook.",
|
|
150
|
-
"aliases": "c"
|
|
150
|
+
"aliases": ["c"]
|
|
151
151
|
},
|
|
152
152
|
|
|
153
153
|
"host": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.5",
|
|
4
4
|
"description": "The React plugin contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@babel/core": "^7.15.0",
|
|
34
34
|
"@babel/preset-react": "^7.14.5",
|
|
35
|
-
"@nrwl/cypress": "14.1.
|
|
36
|
-
"@nrwl/devkit": "14.1.
|
|
37
|
-
"@nrwl/jest": "14.1.
|
|
38
|
-
"@nrwl/js": "14.1.
|
|
39
|
-
"@nrwl/linter": "14.1.
|
|
40
|
-
"@nrwl/storybook": "14.1.
|
|
41
|
-
"@nrwl/web": "14.1.
|
|
42
|
-
"@nrwl/workspace": "14.1.
|
|
35
|
+
"@nrwl/cypress": "14.1.5",
|
|
36
|
+
"@nrwl/devkit": "14.1.5",
|
|
37
|
+
"@nrwl/jest": "14.1.5",
|
|
38
|
+
"@nrwl/js": "14.1.5",
|
|
39
|
+
"@nrwl/linter": "14.1.5",
|
|
40
|
+
"@nrwl/storybook": "14.1.5",
|
|
41
|
+
"@nrwl/web": "14.1.5",
|
|
42
|
+
"@nrwl/workspace": "14.1.5",
|
|
43
43
|
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
@@ -3,9 +3,5 @@ import { WebDevServerOptions } from '@nrwl/web/src/executors/dev-server/dev-serv
|
|
|
3
3
|
declare type ModuleFederationDevServerOptions = WebDevServerOptions & {
|
|
4
4
|
devRemotes?: string | string[];
|
|
5
5
|
};
|
|
6
|
-
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<
|
|
7
|
-
baseUrl: string;
|
|
8
|
-
emittedFiles: import("../../../../../build/packages/web/src/utils/run-webpack").EmittedFile[];
|
|
9
|
-
success: boolean;
|
|
10
|
-
}, any, undefined>;
|
|
6
|
+
export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<any, void, unknown>;
|
|
11
7
|
export {};
|
|
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const dev_server_impl_1 = require("@nrwl/web/src/executors/dev-server/dev-server.impl");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
+
const async_iterator_1 = require("../../utils/async-iterator");
|
|
7
8
|
function moduleFederationDevServer(options, context) {
|
|
8
9
|
var _a;
|
|
9
10
|
return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationDevServer_1() {
|
|
@@ -26,7 +27,7 @@ function moduleFederationDevServer(options, context) {
|
|
|
26
27
|
: [options.devRemotes];
|
|
27
28
|
for (const app of knownRemotes) {
|
|
28
29
|
const isDev = devServeApps.includes(app);
|
|
29
|
-
iter = combineAsyncIterators(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
30
|
+
iter = (0, async_iterator_1.combineAsyncIterators)(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
|
|
30
31
|
project: app,
|
|
31
32
|
target: isDev ? 'serve' : 'serve-static',
|
|
32
33
|
configuration: context.configurationName,
|
|
@@ -34,54 +35,15 @@ function moduleFederationDevServer(options, context) {
|
|
|
34
35
|
watch: isDev,
|
|
35
36
|
}, context)));
|
|
36
37
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return (asyncIterator, index) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
44
|
-
try {
|
|
45
|
-
const iterator = yield asyncIterator.next();
|
|
46
|
-
return { index, iterator };
|
|
47
|
-
}
|
|
48
|
-
catch (err) {
|
|
49
|
-
if (options.errorCallback) {
|
|
50
|
-
options.errorCallback(err, index);
|
|
51
|
-
}
|
|
52
|
-
if (options.throwError !== false) {
|
|
53
|
-
return Promise.reject(err);
|
|
38
|
+
let numAwaiting = knownRemotes.length + 1; // remotes + host
|
|
39
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterator_1.tapAsyncIterator)(iter, (x) => {
|
|
40
|
+
var _a, _b;
|
|
41
|
+
numAwaiting--;
|
|
42
|
+
if (numAwaiting === 0) {
|
|
43
|
+
devkit_1.logger.info(`Host is ready: ${(_a = options.host) !== null && _a !== void 0 ? _a : 'localhost'}:${(_b = options.port) !== null && _b !== void 0 ? _b : 4200}`);
|
|
54
44
|
}
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
function combineAsyncIterators(...iterators) {
|
|
60
|
-
return tslib_1.__asyncGenerator(this, arguments, function* combineAsyncIterators_1() {
|
|
61
|
-
let [options] = iterators;
|
|
62
|
-
if (typeof options.next === 'function') {
|
|
63
|
-
options = Object.create(null);
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
iterators.shift();
|
|
67
|
-
}
|
|
68
|
-
const getNextAsyncIteratorValue = getNextAsyncIteratorFactory(options);
|
|
69
|
-
try {
|
|
70
|
-
const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
|
|
71
|
-
do {
|
|
72
|
-
const { iterator, index } = yield tslib_1.__await(Promise.race(asyncIteratorsValues.values()));
|
|
73
|
-
if (iterator.done) {
|
|
74
|
-
asyncIteratorsValues.delete(index);
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
yield yield tslib_1.__await(iterator.value);
|
|
78
|
-
asyncIteratorsValues.set(index, getNextAsyncIteratorValue(iterators[index], index));
|
|
79
|
-
}
|
|
80
|
-
} while (asyncIteratorsValues.size > 0);
|
|
81
|
-
}
|
|
82
|
-
finally {
|
|
83
|
-
yield tslib_1.__await(Promise.allSettled(iterators.map((it) => it.return())));
|
|
84
|
-
}
|
|
45
|
+
})))));
|
|
85
46
|
});
|
|
86
47
|
}
|
|
48
|
+
exports.default = moduleFederationDevServer;
|
|
87
49
|
//# sourceMappingURL=module-federation-dev-server.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,wFAE4D;AAC5D,+BAA4B;AAC5B,+DAGoC;AAMpC,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,YAAY,GAAG,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC;QAE1D,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,GAAG,IAAA,sCAAqB,EAC1B,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,GAAG;gBACZ,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;gBACxC,aAAa,EAAE,OAAO,CAAC,iBAAiB;aACzC,EACD;gBACE,KAAK,EAAE,KAAK;aACb,EACD,OAAO,CACR,CAAA,CACF,CAAC;SACH;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;QAC5D,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,iCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;;YACzC,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,eAAM,CAAC,IAAI,CACT,kBAAkB,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IAAI,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAAE,CACxE,CAAC;aACH;QACH,CAAC,CAAC,CAAA,CAAA,CAAA,EAAC;;CACJ;AA1DD,4CA0DC"}
|
|
@@ -1,18 +1,24 @@
|
|
|
1
|
-
export interface SharedLibraryConfig {
|
|
2
|
-
singleton: boolean;
|
|
3
|
-
strictVersion: boolean;
|
|
4
|
-
requiredVersion: string;
|
|
5
|
-
eager: boolean;
|
|
6
|
-
}
|
|
7
1
|
export declare type ModuleFederationLibrary = {
|
|
8
2
|
type: string;
|
|
9
3
|
name: string;
|
|
10
4
|
};
|
|
11
5
|
export declare type Remotes = string[] | [remoteName: string, remoteUrl: string][];
|
|
6
|
+
export interface SharedLibraryConfig {
|
|
7
|
+
singleton?: boolean;
|
|
8
|
+
strictVersion?: boolean;
|
|
9
|
+
requiredVersion?: false | string;
|
|
10
|
+
eager?: boolean;
|
|
11
|
+
}
|
|
12
|
+
export declare type SharedFunction = (libraryName: string, sharedConfig: SharedLibraryConfig) => undefined | false | SharedLibraryConfig;
|
|
13
|
+
export declare type AdditionalSharedConfig = Array<string | [libraryName: string, sharedConfig: SharedLibraryConfig] | {
|
|
14
|
+
libraryName: string;
|
|
15
|
+
sharedConfig: SharedLibraryConfig;
|
|
16
|
+
}>;
|
|
12
17
|
export interface ModuleFederationConfig {
|
|
13
18
|
name: string;
|
|
14
19
|
remotes?: string[];
|
|
15
20
|
library?: ModuleFederationLibrary;
|
|
16
21
|
exposes?: Record<string, string>;
|
|
17
|
-
shared?:
|
|
22
|
+
shared?: SharedFunction;
|
|
23
|
+
additionalShared?: AdditionalSharedConfig;
|
|
18
24
|
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.readRootPackageJson = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
function readRootPackageJson() {
|
|
7
|
+
const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
|
|
8
|
+
if (!(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
9
|
+
throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
|
|
10
|
+
}
|
|
11
|
+
return (0, devkit_1.readJsonFile)(pkgJsonPath);
|
|
12
|
+
}
|
|
13
|
+
exports.readRootPackageJson = readRootPackageJson;
|
|
14
|
+
//# sourceMappingURL=package-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/package-json.ts"],"names":[],"mappings":";;;AAAA,yCAA8E;AAC9E,2BAAgC;AAEhC,SAAgB,mBAAmB;IAIjC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;KACH;IAED,OAAO,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC;AACnC,CAAC;AAZD,kDAYC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { NormalModuleReplacementPlugin } from 'webpack';
|
|
2
2
|
import { SharedLibraryConfig } from './models';
|
|
3
3
|
export declare function shareWorkspaceLibraries(libraries: string[], tsConfigPath?: string): {
|
|
4
|
-
getAliases: () => any[];
|
|
5
|
-
getLibraries: () => void;
|
|
6
|
-
getReplacementPlugin: () => NormalModuleReplacementPlugin;
|
|
7
|
-
} | {
|
|
8
4
|
getAliases: () => {};
|
|
9
5
|
getLibraries: (eager?: boolean) => Record<string, SharedLibraryConfig>;
|
|
10
6
|
getReplacementPlugin: () => NormalModuleReplacementPlugin;
|
|
11
7
|
};
|
|
8
|
+
export declare function getNpmPackageSharedConfig(pkgName: string, version: string): SharedLibraryConfig | undefined;
|
|
12
9
|
export declare function sharePackages(packages: string[]): Record<string, SharedLibraryConfig>;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sharePackages = exports.shareWorkspaceLibraries = void 0;
|
|
3
|
+
exports.sharePackages = exports.getNpmPackageSharedConfig = exports.shareWorkspaceLibraries = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const webpack_1 = require("webpack");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
9
|
+
const package_json_1 = require("./package-json");
|
|
9
10
|
function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
10
11
|
var _a, _b;
|
|
11
12
|
if (tsConfigPath === void 0) { tsConfigPath = (_a = process.env.NX_TSCONFIG_PATH) !== null && _a !== void 0 ? _a : (0, typescript_1.getRootTsConfigPath)(); }
|
|
@@ -17,7 +18,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
17
18
|
if (!tsconfigPathAliases) {
|
|
18
19
|
return {
|
|
19
20
|
getAliases: () => [],
|
|
20
|
-
getLibraries: () => {
|
|
21
|
+
getLibraries: () => ({}),
|
|
21
22
|
getReplacementPlugin: () => new webpack_1.NormalModuleReplacementPlugin(/./, () => { }),
|
|
22
23
|
};
|
|
23
24
|
}
|
|
@@ -50,26 +51,25 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
50
51
|
};
|
|
51
52
|
}
|
|
52
53
|
exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
|
|
53
|
-
function
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
function getNpmPackageSharedConfig(pkgName, version) {
|
|
55
|
+
if (!version) {
|
|
56
|
+
devkit_1.logger.warn(`Could not find a version for "${pkgName}" in the root "package.json" ` +
|
|
57
|
+
'when collecting shared packages for the Module Federation setup. ' +
|
|
58
|
+
'The package will not be shared.');
|
|
59
|
+
return undefined;
|
|
57
60
|
}
|
|
58
|
-
|
|
59
|
-
|
|
61
|
+
return { singleton: true, strictVersion: true, requiredVersion: version };
|
|
62
|
+
}
|
|
63
|
+
exports.getNpmPackageSharedConfig = getNpmPackageSharedConfig;
|
|
64
|
+
function sharePackages(packages) {
|
|
65
|
+
const pkgJson = (0, package_json_1.readRootPackageJson)();
|
|
66
|
+
return packages.reduce((shared, pkg) => {
|
|
60
67
|
var _a, _b, _c;
|
|
61
|
-
const
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
'when collecting shared packages for the Module Federation setup. ' +
|
|
65
|
-
'The package will not be shared.');
|
|
66
|
-
return shared;
|
|
68
|
+
const config = getNpmPackageSharedConfig(pkg, (_b = (_a = pkgJson.dependencies) === null || _a === void 0 ? void 0 : _a[pkg]) !== null && _b !== void 0 ? _b : (_c = pkgJson.devDependencies) === null || _c === void 0 ? void 0 : _c[pkg]);
|
|
69
|
+
if (config) {
|
|
70
|
+
shared[pkg] = config;
|
|
67
71
|
}
|
|
68
|
-
return
|
|
69
|
-
singleton: true,
|
|
70
|
-
strictVersion: true,
|
|
71
|
-
requiredVersion: version,
|
|
72
|
-
} });
|
|
72
|
+
return shared;
|
|
73
73
|
}, {});
|
|
74
74
|
}
|
|
75
75
|
exports.sharePackages = sharePackages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/webpack-utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"webpack-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/webpack-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
8
8
|
const file_utils_1 = require("nx/src/project-graph/file-utils");
|
|
9
9
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
10
|
+
const package_json_1 = require("./package-json");
|
|
10
11
|
function collectDependencies(projectGraph, name, dependencies = {
|
|
11
12
|
workspaceLibraries: new Set(),
|
|
12
13
|
npmPackages: new Set(),
|
|
@@ -53,15 +54,8 @@ function mapWorkspaceLibrariesToTsConfigImport(workspaceLibraries) {
|
|
|
53
54
|
}
|
|
54
55
|
return mappedLibraries;
|
|
55
56
|
}
|
|
56
|
-
function getDependentPackagesForProject(name) {
|
|
57
|
+
function getDependentPackagesForProject(projectGraph, name) {
|
|
57
58
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
let projectGraph;
|
|
59
|
-
try {
|
|
60
|
-
projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
61
|
-
}
|
|
62
|
-
catch (e) {
|
|
63
|
-
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
64
|
-
}
|
|
65
59
|
const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
|
|
66
60
|
return {
|
|
67
61
|
workspaceLibraries: mapWorkspaceLibrariesToTsConfigImport([
|
|
@@ -101,6 +95,56 @@ function mapRemotes(remotes) {
|
|
|
101
95
|
}
|
|
102
96
|
return mappedRemotes;
|
|
103
97
|
}
|
|
98
|
+
function applySharedFunction(sharedConfig, sharedFn) {
|
|
99
|
+
if (!sharedFn) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
for (const [libraryName, library] of Object.entries(sharedConfig)) {
|
|
103
|
+
const mappedDependency = sharedFn(libraryName, library);
|
|
104
|
+
if (mappedDependency === false) {
|
|
105
|
+
delete sharedConfig[libraryName];
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
else if (!mappedDependency) {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
sharedConfig[libraryName] = mappedDependency;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
function addStringDependencyToSharedConfig(sharedConfig, dependency, projectGraph) {
|
|
115
|
+
var _a, _b, _c, _d;
|
|
116
|
+
if (projectGraph.nodes[dependency]) {
|
|
117
|
+
sharedConfig[dependency] = { requiredVersion: false };
|
|
118
|
+
}
|
|
119
|
+
else if ((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[dependency]) {
|
|
120
|
+
const pkgJson = (0, package_json_1.readRootPackageJson)();
|
|
121
|
+
const config = (0, webpack_utils_1.getNpmPackageSharedConfig)(dependency, (_c = (_b = pkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[dependency]) !== null && _c !== void 0 ? _c : (_d = pkgJson.devDependencies) === null || _d === void 0 ? void 0 : _d[dependency]);
|
|
122
|
+
if (!config) {
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
sharedConfig[dependency] = config;
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
throw new Error(`The specified dependency "${dependency}" in the additionalShared configuration does not exist in the project graph. ` +
|
|
129
|
+
`Please check your additionalShared configuration and make sure you are including valid workspace projects or npm packages.`);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
function applyAdditionalShared(sharedConfig, additionalShared, projectGraph) {
|
|
133
|
+
if (!additionalShared) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
for (const shared of additionalShared) {
|
|
137
|
+
if (typeof shared === 'string') {
|
|
138
|
+
addStringDependencyToSharedConfig(sharedConfig, shared, projectGraph);
|
|
139
|
+
}
|
|
140
|
+
else if (Array.isArray(shared)) {
|
|
141
|
+
sharedConfig[shared[0]] = shared[1];
|
|
142
|
+
}
|
|
143
|
+
else if (typeof shared === 'object') {
|
|
144
|
+
sharedConfig[shared.libraryName] = shared.sharedConfig;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
104
148
|
function withModuleFederation(options) {
|
|
105
149
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
106
150
|
const reactWebpackConfig = require('../../plugins/webpack');
|
|
@@ -109,23 +153,19 @@ function withModuleFederation(options) {
|
|
|
109
153
|
if (!project) {
|
|
110
154
|
throw Error(`Cannot find project "${options.name}". Check that the name is correct in module-federation.config.js`);
|
|
111
155
|
}
|
|
112
|
-
|
|
156
|
+
let projectGraph;
|
|
157
|
+
try {
|
|
158
|
+
projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
159
|
+
}
|
|
160
|
+
catch (e) {
|
|
161
|
+
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
162
|
+
}
|
|
163
|
+
const dependencies = yield getDependentPackagesForProject(projectGraph, options.name);
|
|
113
164
|
const sharedLibraries = (0, webpack_utils_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
114
165
|
const npmPackages = (0, webpack_utils_1.sharePackages)(dependencies.npmPackages);
|
|
115
166
|
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
const mappedDependency = options.shared(libraryName, library);
|
|
119
|
-
if (mappedDependency === false) {
|
|
120
|
-
delete sharedDependencies[libraryName];
|
|
121
|
-
continue;
|
|
122
|
-
}
|
|
123
|
-
else if (!mappedDependency) {
|
|
124
|
-
continue;
|
|
125
|
-
}
|
|
126
|
-
sharedDependencies[libraryName] = mappedDependency;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
167
|
+
applySharedFunction(sharedDependencies, options.shared);
|
|
168
|
+
applyAdditionalShared(sharedDependencies, options.additionalShared, projectGraph);
|
|
129
169
|
return (config) => {
|
|
130
170
|
config = reactWebpackConfig(config);
|
|
131
171
|
config.output.uniqueName = options.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function combineAsyncIterators(...iterators: {
|
|
2
|
+
0: AsyncIterableIterator<any>;
|
|
3
|
+
} & AsyncIterableIterator<any>[]): AsyncGenerator<any, void, unknown>;
|
|
4
|
+
export declare function mapAsyncIterator<T = any, I = any, O = any>(data: AsyncIterableIterator<T>, transform: (input: I, index?: number, data?: AsyncIterableIterator<T>) => O): AsyncGenerator<Awaited<O>, void, unknown>;
|
|
5
|
+
export declare function tapAsyncIterator<T = any, I = any, O = any>(data: AsyncIterableIterator<T>, fn: (input: I) => void): AsyncGenerator<any, void, unknown>;
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.tapAsyncIterator = exports.mapAsyncIterator = exports.combineAsyncIterators = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
function combineAsyncIterators(...iterators) {
|
|
6
|
+
return tslib_1.__asyncGenerator(this, arguments, function* combineAsyncIterators_1() {
|
|
7
|
+
let [options] = iterators;
|
|
8
|
+
if (typeof options.next === 'function') {
|
|
9
|
+
options = Object.create(null);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
iterators.shift();
|
|
13
|
+
}
|
|
14
|
+
const getNextAsyncIteratorValue = getNextAsyncIteratorFactory(options);
|
|
15
|
+
try {
|
|
16
|
+
const asyncIteratorsValues = new Map(iterators.map((it, idx) => [idx, getNextAsyncIteratorValue(it, idx)]));
|
|
17
|
+
do {
|
|
18
|
+
const { iterator, index } = yield tslib_1.__await(Promise.race(asyncIteratorsValues.values()));
|
|
19
|
+
if (iterator.done) {
|
|
20
|
+
asyncIteratorsValues.delete(index);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
yield yield tslib_1.__await(iterator.value);
|
|
24
|
+
asyncIteratorsValues.set(index, getNextAsyncIteratorValue(iterators[index], index));
|
|
25
|
+
}
|
|
26
|
+
} while (asyncIteratorsValues.size > 0);
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
yield tslib_1.__await(Promise.allSettled(iterators.map((it) => it.return())));
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.combineAsyncIterators = combineAsyncIterators;
|
|
34
|
+
function getNextAsyncIteratorFactory(options) {
|
|
35
|
+
return (asyncIterator, index) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
+
try {
|
|
37
|
+
const iterator = yield asyncIterator.next();
|
|
38
|
+
return { index, iterator };
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
if (options.errorCallback) {
|
|
42
|
+
options.errorCallback(err, index);
|
|
43
|
+
}
|
|
44
|
+
return Promise.reject(err);
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
function mapAsyncIterator(data, transform) {
|
|
49
|
+
return tslib_1.__asyncGenerator(this, arguments, function* mapAsyncIterator_1() {
|
|
50
|
+
function f() {
|
|
51
|
+
return tslib_1.__asyncGenerator(this, arguments, function* f_1() {
|
|
52
|
+
const generator = data[Symbol.asyncIterator] || data[Symbol.iterator];
|
|
53
|
+
const iterator = generator.call(data);
|
|
54
|
+
let index = 0;
|
|
55
|
+
let item = yield tslib_1.__await(iterator.next());
|
|
56
|
+
while (!item.done) {
|
|
57
|
+
yield yield tslib_1.__await(yield tslib_1.__await(transform(yield tslib_1.__await(item.value), index, data)));
|
|
58
|
+
index++;
|
|
59
|
+
item = yield tslib_1.__await(iterator.next());
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(f()))));
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
exports.mapAsyncIterator = mapAsyncIterator;
|
|
67
|
+
function tapAsyncIterator(data, fn) {
|
|
68
|
+
return tslib_1.__asyncGenerator(this, arguments, function* tapAsyncIterator_1() {
|
|
69
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(mapAsyncIterator(data, (x) => {
|
|
70
|
+
fn(x);
|
|
71
|
+
return x;
|
|
72
|
+
})))));
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
exports.tapAsyncIterator = tapAsyncIterator;
|
|
76
|
+
//# sourceMappingURL=async-iterator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"async-iterator.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/async-iterator.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '14.1.
|
|
4
|
+
exports.nxVersion = '14.1.5';
|
|
5
5
|
exports.reactVersion = '18.1.0';
|
|
6
6
|
exports.reactDomVersion = '18.1.0';
|
|
7
7
|
exports.reactIsVersion = '18.1.0';
|