@nx/react 21.0.0-beta.1 → 21.0.0-beta.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/package.json +6 -6
- package/plugins/nx-react-webpack-plugin/lib/apply-react-config.js +3 -1
- package/router-plugin.d.ts +1 -0
- package/router-plugin.js +5 -0
- package/src/generators/application/application.js +52 -15
- package/src/generators/application/files/react-router-ssr/common/app/app-nav.tsx__tmpl__ +14 -0
- package/src/generators/application/files/react-router-ssr/common/app/entry.client.tsx__tmpl__ +18 -0
- package/src/generators/application/files/react-router-ssr/common/app/entry.server.tsx__tmpl__ +74 -0
- package/src/generators/application/files/react-router-ssr/common/app/root.tsx__tmpl__ +51 -0
- package/src/generators/application/files/react-router-ssr/common/app/routes/about.tsx__tmpl__ +7 -0
- package/src/generators/application/files/react-router-ssr/common/app/routes.tsx__tmpl__ +6 -0
- package/src/generators/application/files/react-router-ssr/common/public/favicon.ico +0 -0
- package/src/generators/application/files/react-router-ssr/common/react-router.config.ts__tmpl__ +5 -0
- package/src/generators/application/files/react-router-ssr/common/tests/routes/_index.spec.tsx__tmpl__ +16 -0
- package/src/generators/application/files/react-router-ssr/common/tsconfig.app.json__tmpl__ +23 -0
- package/src/generators/application/files/react-router-ssr/common/tsconfig.json__tmpl__ +27 -0
- package/src/generators/application/files/react-router-ssr/non-root/.gitignore__tmpl__ +5 -0
- package/src/generators/application/files/react-router-ssr/non-root/package.json__tmpl__ +24 -0
- package/src/generators/application/files/react-router-ssr/nx-welcome/claimed/app/nx-welcome.tsx__tmpl__ +866 -0
- package/src/generators/application/files/react-router-ssr/nx-welcome/not-configured/app/nx-welcome.tsx__tmpl__ +866 -0
- package/src/generators/application/files/react-router-ssr/nx-welcome/unclaimed/app/nx-welcome.tsx__tmpl__ +864 -0
- package/src/generators/application/files/react-router-ssr/ts-solution/package.json__tmpl__ +24 -0
- package/src/generators/application/files/react-router-ssr/ts-solution/tsconfig.app.json__tmpl__ +39 -0
- package/src/generators/application/lib/add-e2e.js +33 -24
- package/src/generators/application/lib/add-jest.js +26 -2
- package/src/generators/application/lib/add-linting.d.ts +1 -0
- package/src/generators/application/lib/add-linting.js +38 -0
- package/src/generators/application/lib/add-project.js +31 -15
- package/src/generators/application/lib/add-routing.js +1 -1
- package/src/generators/application/lib/bundlers/add-rspack.d.ts +0 -1
- package/src/generators/application/lib/bundlers/add-rspack.js +0 -18
- package/src/generators/application/lib/bundlers/add-vite.js +15 -6
- package/src/generators/application/lib/create-application-files.d.ts +61 -0
- package/src/generators/application/lib/create-application-files.js +81 -39
- package/src/generators/application/lib/get-app-tests.js +3 -3
- package/src/generators/application/lib/install-common-dependencies.js +13 -2
- package/src/generators/application/lib/normalize-options.d.ts +0 -2
- package/src/generators/application/lib/normalize-options.js +14 -20
- package/src/generators/application/schema.d.ts +5 -1
- package/src/generators/application/schema.json +10 -1
- package/src/generators/component-test/component-test.js +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.d.ts +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +7 -4
- package/src/generators/host/files/rspack-module-federation/rspack.config.js__tmpl__ +37 -13
- package/src/generators/host/files/rspack-module-federation/rspack.config.prod.js__tmpl__ +60 -32
- package/src/generators/host/files/rspack-module-federation-ssr/module-federation.server.config.js__tmpl__ +6 -0
- package/src/generators/host/files/rspack-module-federation-ssr/rspack.config.js__tmpl__ +66 -0
- package/src/generators/host/files/rspack-module-federation-ssr/server.ts__tmpl__ +1 -1
- package/src/generators/host/files/rspack-module-federation-ssr/src/main.server.tsx__tmpl__ +49 -0
- package/src/generators/host/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +6 -0
- package/src/generators/host/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__ +66 -0
- package/src/generators/host/files/rspack-module-federation-ssr-ts/server.ts__tmpl__ +1 -1
- package/src/generators/host/files/rspack-module-federation-ssr-ts/src/main.server.tsx__tmpl__ +49 -0
- package/src/generators/host/files/rspack-module-federation-ts/rspack.config.prod.ts__tmpl__ +37 -9
- package/src/generators/host/files/rspack-module-federation-ts/rspack.config.ts__tmpl__ +37 -14
- package/src/generators/host/host.js +21 -18
- package/src/generators/host/lib/add-module-federation-files.js +28 -12
- package/src/generators/host/lib/normalize-host-name.d.ts +2 -0
- package/src/generators/host/lib/normalize-host-name.js +12 -0
- package/src/generators/host/lib/setup-ssr-for-host.d.ts +3 -3
- package/src/generators/host/lib/setup-ssr-for-host.js +46 -22
- package/src/generators/init/init.js +23 -0
- package/src/generators/init/schema.d.ts +2 -0
- package/src/generators/library/lib/add-rollup-build-target.d.ts +3 -1
- package/src/generators/library/lib/add-rollup-build-target.js +6 -7
- package/src/generators/library/lib/create-files.js +2 -1
- package/src/generators/library/lib/normalize-options.js +8 -5
- package/src/generators/library/library.js +44 -30
- package/src/generators/library/schema.d.ts +2 -0
- package/src/generators/library/schema.json +4 -0
- package/src/generators/remote/files/rspack-module-federation/rspack.config.js__tmpl__ +40 -13
- package/src/generators/remote/files/rspack-module-federation-ssr/module-federation.server.config.js__tmpl__ +6 -0
- package/src/generators/remote/files/rspack-module-federation-ssr/rspack.config.js__tmpl__ +69 -0
- package/src/generators/remote/files/rspack-module-federation-ssr/server.ts__tmpl__ +2 -2
- package/src/generators/remote/files/rspack-module-federation-ssr/src/main.server.tsx__tmpl__ +45 -0
- package/src/generators/remote/files/rspack-module-federation-ssr-ts/module-federation.server.config.ts__tmpl__ +6 -0
- package/src/generators/remote/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__ +69 -0
- package/src/generators/remote/files/rspack-module-federation-ssr-ts/server.ts__tmpl__ +2 -2
- package/src/generators/remote/files/rspack-module-federation-ssr-ts/src/main.server.tsx__tmpl__ +45 -0
- package/src/generators/remote/files/rspack-module-federation-ts/rspack.config.ts__tmpl__ +40 -13
- package/src/generators/remote/lib/setup-ssr-for-remote.d.ts +1 -1
- package/src/generators/remote/lib/setup-ssr-for-remote.js +37 -15
- package/src/generators/remote/remote.js +46 -30
- package/src/plugins/router-plugin.d.ts +10 -0
- package/src/plugins/router-plugin.js +219 -0
- package/src/rules/update-module-federation-project.d.ts +2 -1
- package/src/rules/update-module-federation-project.js +28 -47
- package/src/utils/assertion.d.ts +2 -0
- package/src/utils/assertion.js +6 -0
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/ast-utils.js +2 -2
- package/src/utils/ct-utils.d.ts +1 -1
- package/src/utils/versions.d.ts +6 -4
- package/src/utils/versions.js +9 -6
- package/src/generators/host/files/rspack-module-federation-ssr/rspack.server.config.js__tmpl__ +0 -16
- package/src/generators/host/files/rspack-module-federation-ssr-ts/rspack.server.config.ts__tmpl__ +0 -16
- package/src/generators/remote/files/rspack-module-federation-ssr/rspack.server.config.js__tmpl__ +0 -16
- package/src/generators/remote/files/rspack-module-federation-ssr-ts/rspack.server.config.ts__tmpl__ +0 -16
- package/src/utils/format-file.d.ts +0 -1
- package/src/utils/format-file.js +0 -11
@@ -11,9 +11,9 @@ function getAppTests(options) {
|
|
11
11
|
|
12
12
|
it('should have a greeting as the title', () => {
|
13
13
|
${options.routing
|
14
|
-
? 'const {
|
15
|
-
: 'const {
|
16
|
-
expect(
|
14
|
+
? 'const { getAllByText } = render(<BrowserRouter><App /></BrowserRouter>);'
|
15
|
+
: 'const { getAllByText } = render(<App />);'}
|
16
|
+
expect(getAllByText(new RegExp('Welcome ${options.projectName}', 'gi')).length > 0).toBeTruthy();
|
17
17
|
});
|
18
18
|
`;
|
19
19
|
}
|
@@ -11,13 +11,24 @@ async function installCommonDependencies(host, options) {
|
|
11
11
|
const reactDeps = await (0, version_utils_1.getReactDependenciesVersionsToInstall)(host);
|
12
12
|
const dependencies = {};
|
13
13
|
const devDependencies = {
|
14
|
-
'@types/node': versions_1.typesNodeVersion,
|
15
14
|
'@types/react': reactDeps['@types/react'],
|
16
15
|
'@types/react-dom': reactDeps['@types/react-dom'],
|
16
|
+
'@types/node': versions_1.typesNodeVersion,
|
17
|
+
...(options.useReactRouter
|
18
|
+
? {
|
19
|
+
'@react-router/dev': versions_1.reactRouterVersion,
|
20
|
+
}
|
21
|
+
: {}),
|
17
22
|
};
|
18
23
|
if (options.bundler !== 'vite') {
|
19
24
|
dependencies['tslib'] = versions_1.tsLibVersion;
|
20
25
|
}
|
26
|
+
if (options.useReactRouter) {
|
27
|
+
dependencies['react-router'] = versions_1.reactRouterVersion;
|
28
|
+
dependencies['@react-router/node'] = versions_1.reactRouterVersion;
|
29
|
+
dependencies['@react-router/serve'] = versions_1.reactRouterVersion;
|
30
|
+
dependencies['isbot'] = versions_1.reactRouterIsBotVersion;
|
31
|
+
}
|
21
32
|
// Vite requires style preprocessors to be installed manually.
|
22
33
|
// `@nx/webpack` installs them automatically for now.
|
23
34
|
if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
|
@@ -45,5 +56,5 @@ async function installCommonDependencies(host, options) {
|
|
45
56
|
devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
|
46
57
|
devDependencies['@testing-library/dom'] = versions_1.testingLibraryDomVersion;
|
47
58
|
}
|
48
|
-
return (0, devkit_1.addDependenciesToPackageJson)(host,
|
59
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
|
49
60
|
}
|
@@ -1,5 +1,3 @@
|
|
1
1
|
import { Tree } from '@nx/devkit';
|
2
2
|
import { NormalizedSchema, Schema } from '../schema';
|
3
|
-
export declare function normalizeDirectory(options: Schema): string;
|
4
|
-
export declare function normalizeProjectName(options: Schema): string;
|
5
3
|
export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema): Promise<NormalizedSchema<T>>;
|
@@ -1,27 +1,14 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.normalizeDirectory = normalizeDirectory;
|
4
|
-
exports.normalizeProjectName = normalizeProjectName;
|
5
3
|
exports.normalizeOptions = normalizeOptions;
|
6
4
|
const devkit_1 = require("@nx/devkit");
|
7
5
|
const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
|
8
6
|
const assertion_1 = require("../../../utils/assertion");
|
9
7
|
const find_free_port_1 = require("./find-free-port");
|
10
8
|
const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
|
11
|
-
const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
|
12
|
-
function normalizeDirectory(options) {
|
13
|
-
options.directory = options.directory?.replace(/\\{1,2}/g, '/');
|
14
|
-
const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
15
|
-
return projectDirectory
|
16
|
-
? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
|
17
|
-
: (0, devkit_1.names)(options.name).fileName;
|
18
|
-
}
|
19
|
-
function normalizeProjectName(options) {
|
20
|
-
return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
|
21
|
-
}
|
22
9
|
async function normalizeOptions(host, options) {
|
23
|
-
await (0, project_name_and_root_utils_1.
|
24
|
-
const { projectName:
|
10
|
+
await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
|
11
|
+
const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
|
25
12
|
name: options.name,
|
26
13
|
projectType: 'application',
|
27
14
|
directory: options.directory,
|
@@ -32,6 +19,8 @@ async function normalizeOptions(host, options) {
|
|
32
19
|
nxJson.useInferencePlugins !== false;
|
33
20
|
options.addPlugin ??= addPlugin;
|
34
21
|
options.rootProject = appProjectRoot === '.';
|
22
|
+
const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
|
23
|
+
const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
|
35
24
|
const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
|
36
25
|
const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
|
37
26
|
const parsedTags = options.tags
|
@@ -42,23 +31,28 @@ async function normalizeOptions(host, options) {
|
|
42
31
|
? null
|
43
32
|
: options.style;
|
44
33
|
(0, assertion_1.assertValidStyle)(options.style);
|
45
|
-
|
34
|
+
(0, assertion_1.assertValidReactRouter)(options.useReactRouter, options.bundler);
|
35
|
+
if (options.useReactRouter && !options.bundler) {
|
36
|
+
options.bundler = 'vite';
|
37
|
+
}
|
38
|
+
options.useReactRouter = options.routing ? options.useReactRouter : false;
|
46
39
|
const normalized = {
|
47
40
|
...options,
|
48
|
-
|
49
|
-
projectName: isUsingTsSolutionConfig
|
50
|
-
? (0, get_import_path_1.getImportPath)(host, appProjectName)
|
51
|
-
: appProjectName,
|
41
|
+
projectName: appProjectName,
|
52
42
|
appProjectRoot,
|
43
|
+
importPath,
|
53
44
|
e2eProjectName,
|
54
45
|
e2eProjectRoot,
|
55
46
|
parsedTags,
|
56
47
|
fileName,
|
57
48
|
styledModule,
|
58
49
|
hasStyles: options.style !== 'none',
|
50
|
+
names: (0, devkit_1.names)(projectNames.projectSimpleName),
|
59
51
|
isUsingTsSolutionConfig,
|
52
|
+
useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
|
60
53
|
};
|
61
54
|
normalized.routing = normalized.routing ?? false;
|
55
|
+
normalized.useReactRouter = normalized.useReactRouter ?? false;
|
62
56
|
normalized.strict = normalized.strict ?? true;
|
63
57
|
normalized.classComponent = normalized.classComponent ?? false;
|
64
58
|
normalized.compiler = normalized.compiler ?? 'babel';
|
@@ -1,3 +1,4 @@
|
|
1
|
+
import type { names } from '@nx/devkit';
|
1
2
|
import type { Linter, LinterType } from '@nx/eslint';
|
2
3
|
import type { SupportedStyles } from '../../../typings/style';
|
3
4
|
|
@@ -13,6 +14,7 @@ export interface Schema {
|
|
13
14
|
linter: Linter | LinterType;
|
14
15
|
classComponent?: boolean;
|
15
16
|
routing?: boolean;
|
17
|
+
useReactRouter?: boolean;
|
16
18
|
skipNxJson?: boolean;
|
17
19
|
js?: boolean;
|
18
20
|
globalCss?: boolean;
|
@@ -30,7 +32,7 @@ export interface Schema {
|
|
30
32
|
nxCloudToken?: string;
|
31
33
|
useTsSolution?: boolean;
|
32
34
|
formatter?: 'prettier' | 'none';
|
33
|
-
|
35
|
+
useProjectJson?: boolean;
|
34
36
|
}
|
35
37
|
|
36
38
|
export interface NormalizedSchema<T extends Schema = Schema> extends T {
|
@@ -38,11 +40,13 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
|
|
38
40
|
appProjectRoot: string;
|
39
41
|
e2eProjectName: string;
|
40
42
|
e2eProjectRoot: string;
|
43
|
+
importPath: string;
|
41
44
|
parsedTags: string[];
|
42
45
|
fileName: string;
|
43
46
|
styledModule: null | SupportedStyles;
|
44
47
|
hasStyles: boolean;
|
45
48
|
unitTestRunner: 'jest' | 'vitest' | 'none';
|
46
49
|
addPlugin?: boolean;
|
50
|
+
names: ReturnType<typeof names>;
|
47
51
|
isUsingTsSolutionConfig?: boolean;
|
48
52
|
}
|
@@ -83,7 +83,12 @@
|
|
83
83
|
"routing": {
|
84
84
|
"type": "boolean",
|
85
85
|
"description": "Generate application with routes.",
|
86
|
-
"x-prompt": "Would you like to add
|
86
|
+
"x-prompt": "Would you like to add routing to this application?",
|
87
|
+
"default": false
|
88
|
+
},
|
89
|
+
"useReactRouter": {
|
90
|
+
"description": "Use React Router for routing.",
|
91
|
+
"type": "boolean",
|
87
92
|
"default": false
|
88
93
|
},
|
89
94
|
"skipFormat": {
|
@@ -187,6 +192,10 @@
|
|
187
192
|
"description": "Generate a React app with a minimal setup, no separate test files.",
|
188
193
|
"type": "boolean",
|
189
194
|
"default": false
|
195
|
+
},
|
196
|
+
"useProjectJson": {
|
197
|
+
"type": "boolean",
|
198
|
+
"description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
|
190
199
|
}
|
191
200
|
},
|
192
201
|
"required": ["directory"],
|
@@ -10,7 +10,7 @@ const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescri
|
|
10
10
|
let tsModule;
|
11
11
|
async function componentTestGenerator(tree, options) {
|
12
12
|
(0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
|
13
|
-
const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/
|
13
|
+
const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/versions'));
|
14
14
|
assertMinimumCypressVersion(10);
|
15
15
|
// normalize any windows paths
|
16
16
|
options.componentPath = options.componentPath.replace(/\\/g, '/');
|
@@ -1,4 +1,4 @@
|
|
1
|
+
import type { FoundTarget } from '@nx/cypress/src/utils/find-target-options';
|
1
2
|
import { ProjectConfiguration, Tree } from '@nx/devkit';
|
2
3
|
import type { CypressComponentConfigurationSchema } from '../schema';
|
3
|
-
import { FoundTarget } from '@nx/cypress/src/utils/find-target-options';
|
4
4
|
export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;
|
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addFiles = addFiles;
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
5
5
|
const versions_1 = require("nx/src/utils/versions");
|
6
|
-
const component_test_1 = require("../../component-test/component-test");
|
7
6
|
const ct_utils_1 = require("../../../utils/ct-utils");
|
7
|
+
const component_test_1 = require("../../component-test/component-test");
|
8
8
|
async function addFiles(tree, projectConfig, options, found) {
|
9
|
-
// must
|
9
|
+
// must dynamicaly import to prevent packages not using cypress from erroring out
|
10
10
|
// when importing react
|
11
|
-
const { addMountDefinition
|
11
|
+
const { addMountDefinition } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
|
12
|
+
const { getInstalledCypressMajorVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/versions'));
|
13
|
+
const installedCypressMajorVersion = getInstalledCypressMajorVersion(tree);
|
12
14
|
// Specifically undefined to allow Remix workaround of passing an empty string
|
13
15
|
const actualBundler = await (0, ct_utils_1.getActualBundler)(tree, options, found);
|
14
16
|
if (options.bundler && options.bundler !== actualBundler) {
|
@@ -18,7 +20,8 @@ async function addFiles(tree, projectConfig, options, found) {
|
|
18
20
|
const bundlerToUse = options.bundler ?? actualBundler;
|
19
21
|
const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
|
20
22
|
const updatedCommandFile = await addMountDefinition(tree.read(commandFile, 'utf-8'));
|
21
|
-
|
23
|
+
const moduleSpecifier = installedCypressMajorVersion >= 14 ? 'cypress/react' : 'cypress/react18';
|
24
|
+
tree.write(commandFile, `import { mount } from '${moduleSpecifier}';\n${updatedCommandFile}`);
|
22
25
|
if (options.bundler === 'webpack' ||
|
23
26
|
(!options.bundler && actualBundler === 'webpack')) {
|
24
27
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
|
@@ -1,16 +1,40 @@
|
|
1
|
-
const {
|
2
|
-
const {
|
1
|
+
const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
|
2
|
+
const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
|
3
|
+
const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');
|
4
|
+
const { join } = require('path');
|
3
5
|
|
4
|
-
const
|
6
|
+
const config = require('./module-federation.config');
|
5
7
|
|
6
|
-
|
7
|
-
|
8
|
+
module.exports = {
|
9
|
+
output: {
|
10
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
|
11
|
+
publicPath: 'auto'
|
12
|
+
},
|
13
|
+
devServer: {
|
14
|
+
port: <%= devServerPort %>,
|
15
|
+
historyApiFallback: {
|
16
|
+
index: '/index.html',
|
17
|
+
disableDotRule: true,
|
18
|
+
htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
|
19
|
+
},
|
20
|
+
},
|
21
|
+
plugins: [
|
22
|
+
new NxAppRspackPlugin({
|
23
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
24
|
+
main: '<%= rspackPluginOptions.main %>',
|
25
|
+
index: '<%= rspackPluginOptions.index %>',
|
26
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
27
|
+
assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
|
28
|
+
styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
|
29
|
+
outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
|
30
|
+
optimization: process.env['NODE_ENV'] === 'production',
|
31
|
+
}),
|
32
|
+
new NxReactRspackPlugin({
|
33
|
+
// Uncomment this line if you don't want to use SVGR
|
34
|
+
// See: https://react-svgr.com/
|
35
|
+
// svgr: false
|
36
|
+
}),
|
37
|
+
new NxModuleFederationPlugin({ config }, { dts: false }),
|
38
|
+
new NxModuleFederationDevServerPlugin({ config }),
|
39
|
+
],
|
8
40
|
};
|
9
|
-
|
10
|
-
// Nx plugins for rspack to build config object from Nx options and context.
|
11
|
-
/**
|
12
|
-
* DTS Plugin is disabled in Nx Workspaces as Nx already provides Typing support for Module Federation
|
13
|
-
* The DTS Plugin can be enabled by setting dts: true
|
14
|
-
* Learn more about the DTS Plugin here: https://module-federation.io/configure/dts.html
|
15
|
-
*/
|
16
|
-
module.exports = composePlugins(withNx(), withReact(), withModuleFederation(config, { dts: false }));
|
@@ -1,38 +1,66 @@
|
|
1
|
-
const {
|
2
|
-
const {
|
1
|
+
const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
|
2
|
+
const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
|
3
|
+
const { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } = require('@nx/module-federation/rspack');
|
4
|
+
const { join } = require('path');
|
3
5
|
|
4
6
|
const baseConfig = require('./module-federation.config');
|
5
7
|
|
6
8
|
const prodConfig = {
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
9
|
+
...baseConfig,
|
10
|
+
/*
|
11
|
+
* Remote overrides for production.
|
12
|
+
* Each entry is a pair of a unique name and the URL where it is deployed.
|
13
|
+
*
|
14
|
+
* e.g.
|
15
|
+
* remotes: [
|
16
|
+
* ['app1', 'http://app1.example.com'],
|
17
|
+
* ['app2', 'http://app2.example.com'],
|
18
|
+
* ]
|
19
|
+
*
|
20
|
+
* You can also use a full path to the remoteEntry.js file if desired.
|
21
|
+
*
|
22
|
+
* remotes: [
|
23
|
+
* ['app1', 'http://example.com/path/to/app1/remoteEntry.js'],
|
24
|
+
* ['app2', 'http://example.com/path/to/app2/remoteEntry.js'],
|
25
|
+
* ]
|
26
|
+
*/
|
27
|
+
remotes: [
|
28
|
+
<%_ remotes.forEach(function(r) { _%>
|
29
|
+
['<%= r.fileName %>', 'http://localhost:<%= r.port %>/'],
|
30
|
+
<%_ }); _%>
|
31
|
+
],
|
30
32
|
};
|
31
33
|
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
34
|
+
module.exports = {
|
35
|
+
output: {
|
36
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>'),
|
37
|
+
publicPath: 'auto'
|
38
|
+
},
|
39
|
+
devServer: {
|
40
|
+
port: <%= devServerPort %>,
|
41
|
+
historyApiFallback: {
|
42
|
+
index: '/index.html',
|
43
|
+
disableDotRule: true,
|
44
|
+
htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
|
45
|
+
},
|
46
|
+
},
|
47
|
+
plugins: [
|
48
|
+
new NxAppRspackPlugin({
|
49
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
50
|
+
main: '<%= rspackPluginOptions.main %>',
|
51
|
+
index: '<%= rspackPluginOptions.index %>',
|
52
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
53
|
+
assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
|
54
|
+
styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
|
55
|
+
outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
|
56
|
+
optimization: process.env['NODE_ENV'] === 'production',
|
57
|
+
}),
|
58
|
+
new NxReactRspackPlugin({
|
59
|
+
// Uncomment this line if you don't want to use SVGR
|
60
|
+
// See: https://react-svgr.com/
|
61
|
+
// svgr: false
|
62
|
+
}),
|
63
|
+
new NxModuleFederationPlugin({ config: prodConfig }, { dts: false }),
|
64
|
+
new NxModuleFederationDevServerPlugin({ config: prodConfig }),
|
65
|
+
],
|
66
|
+
};
|
@@ -0,0 +1,66 @@
|
|
1
|
+
const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
|
2
|
+
const { NxReactRspackPlugin } = require('@nx/rspack/react-plugin');
|
3
|
+
const { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } = require('@nx/module-federation/rspack');
|
4
|
+
const { join } = require('path');
|
5
|
+
|
6
|
+
const browserMfConfig = require('./module-federation.config');
|
7
|
+
const serverMfConfig = require('./module-federation.server.config');
|
8
|
+
|
9
|
+
const browserRspackConfig = {
|
10
|
+
name: 'browser',
|
11
|
+
output: {
|
12
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'browser'),
|
13
|
+
publicPath: 'auto'
|
14
|
+
},
|
15
|
+
devServer: {
|
16
|
+
port: <%= devServerPort %>,
|
17
|
+
historyApiFallback: {
|
18
|
+
index: '/index.html',
|
19
|
+
disableDotRule: true,
|
20
|
+
htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
|
21
|
+
},
|
22
|
+
devMiddleware: {
|
23
|
+
writeToDisk: (file: string) => !file.includes('.hot-update.'),
|
24
|
+
},
|
25
|
+
},
|
26
|
+
plugins: [
|
27
|
+
new NxAppRspackPlugin({
|
28
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
29
|
+
main: '<%= rspackPluginOptions.main %>',
|
30
|
+
index: '<%= rspackPluginOptions.index %>',
|
31
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
32
|
+
assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
|
33
|
+
styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
|
34
|
+
outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
|
35
|
+
optimization: process.env['NODE_ENV'] === 'production',
|
36
|
+
}),
|
37
|
+
new NxReactRspackPlugin({
|
38
|
+
// Uncomment this line if you don't want to use SVGR
|
39
|
+
// See: https://react-svgr.com/
|
40
|
+
// svgr: false
|
41
|
+
}),
|
42
|
+
new NxModuleFederationPlugin({ config: browserMfConfig }, { dts: false }),
|
43
|
+
],
|
44
|
+
};
|
45
|
+
|
46
|
+
const serverRspackConfig = {
|
47
|
+
name: 'server',
|
48
|
+
target: 'async-node',
|
49
|
+
output: {
|
50
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'server'),
|
51
|
+
filename: 'server.js'
|
52
|
+
},
|
53
|
+
plugins: [
|
54
|
+
new NxAppRspackPlugin({
|
55
|
+
outputPath: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'server'),
|
56
|
+
outputFileName: 'server.js',
|
57
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
58
|
+
main: '<%= rspackPluginOptions.mainServer %>',
|
59
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
60
|
+
}),
|
61
|
+
new NxModuleFederationPlugin({ config: serverMfConfig, isServer: true }, { dts: false }),
|
62
|
+
new NxModuleFederationSSRDevServerPlugin({ config: serverMfConfig }),
|
63
|
+
],
|
64
|
+
};
|
65
|
+
|
66
|
+
module.exports = [browserRspackConfig, serverRspackConfig];
|
@@ -7,7 +7,7 @@ import { handleRequest } from './src/main.server';
|
|
7
7
|
const port = process.env['PORT'] || <%= port %>;
|
8
8
|
const app = express();
|
9
9
|
|
10
|
-
const browserDist = path.join(process.cwd(), '<%=
|
10
|
+
const browserDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'browser');
|
11
11
|
const indexPath = path.join(browserDist, 'index.html');
|
12
12
|
|
13
13
|
app.use(cors());
|
@@ -0,0 +1,49 @@
|
|
1
|
+
import type { Request, Response } from 'express';
|
2
|
+
import * as fs from 'fs';
|
3
|
+
import * as ReactDOMServer from 'react-dom/server';
|
4
|
+
import isbot from 'isbot'
|
5
|
+
|
6
|
+
import App from './app/app';
|
7
|
+
|
8
|
+
import { StaticRouter } from 'react-router-dom/server';
|
9
|
+
|
10
|
+
|
11
|
+
let indexHtml: null | string = null;
|
12
|
+
|
13
|
+
export function handleRequest(indexPath: string) {
|
14
|
+
return function render(req: Request, res: Response) {
|
15
|
+
let didError = false;
|
16
|
+
|
17
|
+
if (!indexHtml) {
|
18
|
+
indexHtml = fs.readFileSync(indexPath).toString();
|
19
|
+
}
|
20
|
+
|
21
|
+
const [htmlStart, htmlEnd] = indexHtml.split(`<div id="root"></div>`);
|
22
|
+
|
23
|
+
// For bots (e.g. search engines), the content will not be streamed but render all at once.
|
24
|
+
// For users, content should be streamed to the user as they are ready.
|
25
|
+
const callbackName = isbot(req.headers['user-agent']) ? 'onAllReady' : 'onShellReady';
|
26
|
+
|
27
|
+
const stream = ReactDOMServer.renderToPipeableStream(
|
28
|
+
<StaticRouter location={req.originalUrl}><App /></StaticRouter>,
|
29
|
+
{
|
30
|
+
[callbackName]() {
|
31
|
+
res.statusCode = didError ? 500 : 200;
|
32
|
+
res.setHeader('Content-type', 'text/html; charset=utf-8');
|
33
|
+
res.write(`${htmlStart}<div id="root">`);
|
34
|
+
stream.pipe(res);
|
35
|
+
res.write(`</div>${htmlEnd}`);
|
36
|
+
},
|
37
|
+
onShellError(error) {
|
38
|
+
console.error(error);
|
39
|
+
res.statusCode = 500;
|
40
|
+
res.send('<!doctype html><h1>Server Error</h1>');
|
41
|
+
},
|
42
|
+
onError(error) {
|
43
|
+
didError = true;
|
44
|
+
console.error(error);
|
45
|
+
}
|
46
|
+
}
|
47
|
+
);
|
48
|
+
}
|
49
|
+
}
|
@@ -0,0 +1,66 @@
|
|
1
|
+
import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
|
2
|
+
import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
|
3
|
+
import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack';
|
4
|
+
import { join } from 'path';
|
5
|
+
|
6
|
+
import browserMfConfig from './module-federation.config';
|
7
|
+
import serverMfConfig from './module-federation.server.config';
|
8
|
+
|
9
|
+
const browserRspackConfig = {
|
10
|
+
name: 'browser',
|
11
|
+
output: {
|
12
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'browser'),
|
13
|
+
publicPath: 'auto'
|
14
|
+
},
|
15
|
+
devServer: {
|
16
|
+
port: <%= devServerPort %>,
|
17
|
+
historyApiFallback: {
|
18
|
+
index: '/index.html',
|
19
|
+
disableDotRule: true,
|
20
|
+
htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
|
21
|
+
},
|
22
|
+
devMiddleware: {
|
23
|
+
writeToDisk: (file: string) => !file.includes('.hot-update.'),
|
24
|
+
},
|
25
|
+
},
|
26
|
+
plugins: [
|
27
|
+
new NxAppRspackPlugin({
|
28
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
29
|
+
main: '<%= rspackPluginOptions.main %>',
|
30
|
+
index: '<%= rspackPluginOptions.index %>',
|
31
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
32
|
+
assets: <%- JSON.stringify(rspackPluginOptions.assets) %>,
|
33
|
+
styles: <%- JSON.stringify(rspackPluginOptions.styles) %>,
|
34
|
+
outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
|
35
|
+
optimization: process.env['NODE_ENV'] === 'production',
|
36
|
+
}),
|
37
|
+
new NxReactRspackPlugin({
|
38
|
+
// Uncomment this line if you don't want to use SVGR
|
39
|
+
// See: https://react-svgr.com/
|
40
|
+
// svgr: false
|
41
|
+
}),
|
42
|
+
new NxModuleFederationPlugin({ config: browserMfConfig }, { dts: false }),
|
43
|
+
],
|
44
|
+
};
|
45
|
+
|
46
|
+
const serverRspackConfig = {
|
47
|
+
name: 'server',
|
48
|
+
target: 'async-node',
|
49
|
+
output: {
|
50
|
+
path: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'server'),
|
51
|
+
filename: 'server.js'
|
52
|
+
},
|
53
|
+
plugins: [
|
54
|
+
new NxAppRspackPlugin({
|
55
|
+
outputPath: join(__dirname, '<%= rspackPluginOptions.outputPath %>', 'server'),
|
56
|
+
outputFileName: 'server.js',
|
57
|
+
tsConfig: '<%= rspackPluginOptions.tsConfig %>',
|
58
|
+
main: '<%= rspackPluginOptions.mainServer %>',
|
59
|
+
baseHref: '<%= rspackPluginOptions.baseHref %>',
|
60
|
+
}),
|
61
|
+
new NxModuleFederationPlugin({ config: serverMfConfig, isServer: true }, { dts: false }),
|
62
|
+
new NxModuleFederationSSRDevServerPlugin({ config: serverMfConfig }),
|
63
|
+
],
|
64
|
+
};
|
65
|
+
|
66
|
+
export default [browserRspackConfig, serverRspackConfig];
|
@@ -7,7 +7,7 @@ import { handleRequest } from './src/main.server';
|
|
7
7
|
const port = process.env['PORT'] || <%= port %>;
|
8
8
|
const app = express();
|
9
9
|
|
10
|
-
const browserDist = path.join(process.cwd(), '<%=
|
10
|
+
const browserDist = path.join(process.cwd(), '<%= rspackPluginOptions.outputPath %>', 'browser');
|
11
11
|
const indexPath = path.join(browserDist, 'index.html');
|
12
12
|
|
13
13
|
app.use(cors());
|