Merge pull request #6519 from Shopify/10-16-don_t_stop_dev_until_the_analytics_event_is_sent

Don't stop dev until the analytics event is sent

Author: isaacroldan

.vscode/settings.json

@@ -21,7 +21,7 @@
     "**/node_modules": true
   },
   "editor.formatOnSave": false,
-  "eslint.validate": ["javascript", "javascriptreact", "typescript"],
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "[javascript]": {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"

packages/app/src/cli/services/dev/ui/components/DevSessionUI.tsx

@@ -18,6 +18,7 @@ import {openURL} from '@shopify/cli-kit/node/system'
 import figures from '@shopify/cli-kit/node/figures'
 import {isUnitTest} from '@shopify/cli-kit/node/context/local'
 import {treeKill} from '@shopify/cli-kit/node/tree-kill'
+import {postRunHookHasCompleted} from '@shopify/cli-kit/node/hooks/postrun'
 import {Writable} from 'stream'
 
 interface DevSesionUIProps {
@@ -61,9 +62,17 @@ const DevSessionUI: FunctionComponent<DevSesionUIProps> = ({
       await onAbort()
     }
     if (isUnitTest()) return
-    treeKill(process.pid, 'SIGINT', false, () => {
-      process.exit(0)
-    })
+
+    // Wait for the post run hook to complete or timeout after 5 seconds.
+    let totalTime = 0
+    setInterval(() => {
+      if (postRunHookHasCompleted() || totalTime > 5000) {
+        treeKill(process.pid, 'SIGINT', false, () => {
+          process.exit(0)
+        })
+      }
+      totalTime += 100
+    }, 100)
   })
 
   const errorHandledProcesses = useMemo(() => {

packages/cli-kit/src/public/node/hooks/postrun.ts

@@ -5,6 +5,17 @@ import BaseCommand from '../base-command.js'
 import * as metadata from '../../../public/node/metadata.js'
 import {Command, Hook} from '@oclif/core'
 
+let postRunHookCompleted = false
+
+/**
+ * Check if post run hook has completed.
+ *
+ * @returns Whether post run hook has completed.
+ */
+export function postRunHookHasCompleted(): boolean {
+  return postRunHookCompleted
+}
+
 // This hook is called after each successful command run. More info: https://oclif.io/docs/hooks
 export const hook: Hook.Postrun = async ({config, Command}) => {
   await detectStopCommand(Command as unknown as typeof Command)
@@ -13,6 +24,7 @@ export const hook: Hook.Postrun = async ({config, Command}) => {
 
   const command = Command.id.replace(/:/g, ' ')
   outputDebug(`Completed command ${command}`)
+  postRunHookCompleted = true
 }
 
 /**