Skip to content

Commit d54e974

Browse files
committed
Merge branch 'make-dev-agentic' into codex/app-dev-json
2 parents a6a9507 + dce1186 commit d54e974

4 files changed

Lines changed: 26 additions & 4 deletions

File tree

‎.changeset/windows-dev-shutdown.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
'@shopify/cli-kit': patch
3+
'@shopify/cli': patch
34
---
45

5-
Preserve the CLI process while stopping child processes during graceful shutdown on Windows.
6+
Preserve graceful shutdown and child-process cleanup on Windows.

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@
117117
"protobufjs",
118118
"unrs-resolver",
119119
"yarn"
120-
]
120+
],
121+
"patchedDependencies": {
122+
"when-exit@2.1.5": "patches/when-exit@2.1.5.patch"
123+
}
121124
},
122125
"resolutions": {
123126
"@types/react": "18.3.12",

‎patches/when-exit@2.1.5.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/dist/node/interceptor.js b/dist/node/interceptor.js
2+
index a0be92635ade17f6fd5ca75c441179d82e455dd9..72d1b4114cc80d6ae00b58c4b8198cfef9463b61 100644
3+
--- a/dist/node/interceptor.js
4+
+++ b/dist/node/interceptor.js
5+
@@ -17,7 +17,7 @@ class Interceptor {
6+
for (const callback of this.callbacks) {
7+
callback();
8+
}
9+
- if (signal) {
10+
+ if (signal && process.listenerCount(signal) === 0) {
11+
if (IS_WINDOWS && (signal !== 'SIGINT' && signal !== 'SIGTERM' && signal !== 'SIGKILL')) { // Windows doesn't support POSIX signals, but Node emulates these 3 signals for us
12+
process.kill(process.pid, 'SIGTERM');
13+
}

‎pnpm-lock.yaml‎

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)