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

@@ -144,18 +144,6 @@ export interface ExtensionSpecification<TConfiguration extends BaseConfigType =
    */
   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,7 @@ 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(),
+          getAppAssetDirectories: vi.fn(),
+        }) as unknown as store.ExtensionsPayloadStore,
+    )
     vi.spyOn(server, 'setupHTTPServer').mockReturnValue({
       mock: 'http-server',
       close: serverCloseSpy,
@@ -67,7 +74,7 @@ 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),
     })
   })
@@ -94,7 +101,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 {
@@ -114,10 +113,6 @@ export interface ExtensionDevOptions {
    */
   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> {
@@ -139,12 +134,10 @@ export async function devUIExtensions(options: ExtensionDevOptions): Promise<voi
   }
 
   outputDebug(`Setting up the UI extensions HTTP server...`, payloadOptions.stdout)
-  const getAppAssets = () => payloadOptions.appAssets
   const httpServer = setupHTTPServer({
     devOptions: payloadOptions,
     payloadStore,
     getExtensions,
-    getAppAssets,
   })
 
   outputDebug(`Setting up the UI extensions Websocket server...`, payloadOptions.stdout)
@@ -156,13 +149,7 @@ 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)
-    })
+    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
+    allowed_domains?: string[]
     assets?: {
       [key: string]: {
         url: string

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

@@ -55,7 +55,7 @@ describe('getExtensionsPayloadStoreRawPayload()', () => {
 })
 
 describe('ExtensionsPayloadStore()', () => {
-  const mockOptions = {} as unknown as ExtensionsPayloadStoreOptions
+  const mockOptions = {extensions: []} as unknown as ExtensionsPayloadStoreOptions
 
   test('getRawPayload() returns the raw payload', async () => {
     // Given

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

@@ -3,13 +3,15 @@ import {ExtensionDevOptions} from '../../extension.js'
 import {getUIExtensionPayload, isNewExtensionPointsSchema} from '../payload.js'
 import {buildAppURLForMobile, buildAppURLForWeb} from '../../../../utilities/app/app-url.js'
 import {ExtensionInstance} from '../../../../models/extensions/extension-instance.js'
+import {AdminConfigType} from '../../../../models/extensions/specifications/admin.js'
+import {ExtensionEvent} from '../../app-events/app-event-watcher.js'
+import {joinPath} from '@shopify/cli-kit/node/path'
 import {deepMergeObjects} from '@shopify/cli-kit/common/object'
 import {outputDebug, outputContent} from '@shopify/cli-kit/node/output'
 import {EventEmitter} from 'events'
 
 export interface ExtensionsPayloadStoreOptions extends ExtensionDevOptions {
   websocketURL: string
-  appAssets?: Record<string, string>
 }
 
 export enum ExtensionsPayloadStoreEvent {
@@ -42,27 +44,49 @@ export async function getExtensionsPayloadStoreRawPayload(
     extensions: await Promise.all(options.extensions.map((ext) => getUIExtensionPayload(ext, bundlePath, options))),
   }
 
-  if (options.appAssets) {
-    const assets: Record<string, {url: string; lastUpdated: number}> = {}
-    for (const assetKey of Object.keys(options.appAssets)) {
-      assets[assetKey] = {
-        url: new URL(`/extensions/assets/${assetKey}/`, options.url).toString(),
-        lastUpdated: Date.now(),
+  // Admin extension contributes app-level config to the payload
+  const adminExtension = options.extensions.find((ext) => ext.type === 'admin')
+  if (adminExtension) {
+    const adminConfig = (adminExtension.configuration as AdminConfigType).admin
+    if (adminConfig?.allowed_domains) {
+      payload.app.allowed_domains = adminConfig.allowed_domains
+    }
+    if (adminConfig?.static_root) {
+      const assetKey = 'staticRoot'
+      payload.app.assets = {
+        [assetKey]: {
+          url: new URL(`/extensions/assets/${assetKey}/`, options.url).toString(),
+          lastUpdated: Date.now(),
+        },
       }
     }
-    payload.app.assets = assets
   }
+
   return payload
 }
 
 export class ExtensionsPayloadStore extends EventEmitter {
   private readonly options: ExtensionsPayloadStoreOptions
   private rawPayload: ExtensionsEndpointPayload
+  private appAssetDirectories: Record<string, string> | undefined
 
   constructor(rawPayload: ExtensionsEndpointPayload, options: ExtensionsPayloadStoreOptions) {
     super()
     this.rawPayload = rawPayload
     this.options = options
+
+    // Compute asset directory mapping from admin extension config
+    const adminExtension = options.extensions.find((ext) => ext.type === 'admin')
+    if (adminExtension) {
+      const staticRoot = (adminExtension.configuration as AdminConfigType).admin?.static_root
+      if (staticRoot) {
+        this.appAssetDirectories = {staticRoot: joinPath(options.appDirectory, staticRoot)}
+      }
+    }
+  }
+
+  getAppAssetDirectories(): Record<string, string> | undefined {
+    return this.appAssetDirectories
   }
 
   getConnectedPayload() {
@@ -183,12 +207,20 @@ export class ExtensionsPayloadStore extends EventEmitter {
     this.emitUpdate([extension.devUUID])
   }
 
-  updateAppAssetTimestamp(assetKey: string) {
-    const asset = this.rawPayload.app.assets?.[assetKey]
-    if (asset) {
-      asset.lastUpdated = Date.now()
-      this.emitUpdate([])
+  updateAdminConfigFromExtensionEvents(extensionEvents: ExtensionEvent[]) {
+    const adminEvent = extensionEvents.find((event) => event.extension.type === 'admin')
+    if (!adminEvent) return
+
+    const adminConfig = (adminEvent.extension.configuration as AdminConfigType).admin
+    this.rawPayload.app.allowed_domains = adminConfig?.allowed_domains
+
+    if (this.rawPayload.app.assets) {
+      for (const key of Object.keys(this.rawPayload.app.assets)) {
+        this.rawPayload.app.assets[key]!.lastUpdated = Date.now()
+      }
     }
+
+    this.emitUpdate([])
   }
 
   private emitUpdate(extensionIds: string[]) {

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

@@ -20,7 +20,6 @@ interface SetupHTTPServerOptions {
   devOptions: ExtensionsPayloadStoreOptions
   payloadStore: ExtensionsPayloadStore
   getExtensions: () => ExtensionInstance[]
-  getAppAssets?: () => Record<string, string> | undefined
 }
 
 export function setupHTTPServer(options: SetupHTTPServerOptions) {
@@ -30,8 +29,9 @@ export function setupHTTPServer(options: SetupHTTPServerOptions) {
   httpApp.use(getLogMiddleware(options))
   httpApp.use(corsMiddleware)
   httpApp.use(noCacheMiddleware)
-  if (options.getAppAssets) {
-    httpRouter.use('/extensions/assets/:assetKey/**:filePath', getAppAssetsMiddleware(options.getAppAssets))
+  const getAppAssetDirectories = () => options.payloadStore.getAppAssetDirectories()
+  if (getAppAssetDirectories()) {
+    httpRouter.use('/extensions/assets/:assetKey/**:filePath', getAppAssetsMiddleware(getAppAssetDirectories))
   }
   httpRouter.use('/extensions/dev-console', devConsoleIndexMiddleware)
   httpRouter.use('/extensions/dev-console/assets/**:assetPath', devConsoleAssetsMiddleware)