Merge branch 'main' into fix-observe-user

Author: gonzaloriestra

.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,

packages/cli-kit/package.json

@@ -100,7 +100,7 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "11.7.3",
-    "@bugsnag/js": "7.25.0",
+    "@bugsnag/js": "8.6.0",
     "@graphql-typed-document-node/core": "3.2.0",
     "@iarna/toml": "2.2.5",
     "@oclif/core": "4.5.3",

packages/cli-kit/src/public/node/error-handler.test.ts

@@ -1,4 +1,5 @@
 import {errorHandler, cleanStackFrameFilePath, addBugsnagMetadata, sendErrorToBugsnag} from './error-handler.js'
+import * as metadata from './metadata.js'
 import {ciPlatform, cloudEnvironment, isUnitTest, macAddress} from './context/local.js'
 import {mockAndCaptureOutput} from './testing/output.js'
 import * as error from './error.js'
@@ -10,6 +11,7 @@ import {beforeEach, describe, expect, test, vi} from 'vitest'
 
 const onNotify = vi.fn()
 const capturedEventHandler = vi.fn()
+let lastBugsnagEvent: {addMetadata: ReturnType<typeof vi.fn>} | undefined
 
 vi.mock('process')
 vi.mock('@bugsnag/js', () => {
@@ -22,12 +24,15 @@ vi.mock('@bugsnag/js', () => {
           severity: '',
           unhandled: false,
           setUser: vi.fn(),
+          addMetadata: vi.fn(),
         }
         eventHandler(mockEvent)
         capturedEventHandler(mockEvent)
+        lastBugsnagEvent = mockEvent as any
         callback(null)
       },
       isStarted: () => true,
+      addOnError: vi.fn(),
     },
   }
 })
@@ -51,6 +56,7 @@ beforeEach(() => {
   vi.mocked(isUnitTest).mockReturnValue(true)
   onNotify.mockClear()
   capturedEventHandler.mockClear()
+  lastBugsnagEvent = undefined
   vi.mocked(settings).debug = false
   vi.mocked(isLocalEnvironment).mockReturnValue(false)
   vi.mocked(getLastSeenUserIdAfterAuth).mockResolvedValue('test-user-id-123')
@@ -259,4 +265,39 @@ describe('sends errors to Bugsnag', () => {
     const mockEvent = capturedEventHandler.mock.calls[0][0]
     expect(mockEvent.setUser).toHaveBeenCalledWith('unknown')
   })
+
+  test('attaches custom metadata with allowed slice_name when startCommand is present', async () => {
+    await metadata.addSensitiveMetadata(() => ({
+      commandStartOptions: {startTime: Date.now(), startCommand: 'app dev', startArgs: []},
+    }))
+
+    await sendErrorToBugsnag(new Error('boom'), 'unexpected_error')
+
+    expect(lastBugsnagEvent).toBeDefined()
+    expect(lastBugsnagEvent!.addMetadata).toHaveBeenCalledWith('custom', {slice_name: 'app'})
+  })
+
+  test('does not attach custom slice_name when startCommand is missing', async () => {
+    await metadata.addSensitiveMetadata(() => ({
+      commandStartOptions: {startTime: Date.now(), startCommand: undefined as unknown as string, startArgs: []},
+    }))
+
+    await sendErrorToBugsnag(new Error('boom'), 'unexpected_error')
+
+    expect(lastBugsnagEvent).toBeDefined()
+    const calls = (lastBugsnagEvent!.addMetadata as any).mock.calls as any[]
+    const customCall = calls.find(([section]: [string]) => section === 'custom')
+    expect(customCall).toBeUndefined()
+  })
+
+  test('defaults slice_name to cli when first word not allowed', async () => {
+    await metadata.addSensitiveMetadata(() => ({
+      commandStartOptions: {startTime: Date.now(), startCommand: 'version', startArgs: []},
+    }))
+
+    await sendErrorToBugsnag(new Error('boom'), 'unexpected_error')
+
+    expect(lastBugsnagEvent).toBeDefined()
+    expect(lastBugsnagEvent!.addMetadata).toHaveBeenCalledWith('custom', {slice_name: 'cli'})
+  })
 })

packages/cli-kit/src/public/node/error-handler.ts

@@ -22,6 +22,10 @@ import StackTracey from 'stacktracey'
 import Bugsnag, {Event} from '@bugsnag/js'
 import {realpath} from 'fs/promises'
 
+// Allowed slice names for error analytics grouping.
+// Hardcoded list per product slices to keep analytics consistent.
+const ALLOWED_SLICE_NAMES = new Set<string>(['app', 'theme', 'hydrogen', 'store'])
+
 export async function errorHandler(
   error: Error & {exitCode?: number | undefined},
   config?: Interfaces.Config,
@@ -129,6 +133,14 @@ export async function sendErrorToBugsnag(
           event.severity = 'error'
           event.unhandled = unhandled
           event.setUser(userId)
+          // Attach command metadata so we know which CLI command triggered the error
+          const {commandStartOptions} = metadata.getAllSensitiveMetadata()
+          const {startCommand} = commandStartOptions ?? {}
+          if (startCommand) {
+            const firstWord = startCommand.trim().split(/\s+/)[0] ?? 'cli'
+            const sliceName = ALLOWED_SLICE_NAMES.has(firstWord) ? firstWord : 'cli'
+            event.addMetadata('custom', {slice_name: sliceName})
+          }
         }
         const errorHandler = (error: unknown) => {
           if (error) {
@@ -286,5 +298,10 @@ function initializeBugsnag() {
       notify: 'https://error-analytics-production.shopifysvc.com',
       sessions: 'https://error-analytics-sessions-production.shopifysvc.com',
     },
+    // Set the project root to `null` to prevent the default behavior of
+    // Bugsnag which is to set it to the cwd. That is unhelpful for us because
+    // the cwd can be anywhere in the user's filesystem, not necessarily
+    // related to the CLI codebase.
+    projectRoot: null,
   })
 }