Merge pull request #5709 from Shopify/merge-main-fixes

Merge main fixes

Author: vividviolet

.changeset/quick-planes-try.md

@@ -0,0 +1,6 @@
+---
+'@shopify/app': patch
+---
+
+Allow a deprecatedFromCliVersion to be configured for app management extension templates
+Use 2025-10 as the version for remote dom UI extension

packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts

@@ -19,6 +19,8 @@ export type Scalars = {
   AccessRoleRecordId: {input: any; output: any}
   /** The ID for a ActionAudit. */
   ActionAuditID: {input: any; output: any}
+  /** The ID for a Address. */
+  AddressID: {input: any; output: any}
   /** The ID for a BusinessUser. */
   BusinessUserID: {input: any; output: any}
   /** A signed decimal number, which supports arbitrary precision and is serialized as a string. */

packages/app/src/cli/models/extensions/specifications/ui_extension.test.ts

@@ -703,7 +703,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
         const uiExtension = await getTestUIExtension({
           directory: tmpDir,
           // Remote DOM supported API version
-          apiVersion: '2025-07',
+          apiVersion: '2025-10',
           extensionPoints: [
             {
               target: 'admin.product-details.action.render',
@@ -940,7 +940,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
           fileContent: '// JSX code',
           shouldRenderFileContent: '// JS code',
           // Remote DOM supported version
-          apiVersion: '2025-07',
+          apiVersion: '2025-10',
         })
         // Create tsconfig.json
         const tsconfigPath = joinPath(tmpDir, 'tsconfig.json')
@@ -981,7 +981,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
           fileContent: '// JSX code',
           shouldRenderFileContent: '// JS code',
           // Remote DOM supported version
-          apiVersion: '2025-07',
+          apiVersion: '2025-10',
         })
 
         // Add another target sharing the same tsconfig.json as the main target
@@ -1050,7 +1050,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
           tmpDir,
           fileContent: '// Preact code',
           // Remote DOM supported version
-          apiVersion: '2025-07',
+          apiVersion: '2025-10',
         })
 
         // Create tsconfig.json file for testing
@@ -1062,7 +1062,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
 
         // When
         await expect(extension.contributeToSharedTypeFile?.(typeDefinitionsByFile)).rejects.toThrow(
-          'Type reference for admin.unknown.action.render could not be found. You might be using the wrong @shopify/ui-extensions version. Fix the error by ensuring you install @shopify/ui-extensions@2025-07 in your dependencies.',
+          'Type reference for admin.unknown.action.render could not be found. You might be using the wrong @shopify/ui-extensions version. Fix the error by ensuring you install @shopify/ui-extensions@2025-10 in your dependencies.',
         )
 
         // No shopify.d.ts file should be created
@@ -1078,7 +1078,7 @@ Please check the configuration in ${uiExtension.configurationPath}`),
           tmpDir,
           fileContent: '// Preact code',
           // Remote DOM supported version
-          apiVersion: '2025-07',
+          apiVersion: '2025-10',
         })
 
         // Change target to a target that does not exist in the library

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

@@ -271,7 +271,7 @@ function isRemoteDomExtension(
     return false
   }
 
-  return year > 2025 || (year === 2025 && month >= 7)
+  return year > 2025 || (year === 2025 && month >= 10)
 }
 
 export function getShouldRenderTarget(target: string) {

packages/app/src/cli/utilities/developer-platform-client/app-management-client.test.ts

@@ -47,12 +47,18 @@ const allowedTemplate: GatedExtensionTemplate = {
   organizationBetaFlags: ['allowedFlag'],
   minimumCliVersion: '1.0.0',
 }
-const templateDisallowedByCliVersion: GatedExtensionTemplate = {
+const templateDisallowedByMinimumCliVersion: GatedExtensionTemplate = {
   ...testRemoteExtensionTemplates[2]!,
   organizationBetaFlags: ['allowedFlag'],
   // minimum CLI version is higher than the current CLI version
   minimumCliVersion: `1${CLI_KIT_VERSION}`,
 }
+const templateDisallowedByDeprecatedFromCliVersion: GatedExtensionTemplate = {
+  ...testRemoteExtensionTemplates[2]!,
+  organizationBetaFlags: ['allowedFlag'],
+  // deprecated CLI version is lower than the current CLI version
+  deprecatedFromCliVersion: '1.0.0',
+}
 const templateDisallowedByBetaFlag: GatedExtensionTemplate = {
   ...testRemoteExtensionTemplates[3]!,
   // organization beta flag is not allowed
@@ -211,7 +217,8 @@ describe('allowedTemplates', () => {
     const templates: GatedExtensionTemplate[] = [
       templateWithoutRules,
       allowedTemplate,
-      templateDisallowedByCliVersion,
+      templateDisallowedByMinimumCliVersion,
+      templateDisallowedByDeprecatedFromCliVersion,
       templateDisallowedByBetaFlag,
     ]
 

packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts

@@ -158,6 +158,7 @@ type ShopNode = Exclude<ShopEdge['node'], {[key: string]: never}>
 export interface GatedExtensionTemplate extends ExtensionTemplate {
   organizationBetaFlags?: string[]
   minimumCliVersion?: string
+  deprecatedFromCliVersion?: string
 }
 
 export class AppManagementClient implements DeveloperPlatformClient {
@@ -1106,7 +1107,9 @@ export async function allowedTemplates(
       !ext.organizationBetaFlags || ext.organizationBetaFlags.every((flag) => enabledBetaFlags[flag])
     const satisfiesMinCliVersion =
       !ext.minimumCliVersion || versionSatisfies(CLI_KIT_VERSION, `>=${ext.minimumCliVersion}`)
-    return hasAnyNeededBetas && satisfiesMinCliVersion
+    const satisfiesDeprecatedFromCliVersion =
+      !ext.deprecatedFromCliVersion || versionSatisfies(CLI_KIT_VERSION, `<${ext.deprecatedFromCliVersion}`)
+    return hasAnyNeededBetas && satisfiesMinCliVersion && satisfiesDeprecatedFromCliVersion
   })
 }