Merge branch 'codex/app-dev-json' into codex/theme-dev-instance

Author: isaacroldan

packages/app/src/cli/services/dev/ui.integration.test.ts

@@ -11,6 +11,8 @@ const statusUrl = new URL('./processes/dev-session/dev-session-status-manager.ts
 const postrunUrl = new URL('../../../../../cli-kit/src/public/node/hooks/postrun.ts', import.meta.url).href
 const sourceLoaderUrl = new URL('../../../../test/fixtures/app-source-loader.js', import.meta.url).href
 const tsconfigPath = fileURLToPath(new URL('../../../../test/fixtures/tsconfig.json', import.meta.url))
+// Windows starts PowerShell to enumerate and stop the remaining child processes.
+const postrunExitTimeoutMs = process.platform === 'win32' ? 15000 : 5000
 
 // Windows process.kill() terminates immediately instead of delivering a catchable signal.
 // Exercise handlers on every platform and OS signal delivery where it is supported.
@@ -85,7 +87,10 @@ test.each(shutdownCases.flatMap((entry) => ['text', 'json'].map((mode) => ({...e
         process.stderr.write('Session cleaned up\\n')
         await hook.call({}, {config: {}, Command: {id: 'app:dev'}})
         process.stderr.write('Postrun completed\\n')
-        setTimeout(() => process.exit(2), 5000)
+        setTimeout(() => {
+          process.stderr.write('Postrun shutdown timed out\\n')
+          process.exit(2)
+        }, ${postrunExitTimeoutMs})
       `
       const result = await captureOutputWithExitCode(
         process.execPath,

packages/cli/src/cli/commands/doc/fetch.test.ts

@@ -156,8 +156,10 @@ describe('doc fetch command', () => {
       })
       const schema = JSON.parse(stdout())
       expect(schema.definitions.Result.anyOf).toHaveLength(2)
-      expect(schema.definitions.Result.anyOf[0].properties.document.properties.content.type).toBe('string')
-      expect(schema.definitions.Result.anyOf[1].properties.format.const).toBe('markdown')
+      expect(schema.definitions.Result.anyOf[0].properties.document).toEqual({$ref: '#/definitions/Document'})
+      expect(schema.definitions.Document.properties.content.type).toBe('string')
+      expect(schema.definitions.Result.anyOf[1]).toEqual({$ref: '#/definitions/DocumentFile'})
+      expect(schema.definitions.DocumentFile.properties.format.const).toBe('markdown')
       expect(stderr()).toBe('')
       expect(fetch).not.toHaveBeenCalled()
     })

packages/cli/src/cli/commands/doc/search.test.ts

@@ -177,7 +177,10 @@ describe('doc search command', () => {
       })
       const schema = JSON.parse(stdout())
       expect(schema.definitions.Result.required).toEqual(['results', 'pageInfo'])
-      expect(schema.definitions.Result.properties.results.items.properties.domain.type).toEqual(['string', 'null'])
+      expect(schema.definitions.Result.properties.results.items).toEqual({
+        $ref: '#/definitions/DocumentationSearchEntry',
+      })
+      expect(schema.definitions.DocumentationSearchEntry.properties.domain.type).toEqual(['string', 'null'])
       expect(schema.definitions.Result.additionalProperties).toBe(false)
       expect(stderr()).toBe('')
       expect(shopifyFetch).not.toHaveBeenCalled()