Merge pull request #6453 from Shopify/stable/3.85-patch

Stable/3.85 patch

Author: vividviolet

.changeset/stale-stingrays-fail.md

@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': patch
+'@shopify/cli': patch
+---
+
+Remove POLARIS_UNIFIED flag

packages/app/src/cli/prompts/init/init.ts

@@ -52,16 +52,6 @@ export const templates = {
       options: {
         javascript: {branch: 'javascript', label: 'JavaScript'},
         typescript: {branch: 'main', label: 'TypeScript'},
-        ...(process.env.POLARIS_UNIFIED && {
-          javascriptPolarisEarlyAccess: {
-            branch: 'polaris-docs-2025-js',
-            label: 'JavaScript (Polaris Release Candidate)',
-          },
-          typescriptPolarisEarlyAccess: {
-            branch: 'polaris-docs-2025',
-            label: 'TypeScript (Polaris Release Candidate)',
-          },
-        }),
       },
     },
   } as Template,

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

@@ -244,8 +244,6 @@ async function uiExtensionInit({
 
         if (templateLanguage === 'javascript') {
           await changeIndexFileExtension(directory, srcFileExtension)
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          await removeUnwantedTemplateFilesPerFlavor(directory, extensionFlavor!.value)
         }
       },
     },
@@ -325,19 +323,6 @@ async function changeIndexFileExtension(extensionDirectory: string, fileExtensio
   await Promise.all(srcFileExensionsToChange)
 }
 
-async function removeUnwantedTemplateFilesPerFlavor(extensionDirectory: string, extensionFlavor: ExtensionFlavorValue) {
-  // Preact needs the tsconfig.json to set the `"jsxImportSource": "preact"` so it can properly build
-  if (extensionFlavor === 'preact') {
-    return
-  }
-
-  // tsconfig.json file is only needed in extension folder to inform the IDE
-  // About the `react-jsx` tsconfig option, so IDE don't complain about missing react import
-  if (extensionFlavor !== 'typescript-react') {
-    await removeFile(joinPath(extensionDirectory, 'tsconfig.json'))
-  }
-}
-
 async function addResolutionOrOverrideIfNeeded(directory: string, extensionFlavor: ExtensionFlavorValue | undefined) {
   if (extensionFlavor === 'typescript-react') {
     await addResolutionOrOverride(directory, {'@types/react': versions.reactTypes})

packages/app/src/cli/services/generate/fetch-template-specifications.test.ts

@@ -1,13 +1,7 @@
 import {fetchExtensionTemplates} from './fetch-template-specifications.js'
 import {ExtensionFlavorValue} from './extension.js'
 import {testDeveloperPlatformClient, testOrganizationApp} from '../../models/app/app.test-data.js'
-import {ExtensionFlavor} from '../../models/app/template.js'
-import {describe, expect, test, vi} from 'vitest'
-import * as experimentModule from '@shopify/cli-kit/node/is-polaris-unified-enabled'
-
-vi.mock('@shopify/cli-kit/node/is-polaris-unified-enabled', () => ({
-  isPolarisUnifiedEnabled: vi.fn().mockReturnValue(false),
-}))
+import {describe, expect, test} from 'vitest'
 
 describe('fetchTemplateSpecifications', () => {
   test('returns the remote specs', async () => {
@@ -34,12 +28,7 @@ describe('fetchTemplateSpecifications', () => {
   })
 
   describe('ui_extension', () => {
-    const preactFlavor: ExtensionFlavor = {
-      name: 'Preact',
-      value: 'preact' as ExtensionFlavorValue,
-    }
-
-    const oldFlavors = [
+    const allFlavors = [
       {
         name: 'JavaScript React',
         value: 'react' as ExtensionFlavorValue,
@@ -60,8 +49,11 @@ describe('fetchTemplateSpecifications', () => {
         value: 'typescript' as ExtensionFlavorValue,
         path: 'admin-action',
       },
+      {
+        name: 'Preact',
+        value: 'preact' as ExtensionFlavorValue,
+      },
     ]
-    const allFlavors = [...oldFlavors, preactFlavor]
 
     async function getTemplates() {
       const {templates} = await fetchExtensionTemplates(
@@ -90,86 +82,12 @@ describe('fetchTemplateSpecifications', () => {
       return templates
     }
 
-    test('returns only the preact flavor when POLARIS_UNIFIED is enabled', async () => {
-      // Given
-      vi.spyOn(experimentModule, 'isPolarisUnifiedEnabled').mockReturnValueOnce(true)
-
+    test('includes all flavors', async () => {
       // When
       const templates = await getTemplates()
 
       // Then
-      expect(templates[0]!.supportedFlavors).toEqual([preactFlavor])
-    })
-
-    test('excludes the preact flavor by default', async () => {
-      // When
-      const templates = await getTemplates()
-
-      // Then
-      expect(templates[0]!.supportedFlavors).toEqual(oldFlavors)
-    })
-
-    test('filter out templates that have no flavors available by default', async () => {
-      // When
-      const {templates} = await fetchExtensionTemplates(
-        testDeveloperPlatformClient({
-          templateSpecifications: () =>
-            Promise.resolve({
-              templates: [
-                {
-                  identifier: 'ui_extension',
-                  name: 'UI Extension',
-                  defaultName: 'ui-extension',
-                  group: 'Merchant Admin',
-                  supportLinks: [],
-                  type: 'ui_extension',
-                  url: 'https://github.com/Shopify/extensions-templates',
-                  extensionPoints: [],
-                  supportedFlavors: [preactFlavor],
-                },
-              ],
-              groupOrder: [],
-            }),
-        }),
-        testOrganizationApp(),
-        ['ui_extension'],
-      )
-
-      // Then
-      expect(templates).toEqual([])
-    })
-
-    test('filter out templates that have no flavors available POLARIS_UNIFIED is enabled', async () => {
-      // Given
-      vi.spyOn(experimentModule, 'isPolarisUnifiedEnabled').mockReturnValueOnce(true)
-
-      // When
-      const {templates} = await fetchExtensionTemplates(
-        testDeveloperPlatformClient({
-          templateSpecifications: () =>
-            Promise.resolve({
-              templates: [
-                {
-                  identifier: 'ui_extension',
-                  name: 'UI Extension',
-                  defaultName: 'ui-extension',
-                  group: 'Merchant Admin',
-                  supportLinks: [],
-                  type: 'ui_extension',
-                  url: 'https://github.com/Shopify/extensions-templates',
-                  extensionPoints: [],
-                  supportedFlavors: oldFlavors,
-                },
-              ],
-              groupOrder: [],
-            }),
-        }),
-        testOrganizationApp(),
-        ['ui_extension'],
-      )
-
-      // Then
-      expect(templates).toEqual([])
+      expect(templates[0]!.supportedFlavors).toEqual(allFlavors)
     })
   })
 })

packages/app/src/cli/services/generate/fetch-template-specifications.ts

@@ -1,33 +1,18 @@
 import {ExtensionTemplatesResult} from '../../models/app/template.js'
 import {MinimalAppIdentifiers} from '../../models/organization.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
-import {isPolarisUnifiedEnabled} from '@shopify/cli-kit/node/is-polaris-unified-enabled'
 
 export async function fetchExtensionTemplates(
   developerPlatformClient: DeveloperPlatformClient,
   app: MinimalAppIdentifiers,
   availableSpecifications: string[],
 ): Promise<ExtensionTemplatesResult> {
   const {templates: remoteTemplates, groupOrder} = await developerPlatformClient.templateSpecifications(app)
-  const polarisUnifiedEnabled = isPolarisUnifiedEnabled()
 
-  const filteredTemplates = remoteTemplates
-    .filter(
-      (template) =>
-        availableSpecifications.includes(template.identifier) || availableSpecifications.includes(template.type),
-    )
-    .map((template) => {
-      if (template.type === 'ui_extension') {
-        return {
-          ...template,
-          supportedFlavors: template.supportedFlavors.filter((flavor) =>
-            polarisUnifiedEnabled ? flavor.value === 'preact' : flavor.value !== 'preact',
-          ),
-        }
-      }
-      return template
-    })
-    .filter((template) => template.supportedFlavors.length > 0)
+  const filteredTemplates = remoteTemplates.filter(
+    (template) =>
+      availableSpecifications.includes(template.identifier) || availableSpecifications.includes(template.type),
+  )
 
   return {
     templates: filteredTemplates,