Skip to content

Commit 65c9dd0

Browse files
Merge branch 'main' into logs-to-stderr
2 parents 247521d + e95f2cd commit 65c9dd0

File tree

97 files changed

+3177
-2776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3177
-2776
lines changed

.changeset/curvy-kangaroos-flow.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@shopify/cli-kit': patch
3+
'@shopify/theme': patch
4+
---
5+
6+
Improve mechanism that adds `.shopify` to `.gitignore` to avoid duplicate entries

.changeset/giant-crews-act.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/theme': patch
3+
---
4+
5+
Fix the local dev proxy for `/checkouts` and `/accounts/logout` to avoid 401 and 403 errors.

.changeset/lemon-eggs-exist.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/app': patch
3+
---
4+
5+
Improve error message in function replay command when log directory doesnt exist
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/theme': patch
3+
---
4+
5+
Update `shopify theme push -x` documentation (it uploads, doesn't download)

.changeset/witty-planes-crash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/cli': patch
3+
---
4+
5+
Bump cli-hydrogen to 9.0.5

.github/workflows/changelog-reminder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
pull_request:
3-
types: [opened, synchronize, reopened, ready_for_review]
4-
paths: ['packages/*/src/**']
3+
types: [ opened, synchronize, reopened, ready_for_review ]
4+
paths: [ 'packages/*/src/**' ]
55
name: Changelog Reminder
66
jobs:
77
remind:

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
timeout-minutes: 30
2020
strategy:
2121
matrix:
22-
os: ['ubuntu-latest']
23-
node: ['18.20.3']
22+
os: [ 'ubuntu-latest' ]
23+
node: [ '18.20.3' ]
2424
steps:
2525
- uses: actions/checkout@v3
2626
name: Checkout [main]

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
)
1818
|| (github.event.pull_request && !github.event.pull_request.merged)
1919
steps:
20-
- uses: Shopify/shopify-cla-action@c6bc827f3c22da647ed72a556b0b30b8641786eb # pin@v1
20+
- uses: Shopify/shopify-cla-action@9938f4b43524d1cfa7471ce9a803edf226697284 # pin@v1
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
cla-token: ${{ secrets.CLA_TOKEN }}

.github/workflows/pages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: Build and Deploy GitHub Pages Site
22

33
on:
44
push:
5-
branches: ["main"]
5+
branches: [ "main" ]
66
paths:
77
- packages/cli-kit/package.json
88
- "docs/**"
99

1010
workflow_dispatch:
1111

12-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
1313
permissions:
1414
contents: read
1515
pages: write
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/jekyll-build-pages@v1
4545
with:
4646
source: ./docs
47-
destination: ./docs/_site
47+
destination: ./docs/_site
4848
- name: Upload artifact
4949
uses: actions/upload-pages-artifact@v3
5050
with:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: 'Shopify Security Code Scanner'
2+
3+
on: [ push ]
4+
5+
jobs:
6+
Security-Code-Scanner:
7+
uses: shopify/security-code-scanner/.github/workflows/main.yml@5f7400975eed0698f96a6f718438353ae643a9d0 # pin@main
8+
secrets:
9+
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)