Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(react): module-federation-ssr-dev-server should use fork #13791

Merged
merged 2 commits into from Dec 13, 2022
Merged

fix(react): module-federation-ssr-dev-server should use fork #13791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f77e85d
fix(react): module-federation-ssr-dev-server should use fork
Coly010 Dec 13, 2022
51666e3
fix(react): use createAsyncIterable instead of generator function
Coly010 Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 53 additions & 16 deletions ...t/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.ts
View file
Open in desktop
@@ -1,12 +1,20 @@
import { ExecutorContext, logger, runExecutor } from '@nrwl/devkit';
import {
ExecutorContext,
logger,
runExecutor,
workspaceRoot,
} from '@nrwl/devkit';
import ssrDevServerExecutor from '@nrwl/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl';
import { WebSsrDevServerOptions } from '@nrwl/webpack/src/executors/ssr-dev-server/schema';
import { join } from 'path';
import * as chalk from 'chalk';
import {
combineAsyncIterableIterators,
createAsyncIterable,
mapAsyncIterable,
tapAsyncIterable,
} from '@nrwl/devkit/src/utils/async-iterable';
import { execSync, fork } from 'child_process';

type ModuleFederationDevServerOptions = WebSsrDevServerOptions & {
devRemotes?: string | string[];
Expand All @@ -18,7 +26,7 @@ export default async function* moduleFederationSsrDevServer(
options: ModuleFederationDevServerOptions,
context: ExecutorContext
) {
let iter = ssrDevServerExecutor(options, context);
let iter: any = ssrDevServerExecutor(options, context);
const p = context.workspace.projects[context.projectName];

const moduleFederationConfigPath = join(
Expand Down Expand Up @@ -51,20 +59,49 @@ export default async function* moduleFederationSsrDevServer(
for (const app of knownRemotes) {
const [appName] = Array.isArray(app) ? app : [app];
const isDev = devServeApps.includes(appName);
iter = combineAsyncIterableIterators(
iter,
await runExecutor(
{
project: appName,
target: isDev ? 'serve' : 'serve-server',
configuration: context.configurationName,
},
{
watch: isDev,
},
context
)
);
const remoteServeIter = isDev
? await runExecutor(
{
project: appName,
target: 'serve',
configuration: context.configurationName,
},
{
watch: isDev,
},
context
)
: mapAsyncIterable(
createAsyncIterable(async ({ next, done }) => {
const remoteProject = context.workspace.projects[appName];
const remoteServerOutput = join(
workspaceRoot,
remoteProject.targets.server.options.outputPath,
'main.js'
);
execSync(
`npx nx run ${appName}:server${
context.configurationName ? `:${context.configurationName}` : ''
}`,
{ stdio: 'inherit' }
);
const child = fork(remoteServerOutput, {
env: {
PORT: remoteProject.targets['serve-browser'].options.port,
},
});

child.on('message', (msg) => {
if (msg === 'nx.server.ready') {
next(true);
done();
}
});
}),
(x) => x
);

iter = combineAsyncIterableIterators(iter, remoteServeIter);
}

let numAwaiting = knownRemotes.length + 1; // remotes + host
Expand Down