Skip to content

Commit 98378bd

Browse files
gonzaloriestragonzaloriestra
committed
Merge branch 'main' into multi-session
2 parents bebcd96 + c5eb8a5 commit 98378bd

File tree

71 files changed

+3682
-2008
lines changed

Some content is hidden

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

71 files changed

+3682
-2008
lines changed

‎.changeset/big-ducks-joke.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/theme': minor
3+
---
4+
5+
Abort theme commands if path doesn't exist

‎.changeset/giant-jeans-kneel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/app': minor
3+
---
4+
5+
Support Functions Wasm API v2

‎.changeset/healthy-coins-walk.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+
Fix concurrency issue with downloading Functions binaries

‎.changeset/hot-fishes-develop.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+
Allow publish command to be called with multiple environments

‎.changeset/khaki-crews-help.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@shopify/ui-extensions-server-kit': patch
3+
'@shopify/app': patch
4+
---
5+
6+
Added optional `error` property to ExtensionPayload which include the `message` and `file`

‎.changeset/polite-coats-pay.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+
shopify app init now recommends the React Router template by default

‎.github/workflows/shopify-cli.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,15 @@ jobs:
213213
with:
214214
node-version: ${{ matrix.node }}
215215
- name: Post the knip results
216+
if: github.event.pull_request.user.login != 'dependabot[bot]'
216217
uses: codex-/knip-reporter@f717532b6707d95de06b9bb2eb8ece46393f018f # pin@v2
217218
with:
218219
verbose: true
219220

220221
pr-platform-agnostic-graphql-schema:
221222
name: '[PR] Check graphql-codegen has been run'
222223
runs-on: ${{ matrix.os }}
223-
if: ${{ github.event_name == 'pull_request' }}
224+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.user.login != 'dependabot[bot]' }}
224225
timeout-minutes: 30
225226
strategy:
226227
matrix:

‎docs-shopify.dev/commands/interfaces/app-init.interface.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface appinit {
3838

3939
/**
4040
* The app template. Accepts one of the following:
41-
- <remix|none>
41+
- <reactRouter|remix|none>
4242
- Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]
4343
* @environment SHOPIFY_FLAG_TEMPLATE
4444
*/

‎docs-shopify.dev/generated/generated_docs_data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,7 +1820,7 @@
18201820
"syntaxKind": "PropertySignature",
18211821
"name": "--template <value>",
18221822
"value": "string",
1823-
"description": "The app template. Accepts one of the following: - <remix|none>\n - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]",
1823+
"description": "The app template. Accepts one of the following: - <reactRouter|remix|none>\n - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]",
18241824
"isOptional": true,
18251825
"environmentValue": "SHOPIFY_FLAG_TEMPLATE"
18261826
},
@@ -1861,7 +1861,7 @@
18611861
"environmentValue": "SHOPIFY_FLAG_PATH"
18621862
}
18631863
],
1864-
"value": "export interface appinit {\n /**\n * The Client ID of your app. Use this to automatically link your new project to an existing app. Using this flag avoids the app selection prompt.\n * @environment SHOPIFY_FLAG_CLIENT_ID\n */\n '--client-id <value>'?: string\n\n /**\n * Which flavor of the given template to use.\n * @environment SHOPIFY_FLAG_TEMPLATE_FLAVOR\n */\n '--flavor <value>'?: string\n\n /**\n * \n * @environment SHOPIFY_FLAG_NAME\n */\n '-n, --name <value>'?: string\n\n /**\n * Disable color output.\n * @environment SHOPIFY_FLAG_NO_COLOR\n */\n '--no-color'?: ''\n\n /**\n * \n * @environment SHOPIFY_FLAG_PACKAGE_MANAGER\n */\n '-d, --package-manager <value>'?: string\n\n /**\n * \n * @environment SHOPIFY_FLAG_PATH\n */\n '-p, --path <value>'?: string\n\n /**\n * The app template. Accepts one of the following:\n - <remix|none>\n - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]\n * @environment SHOPIFY_FLAG_TEMPLATE\n */\n '--template <value>'?: string\n\n /**\n * Increase the verbosity of the output.\n * @environment SHOPIFY_FLAG_VERBOSE\n */\n '--verbose'?: ''\n}"
1864+
"value": "export interface appinit {\n /**\n * The Client ID of your app. Use this to automatically link your new project to an existing app. Using this flag avoids the app selection prompt.\n * @environment SHOPIFY_FLAG_CLIENT_ID\n */\n '--client-id <value>'?: string\n\n /**\n * Which flavor of the given template to use.\n * @environment SHOPIFY_FLAG_TEMPLATE_FLAVOR\n */\n '--flavor <value>'?: string\n\n /**\n * \n * @environment SHOPIFY_FLAG_NAME\n */\n '-n, --name <value>'?: string\n\n /**\n * Disable color output.\n * @environment SHOPIFY_FLAG_NO_COLOR\n */\n '--no-color'?: ''\n\n /**\n * \n * @environment SHOPIFY_FLAG_PACKAGE_MANAGER\n */\n '-d, --package-manager <value>'?: string\n\n /**\n * \n * @environment SHOPIFY_FLAG_PATH\n */\n '-p, --path <value>'?: string\n\n /**\n * The app template. Accepts one of the following:\n - <reactRouter|remix|none>\n - Any GitHub repo with optional branch and subpath, e.g., https://github.com/Shopify/<repository>/[subpath]#[branch]\n * @environment SHOPIFY_FLAG_TEMPLATE\n */\n '--template <value>'?: string\n\n /**\n * Increase the verbosity of the output.\n * @environment SHOPIFY_FLAG_VERBOSE\n */\n '--verbose'?: ''\n}"
18651865
}
18661866
}
18671867
}

‎package.json‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"@graphql-codegen/near-operation-file-preset": "3.0.0",
4545
"@graphql-codegen/typed-document-node": "5.0.11",
4646
"@graphql-codegen/typescript-operations": "4.6.1",
47-
"@nx/eslint-plugin": "21.1.2",
48-
"@nx/workspace": "21.1.2",
47+
"@nx/eslint-plugin": "21.5.2",
48+
"@nx/workspace": "21.5.2",
4949
"@octokit/rest": "22.0.0",
5050
"@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
5151
"@shopify/generate-docs": "0.15.6",
@@ -69,8 +69,8 @@
6969
"knip": "5.59.1",
7070
"liquidjs": "10.20.1",
7171
"node-fetch": "^3.3.2",
72-
"nx": "21.1.2",
73-
"oclif": "4.20.1",
72+
"nx": "21.5.2",
73+
"oclif": "4.22.22",
7474
"octokit-plugin-create-pull-request": "^3.12.2",
7575
"pathe": "1.1.1",
7676
"pin-github-action": "^3.3.1",
@@ -99,8 +99,7 @@
9999
"version": "0.0.0",
100100
"resolutions": {
101101
"@types/react": "17.0.2",
102-
"vite": "6.3.5",
103-
"@oclif/core": "4.4.0",
102+
"vite": "6.3.6",
104103
"whatwg-url": "14.0.0",
105104
"supports-hyperlinks": "3.1.0",
106105
"@graphql-tools/utils": "10.7.2",

0 commit comments

Comments
 (0)