Merge branch 'Shopify:main' into main

HRUHRAThailand · Jun 15, 2024 · dab6114 · dab6114
2 parents 0d8aba6 + dd6f70a
commit dab6114
Show file tree

Hide file tree

Showing 993 changed files with 20,775 additions and 10,594 deletions.
diff --git a/.changeset/clever-baboons-taste.md b/.changeset/clever-baboons-taste.md
diff --git a/.changeset/cuddly-starfishes-tickle.md b/.changeset/cuddly-starfishes-tickle.md
@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Fix the output for unhandled errors
diff --git a/.changeset/friendly-jars-obey.md b/.changeset/friendly-jars-obey.md
@@ -0,0 +1,6 @@
+---
+'@shopify/cli-kit': minor
+'@shopify/app': minor
+---
+
+Added support for JSON Schema based module validation
diff --git a/.changeset/healthy-yaks-design.md b/.changeset/healthy-yaks-design.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Fix validation for Pub/Sub URLs in webhook trigger
diff --git a/.changeset/metal-chefs-yell.md b/.changeset/metal-chefs-yell.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Update duplicate print action message
diff --git a/.changeset/new-glasses-punch.md b/.changeset/new-glasses-punch.md
diff --git a/.changeset/new-hats-sit.md b/.changeset/new-hats-sit.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Allow CORS to check if local GraphiQL is running
diff --git a/.changeset/orange-garlics-happen.md b/.changeset/orange-garlics-happen.md
@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Remove local templates - all extension templates will now be pulled from the API
diff --git a/.changeset/selfish-pianos-lie.md b/.changeset/selfish-pianos-lie.md
diff --git a/.changeset/tricky-carrots-press.md b/.changeset/tricky-carrots-press.md
diff --git a/.changeset/yellow-poems-tan.md b/.changeset/yellow-poems-tan.md
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,7 +3,3 @@ contact_links:
   - name: Shopify Partners Community 🙌
     url: https://community.shopify.com/c/partners-and-developers/ct-p/appdev
     about: Connect with Shopify and other Shopify Partners through our online communities!
-  - name: Shopify CLI 2.0 issues 📝
-    url: https://www.github.com/Shopify/shopify-cli/issues/new/choose
-    about: |-
-      You're about to open an issue about Shopify CLI 3.0. Are you actually using our previous CLI? If so, please create an issue there instead.
diff --git a/.github/actions/run-and-save-test-coverage/action.yml b/.github/actions/run-and-save-test-coverage/action.yml
@@ -8,7 +8,7 @@ runs:
   using: "composite"
   steps:
     - name: Unit tests with coverage
-      run: pnpm nx run-many --all --skip-nx-cache --target=test:coverage --exclude=features
+      run: pnpm nx run-many --all --skip-nx-cache --target=test:coverage --exclude=features --output-style=stream
       shell: bash
     - name: Combine Jest coverages
       run: npx istanbul-merge --out="coverage.raw.json" "packages/*/coverage/coverage-final.json"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,7 +4,7 @@ updates:
     versioning-strategy: increase
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
     open-pull-requests-limit: 100
@@ -42,7 +42,7 @@ updates:
     versioning-strategy: increase
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
     labels:
       - "dependencies"
     open-pull-requests-limit: 100

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
     steps:
       - uses: actions/checkout@v3
         name: Checkout [main]
@@ -33,7 +33,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Build
-        run: pnpm nx run-many --all --skip-nx-cache --target=build --exclude=features
+        run: pnpm nx run-many --all --skip-nx-cache --target=build --exclude=features --output-style=stream
       - name: Type-diff
         working-directory: workspace
         id: type-diff

diff --git a/.github/workflows/shopify-cli.yml b/.github/workflows/shopify-cli.yml
@@ -11,11 +11,12 @@ on:
       node-version:
         description: 'Node version'
         required: true
-        default: '18.12.0'
+        default: '18.20.3'
         type: choice
         options:
-          - 18.12.0
-          - 20.2.0
+          - 18.20.3
+          - 20.14.0
+          - 22.2.0
       os:
         description: 'Operating system'
         required: true
@@ -59,7 +60,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        node: ['18.12.0', '20.2.0']
+        node: ['18.20.3', '20.14.0', '22.2.0']
     steps:
       - uses: actions/checkout@v3
         name: Checkout [${{ github.ref_name }}]
@@ -70,21 +71,21 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Build
-        run: pnpm nx run-many --all --skip-nx-cache  --target=build
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.12.0' }}
+        run: pnpm nx run-many --all --skip-nx-cache  --target=build --output-style=stream
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.20.3' }}
       - name: Lint
-        run: pnpm nx run-many --all --skip-nx-cache  --target=lint
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.12.0' }}
+        run: pnpm nx run-many --all --skip-nx-cache  --target=lint --output-style=stream
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.20.3' }}
       - name: Type-check
-        run: pnpm nx run-many --all --skip-nx-cache  --target=type-check
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.12.0' }}
+        run: pnpm nx run-many --all --skip-nx-cache  --target=type-check --output-style=stream
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.20.3' }}
       - name: Bundle
-        run: pnpm nx run-many --all --skip-nx-cache  --target=bundle
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.12.0' }}
+        run: pnpm nx run-many --all --skip-nx-cache  --target=bundle --output-style=stream
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.20.3' }}
       - name: Unit tests
-        run: pnpm nx run-many --all --skip-nx-cache --target=test --exclude=features
+        run: pnpm nx run-many --all --skip-nx-cache --target=test --exclude=features --output-style=stream
       - name: Acceptance tests
-        if: ${{ matrix.node == '18.12.0' }}
+        if: ${{ matrix.node == '18.20.3' }}
         run: pnpm nx run features:test
       - name: Send Slack notification on failure
         uses: slackapi/slack-github-action@007b2c3c751a190b6f0f040e47ed024deaa72844 # pin@v1.23.0
@@ -98,7 +99,7 @@ jobs:
           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 == '18.12.0' }}
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.node == '18.20.3' }}
         with:
           branch-name: ${{ github.ref_name }}
 
@@ -110,7 +111,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
         target: ['build', 'type-check', 'lint']
     steps:
       - uses: actions/checkout@v3
@@ -123,7 +124,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: ${{ matrix.target }}
-        run: pnpm nx run-many --all --skip-nx-cache --target=${{ matrix.target }}
+        run: pnpm nx run-many --all --skip-nx-cache --target=${{ matrix.target }} --output-style=stream
 
   pr-platform-agnostic-bundle:
     name: '[PR] Run bundle with Node ${{ matrix.node }} in ${{ matrix.os }}'
@@ -133,7 +134,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -145,9 +146,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: 'Build'
-        run: pnpm nx run-many --all --skip-nx-cache --target=build
+        run: pnpm nx run-many --all --skip-nx-cache --target=build --output-style=stream
       - name: 'Bundle'
-        run: pnpm nx run-many --all --skip-nx-cache --target=bundle
+        run: pnpm nx run-many --all --skip-nx-cache --target=bundle --output-style=stream
 
   pr-platform-agnostic-knip:
     name: '[PR] Run knip with Node ${{ matrix.node }} in ${{ matrix.os }}'
@@ -157,7 +158,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -187,9 +188,9 @@ jobs:
       - name: Setup deps
         uses: ./.github/actions/setup-cli-deps
         with:
-          node-version: 18.12.0
+          node-version: 18.20.3
       - name: Build
-        run: pnpm build
+        run: pnpm build --output-style=stream
       - name: Refresh manifests
         run: pnpm refresh-manifests
       - name: Check if there are changes
@@ -215,7 +216,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        node: ['18.12.0', '20.2.0']
+        node: ['18.20.3', '20.14.0', '22.2.0']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -227,7 +228,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Unit tests
-        run: pnpm test:unit
+        run: pnpm test:unit --output-style=stream
 
   pr-acceptance-tests:
     name: '[PR] Accept. Test with Node ${{ matrix.node }} in ${{ matrix.os }}'
@@ -237,7 +238,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -249,7 +250,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Acceptance tests
-        run: pnpm test:features
+        run: pnpm test:features --output-style=stream
 
   pr-test-coverage:
     name: '[PR] Run Test Coverage with Node ${{ matrix.node }} in ${{ matrix.os }}'
@@ -259,7 +260,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        node: ['18.12.0']
+        node: ['18.20.3']
     steps:
       - uses: actions/checkout@v3
         with:
@@ -271,7 +272,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Build
-        run: pnpm nx run-many --all --skip-nx-cache --target=build
+        run: pnpm nx run-many --all --skip-nx-cache --target=build --output-style=stream
       - name: Run and save test coverage
         uses: ./.github/actions/run-and-save-test-coverage
         with:
@@ -297,9 +298,9 @@ jobs:
         with:
           node-version: ${{ inputs.node-version }}
       - name: Unit tests
-        run: pnpm test:unit
+        run: pnpm test:unit --output-style=stream
       - name: Acceptance tests
-        run: pnpm test:features
+        run: pnpm test:features --output-style=stream
       - name: Setup tmate session
         if: ${{ failure() && inputs.debug-enabled }}
         uses: mxschmitt/action-tmate@1005f9c9db5f1b055a495e72c6e589764984baf6 # pin@v3

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.16.1
+v22.2.0
diff --git a/RELEASE_NOTES/3.60.md b/RELEASE_NOTES/3.60.md
@@ -0,0 +1,21 @@
+# CLI
+
+- Fix bug with plugins installation https://github.com/Shopify/cli/pull/3853
+
+# App
+
+- Adds validations for editor extension collection https://github.com/Shopify/cli/pull/3728
+- Adds localization support for editor extension collection https://github.com/Shopify/cli/pull/3717
+- Webhook trigger now reads from the configuration instead of .env and accepts more flags https://github.com/Shopify/cli/pull/3727
+
+# CLI-kit
+
+- Introduce .json support for theme app extensions https://github.com/Shopify/cli/pull/3842
+
+# Theme
+
+- Render progress bar for theme uploads to stderr https://github.com/Shopify/cli/pull/3765
+- Fix the shopify theme dev proxy to use the development theme, even when users have a browser session with the live theme loaded https://github.com/Shopify/cli/pull/3791
+- Fix unpublished themes being marked as development themes https://github.com/Shopify/cli/pull/3798
+- Fix issue that prevents shopify theme console from evaluating results when another 'preview_theme_id' is set https://github.com/Shopify/cli/pull/3811
+-  Fix the shopify theme dev/shopify theme console proxy to handle cookies as expected, and ensure they no longer render the live theme instead of the development theme https://github.com/Shopify/cli/pull/3851
diff --git a/RELEASE_NOTES/3.61.md b/RELEASE_NOTES/3.61.md
@@ -0,0 +1,9 @@
+# CLI
+
+- Include hydrogen commands in the bundle https://github.com/Shopify/cli/pull/3930
+
+# App
+
+- Dev stores are no longer automatically made transfer-disabled https://github.com/Shopify/cli/pull/3901
+- App dev logs include extension handles https://github.com/Shopify/cli/pull/3797
+- New apps no longer gitignore package manager lock files https://github.com/Shopify/cli/pull/3900
diff --git a/bin/bundling/clean-bundled-dependencies.js b/bin/bundling/clean-bundled-dependencies.js