Merge branch 'main' into 03-26-refactor_remotespecification

Author: isaacroldan

.github/actions/download-and-publish-test-coverage/action.yml

@@ -70,8 +70,3 @@ jobs:
             }
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-      - name: Run and save test coverage
-        uses: ./.github/actions/run-and-save-test-coverage
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '24.1.0' }}
-        with:
-          branch-name: ${{ github.ref_name }}

.github/actions/run-and-save-test-coverage/action.yml

@@ -215,77 +215,6 @@ jobs:
         if: needs.unit-tests.result != 'success'
         run: exit 1
 
-  test-coverage-shard:
-    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }}
-    name: "Test Coverage (shard ${{ matrix.shard }})"
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    strategy:
-      matrix:
-        shard: ['1/2', '2/2']
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
-          ref: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
-          fetch-depth: 1
-      - name: Setup deps
-        uses: ./.github/actions/setup-cli-deps
-        with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
-      - name: Unit tests with coverage (shard)
-        run: pnpm vitest run --coverage --coverage.all=false --reporter=blob --outputFile=vitest-blob-reports/blob-${{ matrix.shard == '1/2' && '1' || '2' }}.json --shard ${{ matrix.shard }}
-        env:
-          VITEST_MIN_THREADS: "1"
-          VITEST_MAX_THREADS: "4"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: coverage-blob-${{ matrix.shard == '1/2' && '1' || '2' }}
-          path: vitest-blob-reports/
-          retention-days: 1
-
-  test-coverage-merge:
-    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }}
-    needs: test-coverage-shard
-    name: 'Test Coverage'
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}
-          ref: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
-          fetch-depth: 1
-      - name: Setup deps
-        uses: ./.github/actions/setup-cli-deps
-        with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: coverage-blob-*
-          path: vitest-blob-reports
-          merge-multiple: true
-      - name: Merge coverage reports
-        run: pnpm vitest --mergeReports vitest-blob-reports --reporter=json --outputFile=./coverage/report.json --coverage --coverage.all=false
-      - name: Convert coverage to Jest
-        run: ./bin/save-coverage-file.js
-      - name: Take copy of report as new baseline for branch
-        run: cp ./report.json ./baseline-report.json
-      - name: Clean ref name
-        env:
-          SAFE_REF_NAME: "${{ github.head_ref }}"
-        run: |
-          SAFE_REF_NAME="${SAFE_REF_NAME//[\/.]/}"
-          echo "SAFE_REF_NAME=${SAFE_REF_NAME}" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.SAFE_REF_NAME }}--coverage-report
-          path: ./baseline-report.json
-      - name: Download and publish test coverage
-        uses: ./.github/actions/download-and-publish-test-coverage
-        with:
-          base-branch-name: '${{ github.base_ref }}'
-
   e2e-tests:
     name: 'E2E tests'
     if: github.event.pull_request.head.repo.full_name == github.repository

.github/workflows/tests-main.yml

@@ -3,8 +3,8 @@ import {ReferenceEntityTemplateSchema} from '@shopify/generate-docs'
 
 const data: ReferenceEntityTemplateSchema = {
   name: 'upgrade',
-  description: `Shows details on how to upgrade Shopify CLI.`,
-  overviewPreviewDescription: `Shows details on how to upgrade Shopify CLI.`,
+  description: `Upgrades Shopify CLI using your package manager.`,
+  overviewPreviewDescription: `Upgrades Shopify CLI.`,
   type: 'command',
   isVisualComponent: false,
   defaultExample: {

.github/workflows/tests-pr.yml

@@ -8125,8 +8125,8 @@
   },
   {
     "name": "upgrade",
-    "description": "Shows details on how to upgrade Shopify CLI.",
-    "overviewPreviewDescription": "Shows details on how to upgrade Shopify CLI.",
+    "description": "Upgrades Shopify CLI using your package manager.",
+    "overviewPreviewDescription": "Upgrades Shopify CLI.",
     "type": "command",
     "isVisualComponent": false,
     "defaultExample": {

bin/save-coverage-file.js

@@ -26,6 +26,8 @@ export type Scalars = {
   BulkDataOperationID: { input: any; output: any; }
   /** The ID for a BusinessUser. */
   BusinessUserID: { input: any; output: any; }
+  /** The ID for a BusinessUsersImport. */
+  BusinessUsersImportID: { input: any; output: any; }
   /** A signed decimal number, which supports arbitrary precision and is serialized as a string. */
   Decimal: { input: any; output: any; }
   /** The ID for a DocumentAttachment. */

docs-shopify.dev/commands/upgrade.doc.ts

@@ -32,7 +32,6 @@ vi.mock('../../services/build/extension.js', async () => {
   return {
     ...actual,
     buildUIExtension: vi.fn(),
-    buildThemeExtension: vi.fn(),
     buildFunctionExtension: vi.fn(),
   }
 })
@@ -148,8 +147,16 @@ describe('build', async () => {
       // Given
       const extensionInstance = await testTaxCalculationExtension(tmpDir)
       const options: ExtensionBuildOptions = {
-        stdout: new Writable(),
-        stderr: new Writable(),
+        stdout: new Writable({
+          write(chunk, enc, cb) {
+            cb()
+          },
+        }),
+        stderr: new Writable({
+          write(chunk, enc, cb) {
+            cb()
+          },
+        }),
         app: testApp(),
         environment: 'production',
       }

docs-shopify.dev/generated/generated_docs_data.json

@@ -2,24 +2,19 @@ import {BaseConfigType, MAX_EXTENSION_HANDLE_LENGTH, MAX_UID_LENGTH} from './sch
 import {FunctionConfigType} from './specifications/function.js'
 import {ExtensionFeature, ExtensionSpecification} from './specification.js'
 import {SingleWebhookSubscriptionType} from './specifications/app_config_webhook_schemas/webhooks_schema.js'
-import {
-  ExtensionBuildOptions,
-  buildFunctionExtension,
-  buildThemeExtension,
-  buildUIExtension,
-  bundleFunctionExtension,
-} from '../../services/build/extension.js'
-import {bundleThemeExtension, copyFilesForExtension} from '../../services/extensions/bundle.js'
+import {ExtensionBuildOptions, bundleFunctionExtension} from '../../services/build/extension.js'
+import {bundleThemeExtension} from '../../services/extensions/bundle.js'
 import {Identifiers} from '../app/identifiers.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
 import {AppConfiguration} from '../app/app.js'
 import {ApplicationURLs} from '../../services/dev/urls.js'
+import {executeStep, BuildContext} from '../../services/build/client-steps.js'
 import {ok} from '@shopify/cli-kit/node/result'
 import {constantize, slugify} from '@shopify/cli-kit/common/string'
 import {hashString, nonRandomUUID} from '@shopify/cli-kit/node/crypto'
 import {partnersFqdn} from '@shopify/cli-kit/node/context/fqdn'
 import {joinPath, normalizePath, resolvePath, relativePath, basename} from '@shopify/cli-kit/node/path'
-import {fileExists, touchFile, moveFile, writeFile, glob, copyFile, globSync} from '@shopify/cli-kit/node/fs'
+import {fileExists, moveFile, glob, copyFile, globSync} from '@shopify/cli-kit/node/fs'
 import {getPathValue} from '@shopify/cli-kit/common/object'
 import {outputDebug} from '@shopify/cli-kit/node/output'
 import {
@@ -320,32 +315,24 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
   }
 
   async build(options: ExtensionBuildOptions): Promise<void> {
-    const mode = this.specification.buildConfig.mode
-
-    switch (mode) {
-      case 'theme':
-        await buildThemeExtension(this, options)
-        return bundleThemeExtension(this, options)
-      case 'function':
-        return buildFunctionExtension(this, options)
-      case 'ui':
-        await buildUIExtension(this, options)
-        // Copy static assets after build completes
-        return this.copyStaticAssets()
-      case 'tax_calculation':
-        await touchFile(this.outputPath)
-        await writeFile(this.outputPath, '(()=>{})();')
-        break
-      case 'copy_files':
-        return copyFilesForExtension(
-          this,
-          options,
-          this.specification.buildConfig.filePatterns,
-          this.specification.buildConfig.ignoredFilePatterns,
-        )
-      case 'hosted_app_home':
-      case 'none':
-        break
+    const {clientSteps = []} = this.specification
+
+    const context: BuildContext = {
+      extension: this,
+      options,
+      stepResults: new Map(),
+    }
+
+    const steps = clientSteps.find((lifecycle) => lifecycle.lifecycle === 'deploy')?.steps ?? []
+
+    for (const step of steps) {
+      // eslint-disable-next-line no-await-in-loop
+      const result = await executeStep(step, context)
+      context.stepResults.set(step.id, result)
+
+      if (!result.success && !step.continueOnError) {
+        throw new Error(`Build step "${step.name}" failed: ${result.error?.message}`)
+      }
     }
   }
 
@@ -546,6 +533,8 @@ export class ExtensionInstance<TConfiguration extends BaseConfigType = BaseConfi
         } else {
           return nonRandomUUID(JSON.stringify(this.configuration))
         }
+      default:
+        return this.specification.identifier
     }
   }