Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Shopify/cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.48.0
Choose a base ref
...
head repository: Shopify/cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.50.0
Choose a head ref
Loading
Showing 853 changed files with 21,371 additions and 8,087 deletions.
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -54,14 +54,6 @@ body:
placeholder: It didn't work
validations:
required: true
- type: textarea
id: verbose_output
attributes:
label: Verbose output
description: If you're using npm rerun the command with `-- --verbose` or if you're using yarn or pnpm rerun the command with `--verbose`
render: shell
validations:
required: true
- type: textarea
id: repro_steps
attributes:
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: Shopify Partners Community 🙌
url: https://www.shopify.com/partners/community#conversation
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
35 changes: 13 additions & 22 deletions .github/actions/setup-cli-deps/action.yml
Original file line number Diff line number Diff line change
@@ -4,6 +4,9 @@ inputs:
node-version:
required: true
description: 'Node version'
needs-ruby:
required: false
description: 'Whether this run requires to install ruby dependencies'
runs:
using: 'composite'
steps:
@@ -13,40 +16,28 @@ runs:
git config --global user.name "CLI Foundations"
shell: bash
- name: Install Ruby
uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # pin@v1
if: ${{ inputs.needs-ruby == 'true' }}
uses: ruby/setup-ruby@679e23d4a31bcf7cd0a69acd348e5f79e8c6b443 # pin@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: false
- name: Install Bundler
run: gem install bundler -v ${{ env.BUNDLER_VERSION }}
shell: bash
bundler: 'latest'
bundler-cache: true
- name: Install Bundler dependencies
if: ${{ inputs.needs-ruby == 'true' }}
working-directory: packages/cli-kit/assets/cli-ruby
run: bundle install
shell: bash
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: ${{ inputs.node-version }}
- name: Install pnpm
uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # pin@v2.2.4
with:
version: ${{ env.PNPM_VERSION }}
run_install: false
- name: Get pnpm store directory
id: pnpm-cache-path
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v3
- name: Install Node.js
uses: actions/setup-node@v3
with:
path: ${{ steps.pnpm-cache-path.outputs.STORE_PATH }}
key: ${{ runner.os }}-${{ inputs.node-version }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-${{ inputs.node-version }}-pnpm-store-
node-version: ${{ inputs.node-version }}
cache: 'pnpm'
cache-dependency-path: 'pnpm-lock.yaml'
- name: Install dependencies
run: pnpm install --frozen-lockfile
shell: bash
- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@177b48373c6dc583ce0d9257ffb484bdd232fedf # pin@v3.0.2
29 changes: 29 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -14,6 +14,30 @@ updates:
- dependency-name: "fs-extra"
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
minor_versions:
update-types:
- 'minor'
- 'patch'
exclude-patterns:
- "oclif"
- "@oclif/*"
- "nx"
- "@nx/*"
- "ink"
- "typescript"
- "esbuild"
- "react"
- "@babel/*"
- "javy-cli"
oclif:
patterns:
- "oclif"
- "@oclif/*"
nx:
patterns:
- "nx"
- "@nx/*"
- package-ecosystem: "bundler"
versioning-strategy: increase
directory: "/"
@@ -27,3 +51,8 @@ updates:
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
minor_versions:
update-types:
- 'minor'
- 'patch'
8 changes: 4 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -9,25 +9,25 @@ env:
DEBUG: '1'
SHOPIFY_CLI_ENV: development
SHOPIFY_CONFIG: debug
PNPM_VERSION: '8.6.1'
PNPM_VERSION: '8.7.0'
RUBY_VERSION: '3.1.2'
BUNDLER_VERSION: '2.3.18'

jobs:
type-diff:
name: "[PR] Type-diff with Node ${{ matrix.node }} in ${{ matrix.os }}"
name: '[PR] Type-diff with Node ${{ matrix.node }} in ${{ matrix.os }}'
runs-on: ${{ matrix.os }}
if: github.event.pull_request.head.repo.full_name == github.repository
timeout-minutes: 30
strategy:
matrix:
os: ['ubuntu-latest']
node: ['18.7.0']
node: ['18.12.0']
steps:
- uses: actions/checkout@v3
name: Checkout [main]
with:
fetch-depth: 0
fetch-depth: 1
- name: Setup deps
uses: ./.github/actions/setup-cli-deps
with:
6 changes: 3 additions & 3 deletions .github/workflows/cli-ruby.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ on:
merge_group:

concurrency:
group: shopify-${{ github.head_ref }}
group: shopify-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

defaults:
@@ -38,7 +38,7 @@ jobs:
git config --global user.name "CLI Foundations"
- name: Set up Ruby ${{ matrix.version }}
uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # pin@v1
uses: ruby/setup-ruby@679e23d4a31bcf7cd0a69acd348e5f79e8c6b443 # pin@v1
with:
ruby-version: ${{ matrix.version }}
bundler: 'latest'
@@ -64,7 +64,7 @@ jobs:
- uses: actions/checkout@v3

- name: Set up Ruby ${{ matrix.version }}
uses: ruby/setup-ruby@d3c9825d67b0d8720afdfdde5af56c79fdb38d16 # pin@v1
uses: ruby/setup-ruby@679e23d4a31bcf7cd0a69acd348e5f79e8c6b443 # pin@v1
with:
ruby-version: ${{ matrix.version }}
bundler: 'latest'
152 changes: 0 additions & 152 deletions .github/workflows/combine-prs.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ on:
- stable/3.*

concurrency:
group: changeset-${{ github.head_ref }}
group: changeset-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
PNPM_VERSION: '8.6.1'
PNPM_VERSION: '8.7.0'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
@@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
with:
fetch-depth: 0
fetch-depth: 1
- uses: pnpm/action-setup@c3b53f6a16e57305370b4ae5a540c2077a1d50dd # pin@v2.2.4
with:
version: ${{ env.PNPM_VERSION }}
Loading