Fix CI: update test expectations, lint formatting, unexport AppAssetsConfig

Co-authored-by: Claude Code <claude-code@anthropic.com>

Author: isaacroldan

packages/app/src/cli/models/app/app.ts

@@ -229,7 +229,6 @@ export interface AppInterface<
   realExtensions: ExtensionInstance[]
   nonConfigExtensions: ExtensionInstance[]
   draftableExtensions: ExtensionInstance[]
-  appAssetsConfigs: Record<string, string> | undefined
   errors: AppErrors
   hiddenConfig: AppHiddenConfig
   includeConfigOnDeploy: boolean | undefined
@@ -335,15 +334,6 @@ export class App<
     )
   }
 
-  get appAssetsConfigs(): Record<string, string> | undefined {
-    if (!this.realExtensions.some((ext) => ext.specification.appAssetsConfig)) return undefined
-    return this.realExtensions.reduce<Record<string, string>>((acc, ext) => {
-      const config = ext.specification.appAssetsConfig?.(ext.configuration)
-      if (config) acc[config.assetsKey] = joinPath(this.directory, config.assetsDir)
-      return acc
-    }, {})
-  }
-
   setDevApplicationURLs(devApplicationURLs: ApplicationURLs) {
     this.patchAppConfiguration(devApplicationURLs)
     this.realExtensions.forEach((ext) => ext.patchWithAppDevURLs(devApplicationURLs))

packages/app/src/cli/models/extensions/specification.ts

@@ -143,19 +143,6 @@ export interface ExtensionSpecification<TConfiguration extends BaseConfigType =
    * or undefined to watch all files in the extension directory.
    */
   devSessionWatchConfig?: (extension: ExtensionInstance<TConfiguration>) => DevSessionWatchConfig | undefined
-
-  /**
-   * App assets configuration for this extension.
-   * Return undefined if this extension doesn't serve app assets.
-   */
-  appAssetsConfig?: (config: TConfiguration) => AppAssetsConfig | undefined
-}
-
-export interface AppAssetsConfig {
-  /** The config key that points to the assets directory (e.g. 'admin.static_root') */
-  assetsKey: string
-  /** The assets directory relative to the extension directory */
-  assetsDir: string
 }
 
 export interface DevSessionWatchConfig {

packages/app/src/cli/models/extensions/specifications/admin.ts

@@ -7,11 +7,12 @@ const AdminSchema = zod.object({
   admin: zod
     .object({
       static_root: zod.string().optional(),
+      allowed_domains: zod.array(zod.string()).optional(),
     })
     .optional(),
 })
 
-type AdminConfigType = zod.infer<typeof AdminSchema> & BaseConfigType
+export type AdminConfigType = zod.infer<typeof AdminSchema> & BaseConfigType
 
 const adminSpecificationSpec = createExtensionSpecification<AdminConfigType>({
   identifier: 'admin',
@@ -33,6 +34,8 @@ const adminSpecificationSpec = createExtensionSpecification<AdminConfigType>({
       admin: {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         static_root: (remoteContent as any).admin.static_root,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        allowed_domains: (remoteContent as any).admin.allowed_domains,
       },
     }
   },
@@ -62,11 +65,6 @@ const adminSpecificationSpec = createExtensionSpecification<AdminConfigType>({
     },
   ],
   appModuleFeatures: () => [],
-  appAssetsConfig: (config) => {
-    const dir = config.admin?.static_root
-    if (!dir) return undefined
-    return {assetsKey: 'staticRoot', assetsDir: dir}
-  },
 })
 
 export default adminSpecificationSpec

packages/app/src/cli/services/build/steps/include-assets-step.test.ts

@@ -1082,10 +1082,7 @@ describe('executeIncludeAssetsStep', () => {
 
       // When / Then — overwrites existing manifest.json
       await expect(executeIncludeAssetsStep(step, contextWithConfig)).resolves.not.toThrow()
-      expect(fs.writeFile).toHaveBeenCalledWith(
-        '/test/output/manifest.json',
-        expect.any(String),
-      )
+      expect(fs.writeFile).toHaveBeenCalledWith('/test/output/manifest.json', expect.any(String))
     })
 
     test('writes an empty manifest when anchor resolves to a non-array value', async () => {

packages/app/src/cli/services/dev/extension.test.ts

@@ -33,7 +33,14 @@ describe('devUIExtensions()', () => {
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    vi.spyOn(store, 'ExtensionsPayloadStore').mockImplementation(() => ({mock: 'payload-store'}))
+    vi.spyOn(store, 'ExtensionsPayloadStore').mockImplementation(
+      () =>
+        ({
+          mock: 'payload-store',
+          updateAdminConfigFromExtensionEvents: vi.fn(),
+          getAppAssets: vi.fn(),
+        }) as unknown as store.ExtensionsPayloadStore,
+    )
     vi.spyOn(server, 'setupHTTPServer').mockReturnValue({
       mock: 'http-server',
       close: serverCloseSpy,
@@ -67,8 +74,9 @@ describe('devUIExtensions()', () => {
     // THEN
     expect(server.setupHTTPServer).toHaveBeenCalledWith({
       devOptions: {...options, websocketURL: 'wss://mock.url/extensions'},
-      payloadStore: {mock: 'payload-store'},
+      payloadStore: expect.objectContaining({mock: 'payload-store'}),
       getExtensions: expect.any(Function),
+      getAppAssets: expect.any(Function),
     })
   })
 
@@ -94,7 +102,7 @@ describe('devUIExtensions()', () => {
     expect(websocket.setupWebsocketConnection).toHaveBeenCalledWith({
       ...options,
       httpServer: expect.objectContaining({mock: 'http-server'}),
-      payloadStore: {mock: 'payload-store'},
+      payloadStore: expect.objectContaining({mock: 'payload-store'}),
       websocketURL: 'wss://mock.url/extensions',
     })
   })

packages/app/src/cli/services/dev/extension.ts

@@ -12,7 +12,6 @@ import {ExtensionInstance} from '../../models/extensions/extension-instance.js'
 import {AbortSignal} from '@shopify/cli-kit/node/abort'
 import {outputDebug} from '@shopify/cli-kit/node/output'
 import {DotEnvFile} from '@shopify/cli-kit/node/dot-env'
-import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array'
 import {Writable} from 'stream'
 
 export interface ExtensionDevOptions {
@@ -36,7 +35,8 @@ export interface ExtensionDevOptions {
   buildDirectory?: string
 
   /**
-   * The extension to be built.
+   * All real extensions in the app, including non-previewable ones (e.g., admin config).
+   * Previewable extensions are filtered internally for the UI payload.
    */
   extensions: ExtensionInstance[]
 
@@ -113,11 +113,6 @@ export interface ExtensionDevOptions {
    * The app watcher that emits events when the app is updated
    */
   appWatcher: AppEventWatcher
-
-  /**
-   * Map of asset key to absolute directory path for app-level assets (e.g., admin static_root)
-   */
-  appAssets?: Record<string, string>
 }
 
 export async function devUIExtensions(options: ExtensionDevOptions): Promise<void> {
@@ -132,14 +127,14 @@ export async function devUIExtensions(options: ExtensionDevOptions): Promise<voi
   const bundlePath = payloadOptions.appWatcher.buildOutputPath
   const payloadStoreRawPayload = await getExtensionsPayloadStoreRawPayload(payloadOptions, bundlePath)
   const payloadStore = new ExtensionsPayloadStore(payloadStoreRawPayload, payloadOptions)
-  let extensions = payloadOptions.extensions
+  let extensions = payloadOptions.extensions.filter((ext) => ext.isPreviewable)
 
   const getExtensions = () => {
     return extensions
   }
 
   outputDebug(`Setting up the UI extensions HTTP server...`, payloadOptions.stdout)
-  const getAppAssets = () => payloadOptions.appAssets
+  const getAppAssets = () => payloadStore.getAppAssets()
   const httpServer = setupHTTPServer({
     devOptions: payloadOptions,
     payloadStore,
@@ -156,13 +151,10 @@ export async function devUIExtensions(options: ExtensionDevOptions): Promise<voi
       extensions = app.allExtensions.filter((ext) => ext.isPreviewable)
     }
 
-    // Handle App Assets updates.
-    const appAssetsConfigs = extensionEvents.map((event) =>
-      event.extension.specification.appAssetsConfig?.(event.extension.configuration),
-    )
-    getArrayRejectingUndefined(appAssetsConfigs).forEach((config) => {
-      payloadStore.updateAppAssetTimestamp(config.assetsKey)
-    })
+    // Exception for AdminConfig: it's a extension that needs its config extracted at the app level
+    // for the payloed. No other exceptions should be added, if this pattern is needed again we should
+    // generalize it.
+    payloadStore.updateAdminConfigFromExtensionEvents(extensionEvents)
 
     for (const event of extensionEvents) {
       if (!event.extension.isPreviewable) continue

packages/app/src/cli/services/dev/extension/payload/models.ts

@@ -8,6 +8,7 @@ interface ExtensionsPayloadInterface {
     url: string
     mobileUrl: string
     title: string
+    allowedDomains?: string[]
     assets?: {
       [key: string]: {
         url: string