Skip to content

Commit d3850ed

Browse files
authored
Merge branch 'main' into austinmerrick/remove-zeit-fetch-dep
2 parents 80118d2 + 5e5a601 commit d3850ed

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

.changeset/polite-snakes-exist.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

packages/node/src/dev-server.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ process.on('message', async m => {
168168
await onExit();
169169
}
170170
process.exit(0);
171+
break;
171172
default:
172173
console.error(`unknown IPC message from parent:`, m);
173174
break;

packages/node/test/unit/dev.test.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,19 @@ async function withDevServer(
6363
} finally {
6464
const elapsed = Date.now() - start;
6565
if (runningTimeout) await setTimeout(runningTimeout - elapsed);
66-
child.send('shutdown', error => error && child.kill(9));
66+
child.send('shutdown', error => {
67+
if (error) {
68+
console.log('Shutdown error:', error);
69+
try {
70+
child.kill(9);
71+
} catch (error) {
72+
// In Node 22, there's a bug where attempting to kill a child process
73+
// results in an EPERM error. Ignore the error in that case.
74+
// See: https://github.com/nodejs/node/issues/51766
75+
console.log('Ignoring kill error:', error);
76+
}
77+
}
78+
});
6779
if (child.exitCode === null) await once(child, 'exit');
6880
}
6981
}

utils/chunk-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const runnersMap = new Map([
1010
max: 1,
1111
testScript: 'vitest-run',
1212
runners: ['ubuntu-latest', 'macos-14', 'windows-latest'],
13-
nodeVersions: ['16', '18', '20'],
13+
nodeVersions: ['16', '18', '20', '22'],
1414
},
1515
],
1616
[

0 commit comments

Comments
 (0)