miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(react): ssr should serve correctly and e2e should function (#17725)

Browse Source
This commit is contained in:
Colum Ferry 2023-06-22 14:51:41 +01:00 committed by GitHub
parent 1fcba1a43a
commit fffd84c3aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 153 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

304
packages/js/src/executors/node/node.impl.ts
View File

@ -9,8 +9,8 @@ import {
} from '@nx/devkit'; } from '@nx/devkit';
import { daemonClient } from 'nx/src/daemon/client/client'; import { daemonClient } from 'nx/src/daemon/client/client';
import { randomUUID } from 'crypto'; import { randomUUID } from 'crypto';
import { join } from 'path';
import * as path from 'path'; import * as path from 'path';
import { join } from 'path';
import { InspectType, NodeExecutorOptions } from './schema'; import { InspectType, NodeExecutorOptions } from './schema';
import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable'; import { createAsyncIterable } from '@nx/devkit/src/utils/async-iterable';
@ -81,173 +81,172 @@ export async function* nodeExecutor(
const tasks: ActiveTask[] = []; const tasks: ActiveTask[] = [];
let currentTask: ActiveTask = null; let currentTask: ActiveTask = null;
yield* createAsyncIterable<{ success: boolean }>( yield* createAsyncIterable<{
async ({ done, next, error }) => { success: boolean;
const processQueue = async () => { options?: Record<string, any>;
if (tasks.length === 0) return; }>(async ({ done, next, error }) => {
const processQueue = async () => {
if (tasks.length === 0) return;
const previousTask = currentTask; const previousTask = currentTask;
const task = tasks.shift(); const task = tasks.shift();
currentTask = task; currentTask = task;
await previousTask?.stop('SIGTERM'); await previousTask?.stop('SIGTERM');
await task.start(); await task.start();
}; };
const debouncedProcessQueue = debounce( const debouncedProcessQueue = debounce(
processQueue, processQueue,
options.debounce ?? 1_000 options.debounce ?? 1_000
); );
const addToQueue = async () => { const addToQueue = async () => {
const task: ActiveTask = { const task: ActiveTask = {
id: randomUUID(), id: randomUUID(),
killed: false, killed: false,
childProcess: null, childProcess: null,
promise: null, promise: null,
start: async () => { start: async () => {
let buildFailed = false; let buildFailed = false;
// Run the build // Run the build
task.promise = new Promise<void>(async (resolve, reject) => { task.promise = new Promise<void>(async (resolve, reject) => {
task.childProcess = exec( task.childProcess = exec(
`npx nx run ${context.projectName}:${buildTarget.target}${ `npx nx run ${context.projectName}:${buildTarget.target}${
buildTarget.configuration buildTarget.configuration ? `:${buildTarget.configuration}` : ''
? `:${buildTarget.configuration}` }`,
: '' {
}`, cwd: context.root,
{ },
cwd: context.root, (error, stdout, stderr) => {
}, if (
(error, stdout, stderr) => { // Build succeeded
if ( !error ||
// Build succeeded // If task was killed then another build process has started, ignore errors.
!error || task.killed
// If task was killed then another build process has started, ignore errors. ) {
task.killed resolve();
) { return;
resolve();
return;
}
logger.info(stdout);
buildFailed = true;
if (options.watch) {
logger.error(
`Build failed, waiting for changes to restart...`
);
resolve(); // Don't reject because it'll error out and kill the Nx process.
} else {
logger.error(`Build failed. See above for errors.`);
reject();
}
} }
);
});
// Wait for build to finish logger.info(stdout);
await task.promise; buildFailed = true;
if (options.watch) {
// Task may have been stopped due to another running task. logger.error(
// OR build failed, so don't start the process. `Build failed, waiting for changes to restart...`
if (task.killed || buildFailed) return;
// Run the program
task.promise = new Promise<void>((resolve, reject) => {
task.childProcess = fork(
joinPathFragments(__dirname, 'node-with-require-overrides'),
options.args ?? [],
{
execArgv: getExecArgv(options),
stdio: [0, 1, 'pipe', 'ipc'],
env: {
...process.env,
NX_FILE_TO_RUN: fileToRunCorrectPath(fileToRun),
NX_MAPPINGS: JSON.stringify(mappings),
},
}
);
task.childProcess.stderr.on('data', (data) => {
// Don't log out error if task is killed and new one has started.
// This could happen if a new build is triggered while new process is starting, since the operation is not atomic.
// Log the error in normal mode
if (!options.watch || !task.killed) {
logger.error(data.toString());
}
});
task.childProcess.once('exit', (code) => {
if (options.watch && !task.killed) {
logger.info(
`NX Process exited with code ${code}, waiting for changes to restart...`
); );
resolve(); // Don't reject because it'll error out and kill the Nx process.
} else {
logger.error(`Build failed. See above for errors.`);
reject();
} }
if (!options.watch) done(); }
resolve(); );
}); });
next({ success: true }); // Wait for build to finish
await task.promise;
// Task may have been stopped due to another running task.
// OR build failed, so don't start the process.
if (task.killed || buildFailed) return;
// Run the program
task.promise = new Promise<void>((resolve, reject) => {
task.childProcess = fork(
joinPathFragments(__dirname, 'node-with-require-overrides'),
options.args ?? [],
{
execArgv: getExecArgv(options),
stdio: [0, 1, 'pipe', 'ipc'],
env: {
...process.env,
NX_FILE_TO_RUN: fileToRunCorrectPath(fileToRun),
NX_MAPPINGS: JSON.stringify(mappings),
},
}
);
task.childProcess.stderr.on('data', (data) => {
// Don't log out error if task is killed and new one has started.
// This could happen if a new build is triggered while new process is starting, since the operation is not atomic.
// Log the error in normal mode
if (!options.watch || !task.killed) {
logger.error(data.toString());
}
}); });
},
stop: async (signal = 'SIGTERM') => {
task.killed = true;
// Request termination and wait for process to finish gracefully.
// NOTE: `childProcess` may not have been set yet if the task did not have a chance to start.
// e.g. multiple file change events in a short time (like git checkout).
if (task.childProcess) {
await killTree(task.childProcess.pid, signal);
}
await task.promise;
},
};
tasks.push(task); task.childProcess.once('exit', (code) => {
}; if (options.watch && !task.killed) {
logger.info(
`NX Process exited with code ${code}, waiting for changes to restart...`
);
}
if (!options.watch) done();
resolve();
});
const stopWatch = await daemonClient.registerFileWatcher( next({ success: true, options: buildOptions });
{ });
watchProjects: [context.projectName],
includeDependentProjects: true,
}, },
async (err, data) => { stop: async (signal = 'SIGTERM') => {
if (err === 'closed') { task.killed = true;
logger.error(`Watch error: Daemon closed the connection`); // Request termination and wait for process to finish gracefully.
process.exit(1); // NOTE: `childProcess` may not have been set yet if the task did not have a chance to start.
} else if (err) { // e.g. multiple file change events in a short time (like git checkout).
logger.error(`Watch error: ${err?.message ?? 'Unknown'}`); if (task.childProcess) {
} else { await killTree(task.childProcess.pid, signal);
logger.info(`NX File change detected. Restarting...`);
await addToQueue();
await debouncedProcessQueue();
} }
} await task.promise;
); },
const stopAllTasks = (signal: NodeJS.Signals = 'SIGTERM') => {
for (const task of tasks) {
task.stop(signal);
}
}; };
process.on('SIGTERM', async () => { tasks.push(task);
stopWatch(); };
stopAllTasks('SIGTERM');
process.exit(128 + 15);
});
process.on('SIGINT', async () => {
stopWatch();
stopAllTasks('SIGINT');
process.exit(128 + 2);
});
process.on('SIGHUP', async () => {
stopWatch();
stopAllTasks('SIGHUP');
process.exit(128 + 1);
});
await addToQueue(); const stopWatch = await daemonClient.registerFileWatcher(
await processQueue(); {
} watchProjects: [context.projectName],
); includeDependentProjects: true,
},
async (err, data) => {
if (err === 'closed') {
logger.error(`Watch error: Daemon closed the connection`);
process.exit(1);
} else if (err) {
logger.error(`Watch error: ${err?.message ?? 'Unknown'}`);
} else {
logger.info(`NX File change detected. Restarting...`);
await addToQueue();
await debouncedProcessQueue();
}
}
);
const stopAllTasks = (signal: NodeJS.Signals = 'SIGTERM') => {
for (const task of tasks) {
task.stop(signal);
}
};
process.on('SIGTERM', async () => {
stopWatch();
stopAllTasks('SIGTERM');
process.exit(128 + 15);
});
process.on('SIGINT', async () => {
stopWatch();
stopAllTasks('SIGINT');
process.exit(128 + 2);
});
process.on('SIGHUP', async () => {
stopWatch();
stopAllTasks('SIGHUP');
process.exit(128 + 1);
});
await addToQueue();
await processQueue();
});
} }
function getExecArgv(options: NodeExecutorOptions) { function getExecArgv(options: NodeExecutorOptions) {
@ -284,6 +283,7 @@ function calculateResolveMappings(
return m; return m;
}, {}); }, {});
} }
function runWaitUntilTargets( function runWaitUntilTargets(
options: NodeExecutorOptions, options: NodeExecutorOptions,
context: ExecutorContext context: ExecutorContext

1
packages/react/src/generators/setup-ssr/setup-ssr.ts
View File

@ -115,6 +115,7 @@ export async function setupSsrGenerator(tree: Tree, options: Schema) {
target: 'node', target: 'node',
main: `${projectRoot}/server.ts`, main: `${projectRoot}/server.ts`,
outputPath: joinPathFragments(originalOutputPath, 'server'), outputPath: joinPathFragments(originalOutputPath, 'server'),
outputFileName: 'server.js',
tsConfig: `${projectRoot}/tsconfig.server.json`, tsConfig: `${projectRoot}/tsconfig.server.json`,
compiler: 'babel', compiler: 'babel',
externalDependencies: 'all', externalDependencies: 'all',