@nrwl/react 15.2.0 → 15.3.0-beta.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/CHANGELOG.md +1 -1
- package/generators.json +14 -0
- package/migrations.json +69 -0
- package/module-federation.d.ts +2 -0
- package/module-federation.js +4 -1
- package/module-federation.js.map +1 -1
- package/package.json +12 -11
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +4 -3
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/generators/application/application.js +27 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/common-vite/index.html +15 -0
- package/src/generators/application/files/common-vite/public/.gitkeep +0 -0
- package/src/generators/application/files/common-vite/src/app/__fileName__.spec.tsx__tmpl__ +26 -0
- package/src/generators/application/files/common-vite/src/app/nx-welcome.tsx +820 -0
- package/src/generators/application/files/common-vite/src/assets/.gitkeep +0 -0
- package/src/generators/application/files/common-vite/src/environments/environment.prod.ts__tmpl__ +3 -0
- package/src/generators/application/files/common-vite/src/environments/environment.ts__tmpl__ +6 -0
- package/src/generators/application/files/common-vite/src/favicon.ico +0 -0
- package/src/generators/application/files/common-vite/src/main.tsx__tmpl__ +10 -0
- package/src/generators/application/files/common-vite/src/polyfills.ts__tmpl__ +7 -0
- package/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ +14 -0
- package/src/generators/application/files/common-vite/tsconfig.json__tmpl__ +29 -0
- package/src/generators/application/lib/add-project.js +7 -4
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +14 -2
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +6 -2
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.d.ts +1 -1
- package/src/generators/application/lib/update-jest-config.js +7 -4
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/application/schema.d.ts +3 -1
- package/src/generators/application/schema.json +14 -2
- package/src/generators/cypress-component-configuration/lib/update-configs.js +4 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
- package/src/generators/host/host.js +3 -1
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.d.ts +1 -1
- package/src/generators/init/schema.d.ts +1 -1
- package/src/generators/library/library.js +11 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +2 -1
- package/src/generators/library/schema.json +6 -1
- package/src/generators/remote/remote.js +3 -1
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.d.ts +1 -1
- package/src/generators/setup-ssr/files/server.ts__tmpl__ +24 -0
- package/src/generators/setup-ssr/files/src/main.server.tsx__tmpl__ +47 -0
- package/src/generators/setup-ssr/files/tsconfig.server.json__tmpl__ +14 -0
- package/src/generators/setup-ssr/schema.d.ts +6 -0
- package/src/generators/setup-ssr/schema.json +36 -0
- package/src/generators/setup-ssr/setup-ssr.d.ts +5 -0
- package/src/generators/setup-ssr/setup-ssr.js +127 -0
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -0
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js +3 -3
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +3 -3
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
- package/src/module-federation/ast-utils.js +3 -3
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/module-federation/utils.d.ts +10 -0
- package/src/module-federation/utils.js +34 -0
- package/src/module-federation/utils.js.map +1 -0
- package/src/module-federation/with-module-federation-ssr.d.ts +2 -0
- package/src/module-federation/with-module-federation-ssr.js +48 -0
- package/src/module-federation/with-module-federation-ssr.js.map +1 -0
- package/src/module-federation/with-module-federation.js +2 -22
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/utils/ast-utils.js +28 -28
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/versions.d.ts +18 -15
- package/src/utils/versions.js +19 -16
- package/src/utils/versions.js.map +1 -1
- package/src/utils/async-iterator.d.ts +0 -5
- package/src/utils/async-iterator.js +0 -76
- package/src/utils/async-iterator.js.map +0 -1
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"$id": "GeneratorAngularUniversalSetup",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Generate Angular Universal (SSR) setup for an Angular App",
|
|
6
|
+
"description": "Create the additional configuration required to enable SSR via Angular Universal for an Angular application.",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"properties": {
|
|
9
|
+
"project": {
|
|
10
|
+
"type": "string",
|
|
11
|
+
"description": "The name of the application to add SSR support to.",
|
|
12
|
+
"$default": {
|
|
13
|
+
"$source": "argv",
|
|
14
|
+
"index": 0
|
|
15
|
+
},
|
|
16
|
+
"x-prompt": "What app would you like to add SSR support to?",
|
|
17
|
+
"x-dropdown": "projects"
|
|
18
|
+
},
|
|
19
|
+
"appComponentImportPath": {
|
|
20
|
+
"type": "string",
|
|
21
|
+
"description": "The import path of the <App/> component, relative to project sourceRoot.",
|
|
22
|
+
"default": "app/app"
|
|
23
|
+
},
|
|
24
|
+
"serverPort": {
|
|
25
|
+
"type": "number",
|
|
26
|
+
"default": 4200,
|
|
27
|
+
"description": "The port for the Express server."
|
|
28
|
+
},
|
|
29
|
+
"skipFormat": {
|
|
30
|
+
"type": "boolean",
|
|
31
|
+
"description": "Skip formatting the workspace after the generator completes."
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"required": ["project"],
|
|
35
|
+
"additionalProperties": false
|
|
36
|
+
}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
2
|
+
import type { Schema } from './schema';
|
|
3
|
+
export declare function setupSsrGenerator(tree: Tree, options: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
4
|
+
export default setupSsrGenerator;
|
|
5
|
+
export declare const setupSsrSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const versions_1 = require("../../utils/versions");
|
|
7
|
+
function setupSsrGenerator(tree, options) {
|
|
8
|
+
var _a, _b, _c;
|
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
11
|
+
const projectRoot = projectConfig.root;
|
|
12
|
+
const appImportCandidates = [
|
|
13
|
+
options.appComponentImportPath,
|
|
14
|
+
'app',
|
|
15
|
+
'App',
|
|
16
|
+
'app/App',
|
|
17
|
+
'App/App',
|
|
18
|
+
];
|
|
19
|
+
const appComponentImport = appImportCandidates.find((app) => tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, `${app}.tsx`)) ||
|
|
20
|
+
tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, `${app}.jsx`)) ||
|
|
21
|
+
tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, `${app}.js`)));
|
|
22
|
+
if (!appComponentImport) {
|
|
23
|
+
throw new Error(`Cannot find an import path for <App/> component. Try passing setting --appComponentImportPath option.`);
|
|
24
|
+
}
|
|
25
|
+
if (!projectConfig.targets.build || !projectConfig.targets.serve) {
|
|
26
|
+
throw new Error(`Project ${options.project} does not have build and serve targets`);
|
|
27
|
+
}
|
|
28
|
+
if (projectConfig.targets.server) {
|
|
29
|
+
throw new Error(`Project ${options.project} already has a server target.`);
|
|
30
|
+
}
|
|
31
|
+
const originalOutputPath = (_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath;
|
|
32
|
+
if (!originalOutputPath) {
|
|
33
|
+
throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
|
|
34
|
+
}
|
|
35
|
+
projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
|
|
36
|
+
projectConfig.targets = Object.assign(Object.assign({}, projectConfig.targets), { server: {
|
|
37
|
+
executor: '@nrwl/webpack:webpack',
|
|
38
|
+
outputs: ['{options.outputPath}'],
|
|
39
|
+
defaultConfiguration: 'production',
|
|
40
|
+
options: {
|
|
41
|
+
target: 'node',
|
|
42
|
+
main: `${projectRoot}/server.ts`,
|
|
43
|
+
outputPath: (0, devkit_1.joinPathFragments)(originalOutputPath, 'server'),
|
|
44
|
+
tsConfig: `${projectRoot}/tsconfig.server.json`,
|
|
45
|
+
compiler: 'babel',
|
|
46
|
+
externalDependencies: 'all',
|
|
47
|
+
outputHashing: 'none',
|
|
48
|
+
webpackConfig: '@nrwl/react/plugins/webpack',
|
|
49
|
+
},
|
|
50
|
+
configurations: {
|
|
51
|
+
development: {
|
|
52
|
+
optimization: false,
|
|
53
|
+
sourceMap: true,
|
|
54
|
+
},
|
|
55
|
+
production: {
|
|
56
|
+
fileReplacements: [
|
|
57
|
+
{
|
|
58
|
+
replace: `${projectRoot}/src/environments/environment.ts`,
|
|
59
|
+
with: `${projectRoot}/src/environments/environment.prod.ts`,
|
|
60
|
+
},
|
|
61
|
+
],
|
|
62
|
+
sourceMap: false,
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
}, 'serve-browser': projectConfig.targets.serve, 'serve-server': {
|
|
66
|
+
executor: '@nrwl/js:node',
|
|
67
|
+
defaultConfiguration: 'development',
|
|
68
|
+
options: {
|
|
69
|
+
buildTarget: `${options.project}:server:development`,
|
|
70
|
+
buildTargetOptions: {
|
|
71
|
+
watch: true,
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
|
+
configurations: {
|
|
75
|
+
development: {},
|
|
76
|
+
production: {
|
|
77
|
+
buildTarget: `${options.project}:server:production`,
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
}, serve: {
|
|
81
|
+
executor: '@nrwl/webpack:ssr-dev-server',
|
|
82
|
+
defaultConfiguration: 'development',
|
|
83
|
+
options: {
|
|
84
|
+
browserTarget: `${options.project}:build:development`,
|
|
85
|
+
serverTarget: `${options.project}:serve-server:development`,
|
|
86
|
+
port: options.serverPort,
|
|
87
|
+
browserTargetOptions: {
|
|
88
|
+
watch: true,
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
configurations: {
|
|
92
|
+
development: {},
|
|
93
|
+
production: {
|
|
94
|
+
browserTarget: `${options.project}:build:production`,
|
|
95
|
+
serverTarget: `${options.project}:serve-server:production`,
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
} });
|
|
99
|
+
(0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
|
|
100
|
+
const workspace = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
101
|
+
if (((_c = workspace.tasksRunnerOptions) === null || _c === void 0 ? void 0 : _c.default) &&
|
|
102
|
+
!workspace.tasksRunnerOptions.default.options.cacheableOperations['server']) {
|
|
103
|
+
workspace.tasksRunnerOptions.default.options.cacheableOperations = [
|
|
104
|
+
...workspace.tasksRunnerOptions.default.options.cacheableOperations,
|
|
105
|
+
'server',
|
|
106
|
+
];
|
|
107
|
+
}
|
|
108
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectRoot, {
|
|
109
|
+
tmpl: '',
|
|
110
|
+
appComponentImport,
|
|
111
|
+
browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
|
|
112
|
+
});
|
|
113
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspace);
|
|
114
|
+
const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
115
|
+
express: versions_1.expressVersion,
|
|
116
|
+
isbot: versions_1.isbotVersion,
|
|
117
|
+
}, {
|
|
118
|
+
'@types/express': versions_1.typesExpressVersion,
|
|
119
|
+
});
|
|
120
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
121
|
+
return installTask;
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
exports.setupSsrGenerator = setupSsrGenerator;
|
|
125
|
+
exports.default = setupSsrGenerator;
|
|
126
|
+
exports.setupSsrSchematic = (0, devkit_1.convertNxGenerator)(setupSsrGenerator);
|
|
127
|
+
//# sourceMappingURL=setup-ssr.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const devkit_2 = require("@nrwl/devkit");
|
|
7
7
|
const ts = require("typescript");
|
|
8
|
-
const
|
|
8
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
9
9
|
function migrateToWebPack5(tree) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
|
|
@@ -61,10 +61,10 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
|
|
|
61
61
|
const file = getTsSourceFile(tree, projectMainJsFile);
|
|
62
62
|
const appFileContent = tree.read(projectMainJsFile, 'utf-8');
|
|
63
63
|
newContents = appFileContent;
|
|
64
|
-
moduleExportsFull = (0,
|
|
64
|
+
moduleExportsFull = (0, typescript_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
|
|
65
65
|
if (moduleExportsFull && moduleExportsFull[0]) {
|
|
66
66
|
const moduleExports = moduleExportsFull[0];
|
|
67
|
-
const listOfStatements = (0,
|
|
67
|
+
const listOfStatements = (0, typescript_1.findNodes)(moduleExports, [
|
|
68
68
|
ts.SyntaxKind.SyntaxList,
|
|
69
69
|
]);
|
|
70
70
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,yCAKsB;AAEtB,iCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateReactDomRender = exports.update = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
7
7
|
const ts = require("typescript");
|
|
8
8
|
function update(tree) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -25,7 +25,7 @@ function update(tree) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.update = update;
|
|
27
27
|
function migrateReactDomRender(sourcePath, source) {
|
|
28
|
-
const allImports = (0,
|
|
28
|
+
const allImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
29
29
|
const reactDomImport = allImports.find((x) => x.moduleSpecifier.getText() === "'react-dom'");
|
|
30
30
|
const changes = [];
|
|
31
31
|
if (reactDomImport) {
|
|
@@ -35,7 +35,7 @@ function migrateReactDomRender(sourcePath, source) {
|
|
|
35
35
|
text: '/client',
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
const calls = (0,
|
|
38
|
+
const calls = (0, typescript_1.findNodes)(source, ts.SyntaxKind.CallExpression);
|
|
39
39
|
const renderCall = calls.find((x) => {
|
|
40
40
|
if (x.expression.kind !== ts.SyntaxKind.PropertyAccessExpression)
|
|
41
41
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,
|
|
1
|
+
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addRemoteRoute = exports.addRemoteDefinition = exports.addRemoteToConfig = void 0;
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
7
7
|
const ast_utils_1 = require("../utils/ast-utils");
|
|
8
8
|
function addRemoteToConfig(source, app) {
|
|
9
|
-
const assignments = (0,
|
|
9
|
+
const assignments = (0, typescript_1.findNodes)(source, ts.SyntaxKind.PropertyAssignment);
|
|
10
10
|
const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
|
|
11
11
|
if (remotesAssignment) {
|
|
12
12
|
const arrayExpression = remotesAssignment.initializer;
|
|
@@ -28,7 +28,7 @@ function addRemoteToConfig(source, app) {
|
|
|
28
28
|
},
|
|
29
29
|
].filter(Boolean);
|
|
30
30
|
}
|
|
31
|
-
const binaryExpressions = (0,
|
|
31
|
+
const binaryExpressions = (0, typescript_1.findNodes)(source, ts.SyntaxKind.BinaryExpression);
|
|
32
32
|
const exportExpression = binaryExpressions.find((b) => {
|
|
33
33
|
if (b.left.kind === ts.SyntaxKind.PropertyAccessExpression) {
|
|
34
34
|
const pae = b.left;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,yCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ModuleFederationConfig } from '@nrwl/devkit';
|
|
2
|
+
export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, determineRemoteUrl: (remote: string) => string, options?: {
|
|
3
|
+
isServer: boolean;
|
|
4
|
+
}): Promise<{
|
|
5
|
+
sharedLibraries: import("@nrwl/devkit").SharedWorkspaceLibraryConfig;
|
|
6
|
+
sharedDependencies: {
|
|
7
|
+
[x: string]: import("@nrwl/devkit").SharedLibraryConfig;
|
|
8
|
+
};
|
|
9
|
+
mappedRemotes: Record<string, string>;
|
|
10
|
+
}>;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getModuleFederationConfig = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isServer: false }) {
|
|
7
|
+
var _a;
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
let projectGraph;
|
|
10
|
+
try {
|
|
11
|
+
projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
15
|
+
}
|
|
16
|
+
const project = (_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data;
|
|
17
|
+
if (!project) {
|
|
18
|
+
throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
|
|
19
|
+
}
|
|
20
|
+
const dependencies = (0, devkit_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
|
|
21
|
+
const sharedLibraries = (0, devkit_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
22
|
+
const npmPackages = (0, devkit_1.sharePackages)(dependencies.npmPackages);
|
|
23
|
+
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
24
|
+
(0, devkit_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
|
|
25
|
+
(0, devkit_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
|
|
26
|
+
const mapRemotesFunction = options.isServer ? devkit_1.mapRemotesForSSR : devkit_1.mapRemotes;
|
|
27
|
+
const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
|
|
28
|
+
? {}
|
|
29
|
+
: mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrl);
|
|
30
|
+
return { sharedLibraries, sharedDependencies, mappedRemotes };
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.getModuleFederationConfig = getModuleFederationConfig;
|
|
34
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/utils.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AAEtB,SAAsB,yBAAyB,CAC7C,QAAgC,EAChC,kBAA8C,EAC9C,UAAiC,EAAE,QAAQ,EAAE,KAAK,EAAE;;;QAEpD,IAAI,YAAgD,CAAC;QACrD,IAAI;YACF,YAAY,GAAG,IAAA,+BAAsB,GAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;SAChD;QAED,MAAM,OAAO,GAAG,MAAA,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,KAAK,CACT,wBAAwB,QAAQ,CAAC,IAAI,kEAAkE,CACxG,CAAC;SACH;QAED,MAAM,YAAY,GAAG,IAAA,uCAA8B,EACjD,YAAY,EACZ,QAAQ,CAAC,IAAI,CACd,CAAC;QACF,MAAM,eAAe,GAAG,IAAA,gCAAuB,EAC7C,YAAY,CAAC,kBAAkB,CAChC,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,sBAAa,EAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE5D,MAAM,kBAAkB,mCACnB,eAAe,CAAC,YAAY,EAAE,GAC9B,WAAW,CACf,CAAC;QAEF,IAAA,4BAAmB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzD,IAAA,8BAAqB,EACnB,kBAAkB,EAClB,QAAQ,CAAC,gBAAgB,EACzB,YAAY,CACb,CAAC;QAEF,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,yBAAgB,CAAC,CAAC,CAAC,mBAAU,CAAC;QAC5E,MAAM,aAAa,GACjB,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAChD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAErE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;;CAC/D;AAjDD,8DAiDC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withModuleFederationForSSR = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
function determineRemoteUrl(remote) {
|
|
8
|
+
var _a, _b, _c, _d, _e;
|
|
9
|
+
const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
|
|
10
|
+
const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a.serve;
|
|
11
|
+
if (!serveTarget) {
|
|
12
|
+
throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve" target.\n
|
|
13
|
+
You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', '//localhost:4201']]\``);
|
|
14
|
+
}
|
|
15
|
+
const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : '//localhost';
|
|
16
|
+
const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
|
|
17
|
+
return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/server/remoteEntry.js`;
|
|
18
|
+
}
|
|
19
|
+
function withModuleFederationForSSR(options) {
|
|
20
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
const reactWebpackConfig = require('../../plugins/webpack');
|
|
22
|
+
const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl, {
|
|
23
|
+
isServer: true,
|
|
24
|
+
});
|
|
25
|
+
return (config) => {
|
|
26
|
+
config = reactWebpackConfig(config);
|
|
27
|
+
config.target = false;
|
|
28
|
+
config.output.uniqueName = options.name;
|
|
29
|
+
config.optimization = {
|
|
30
|
+
runtimeChunk: false,
|
|
31
|
+
};
|
|
32
|
+
config.plugins.push(new (require('@module-federation/node').UniversalFederationPlugin)({
|
|
33
|
+
name: options.name,
|
|
34
|
+
filename: 'remoteEntry.js',
|
|
35
|
+
exposes: options.exposes,
|
|
36
|
+
remotes: mappedRemotes,
|
|
37
|
+
shared: Object.assign({}, sharedDependencies),
|
|
38
|
+
library: {
|
|
39
|
+
type: 'commonjs-module',
|
|
40
|
+
},
|
|
41
|
+
isServer: true,
|
|
42
|
+
}, {}), sharedLibraries.getReplacementPlugin());
|
|
43
|
+
return config;
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
exports.withModuleFederationForSSR = withModuleFederationForSSR;
|
|
48
|
+
//# sourceMappingURL=with-module-federation-ssr.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"with-module-federation-ssr.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation-ssr.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AAEpD,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;8IACiF,CACzI,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,aAAa,CAAC;IACxD,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,wBAAwB,CAAC;AACnC,CAAC;AAED,SAAsB,0BAA0B,CAC9C,OAA+B;;QAE/B,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,EAAE;YAC3D,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEL,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEpC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,CAChE;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;iBACxB;gBACD,QAAQ,EAAE,IAAI;aACf,EACD,EAAE,CACH,EACD,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAzCD,gEAyCC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.withModuleFederation = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const project_graph_1 = require("nx/src/project-graph/project-graph");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
7
|
const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
|
|
8
8
|
function determineRemoteUrl(remote) {
|
|
9
9
|
var _a, _b, _c, _d, _e;
|
|
@@ -18,26 +18,9 @@ function determineRemoteUrl(remote) {
|
|
|
18
18
|
return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/remoteEntry.js`;
|
|
19
19
|
}
|
|
20
20
|
function withModuleFederation(options) {
|
|
21
|
-
var _a;
|
|
22
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
22
|
const reactWebpackConfig = require('../../plugins/webpack');
|
|
24
|
-
|
|
25
|
-
try {
|
|
26
|
-
projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
27
|
-
}
|
|
28
|
-
catch (e) {
|
|
29
|
-
projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
30
|
-
}
|
|
31
|
-
const project = (_a = projectGraph.nodes[options.name]) === null || _a === void 0 ? void 0 : _a.data;
|
|
32
|
-
if (!project) {
|
|
33
|
-
throw Error(`Cannot find project "${options.name}". Check that the name is correct in module-federation.config.js`);
|
|
34
|
-
}
|
|
35
|
-
const dependencies = (0, devkit_1.getDependentPackagesForProject)(projectGraph, options.name);
|
|
36
|
-
const sharedLibraries = (0, devkit_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
|
|
37
|
-
const npmPackages = (0, devkit_1.sharePackages)(dependencies.npmPackages);
|
|
38
|
-
const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
|
|
39
|
-
(0, devkit_1.applySharedFunction)(sharedDependencies, options.shared);
|
|
40
|
-
(0, devkit_1.applyAdditionalShared)(sharedDependencies, options.additionalShared, projectGraph);
|
|
23
|
+
const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl);
|
|
41
24
|
return (config) => {
|
|
42
25
|
config = reactWebpackConfig(config);
|
|
43
26
|
config.output.uniqueName = options.name;
|
|
@@ -46,9 +29,6 @@ function withModuleFederation(options) {
|
|
|
46
29
|
runtimeChunk: false,
|
|
47
30
|
};
|
|
48
31
|
config.experiments = Object.assign(Object.assign({}, config.experiments), { outputModule: true });
|
|
49
|
-
const mappedRemotes = !options.remotes || options.remotes.length === 0
|
|
50
|
-
? {}
|
|
51
|
-
: (0, devkit_1.mapRemotes)(options.remotes, 'js', determineRemoteUrl);
|
|
52
32
|
config.plugins.push(new ModuleFederationPlugin({
|
|
53
33
|
name: options.name,
|
|
54
34
|
library: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AACpD,uFAAwF;AAExF,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;8IACiF,CACzI,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,aAAa,CAAC;IACxD,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,iBAAiB,CAAC;AAC5B,CAAC;AAED,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;YAElC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,WAAW,mCACb,MAAM,CAAC,WAAW,KACrB,YAAY,EAAE,IAAI,GACnB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,sBAAsB,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;aACF,CAAC,EACF,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAtCD,oDAsCC"}
|