Skip to content

Commit

Permalink
Merge branch 'main' into bump/theme-tools-2024-11-19
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzaloriestra committed Nov 28, 2024
2 parents ecb341c + 2c6914b commit 8cad4ff
Show file tree
Hide file tree
Showing 136 changed files with 3,170 additions and 895 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilly-donkeys-exist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/theme': minor
---

Add `--strict` flag to `theme push` command, which will report `theme check` warnings and abort the operation if there are errors.
5 changes: 5 additions & 0 deletions .changeset/hungry-bobcats-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/theme': patch
---

Fix password validation to support localized URLs when authenticating storefronts.
5 changes: 5 additions & 0 deletions .changeset/sixty-years-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/cli-kit': patch
---

Skip notifications when using --json, -j or SHOPIFY_FLAG_JSON
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ packages/theme/** @shopify/advanced-edits @shopify/app-inner-loop
# These are metafiles that can be reviewed by anyone
.changeset/* @shopify/advanced-edits @shopify/app-inner-loop
.github/CODEOWNERS @shopify/advanced-edits @shopify/app-inner-loop
docs-shopify.dev/* @shopify/advanced-edits @shopify/app-inner-loop
docs-shopify.dev/** @shopify/advanced-edits @shopify/app-inner-loop
packages/cli/oclif.manifest.json @shopify/advanced-edits @shopify/app-inner-loop

packages/cli/README.md @shopify/advanced-edits @shopify/app-inner-loop
12 changes: 10 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@ body:
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
value: |-
<details>
<summary>Verbose output</summary>
```
Paste the output here!
```
</details>
validations:
required: true
- type: textarea
Expand Down Expand Up @@ -89,7 +97,7 @@ body:
- type: input
id: cli_version
attributes:
label: Shopify CLI version (check your project's `package.json` if you're not sure)
label: Shopify CLI version (`shopify --version`)
validations:
required: true
- type: input
Expand Down
28 changes: 9 additions & 19 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ version: 2
updates:
- package-ecosystem: "npm"
versioning-strategy: increase
directory: "/"
directories:
- "/"
- "packages/*"
schedule:
interval: "weekly"
labels:
Expand All @@ -16,6 +18,7 @@ updates:
update-types: ["version-update:semver-major"]
groups:
minor_versions:
dependency-type: "production"
update-types:
- 'minor'
- 'patch'
Expand All @@ -30,6 +33,11 @@ updates:
- "react"
- "@babel/*"
- "javy-cli"
development_dependencies:
dependency-type: "development"
update-types:
- 'minor'
- 'patch'
oclif:
patterns:
- "oclif"
Expand All @@ -38,21 +46,3 @@ updates:
patterns:
- "nx"
- "@nx/*"
- package-ecosystem: "bundler"
versioning-strategy: increase
directory: "/"
schedule:
interval: "weekly"
labels:
- "dependencies"
open-pull-requests-limit: 100
pull-request-branch-name:
separator: "-"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
minor_versions:
update-types:
- 'minor'
- 'patch'
6 changes: 6 additions & 0 deletions bin/get-graphql-schemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ const schemas = [
repo: 'shopify',
pathToFile: 'areas/core/shopify/db/graphql/admin_schema_unstable_public.graphql',
localPath: './packages/cli-kit/src/cli/api/graphql/admin/admin_schema.graphql',
},
{
repo: 'shopify',
pathToFile: 'areas/core/shopify/db/graphql/webhooks_schema_unstable_public.graphql',
localPath: './packages/app/src/cli/api/graphql/webhooks/webhooks_schema.graphql',
branch: 'dd',
}
]

Expand Down
8 changes: 7 additions & 1 deletion docs-shopify.dev/commands/interfaces/app-build.interface.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appbuild {
/**
* Application's Client ID that will be exposed at build time.
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string
Expand All @@ -24,6 +24,12 @@ export interface appbuild {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Skips the installation of dependencies. Deprecated, use workspaces instead.
* @environment SHOPIFY_FLAG_SKIP_DEPENDENCIES_INSTALLATION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ export interface appconfiglink {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appconfiguse {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* Disable color output.
* @environment SHOPIFY_FLAG_NO_COLOR
Expand All @@ -13,7 +19,7 @@ export interface appconfiguse {
'--path <value>'?: string

/**
* Reset current configuration.
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''
Expand Down
12 changes: 12 additions & 0 deletions docs-shopify.dev/commands/interfaces/app-env-pull.interface.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appenvpull {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* The name of the app configuration.
* @environment SHOPIFY_FLAG_APP_CONFIG
Expand All @@ -24,6 +30,12 @@ export interface appenvpull {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
12 changes: 12 additions & 0 deletions docs-shopify.dev/commands/interfaces/app-env-show.interface.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appenvshow {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* The name of the app configuration.
* @environment SHOPIFY_FLAG_APP_CONFIG
Expand All @@ -18,6 +24,12 @@ export interface appenvshow {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appfunctionbuild {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* The name of the app configuration.
* @environment SHOPIFY_FLAG_APP_CONFIG
Expand All @@ -18,6 +24,12 @@ export interface appfunctionbuild {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appfunctionreplay {
/**
* Application's Client ID
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string
Expand All @@ -13,7 +13,7 @@ export interface appfunctionreplay {
'-c, --config <value>'?: string

/**
* Output the function run result as a JSON object.
* Output the result as JSON.
* @environment SHOPIFY_FLAG_JSON
*/
'-j, --json'?: ''
Expand All @@ -36,6 +36,12 @@ export interface appfunctionreplay {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appfunctionrun {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* The name of the app configuration.
* @environment SHOPIFY_FLAG_APP_CONFIG
Expand All @@ -19,7 +25,7 @@ export interface appfunctionrun {
'-i, --input <value>'?: string

/**
* Log the run result as a JSON object.
* Output the result as JSON.
* @environment SHOPIFY_FLAG_JSON
*/
'-j, --json'?: ''
Expand All @@ -36,6 +42,12 @@ export interface appfunctionrun {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appfunctionschema {
/**
* The Client ID to fetch the schema with.
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string
Expand All @@ -24,6 +24,12 @@ export interface appfunctionschema {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Output the schema to stdout instead of writing to a file.
* @environment SHOPIFY_FLAG_STDOUT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// This is an autogenerated file. Don't edit this file manually.
export interface appfunctiontypegen {
/**
* The Client ID of your app.
* @environment SHOPIFY_FLAG_CLIENT_ID
*/
'--client-id <value>'?: string

/**
* The name of the app configuration.
* @environment SHOPIFY_FLAG_APP_CONFIG
Expand All @@ -18,6 +24,12 @@ export interface appfunctiontypegen {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ export interface appimportextensions {
*/
'--path <value>'?: string

/**
* Reset all your settings.
* @environment SHOPIFY_FLAG_RESET
*/
'--reset'?: ''

/**
* Increase the verbosity of the output.
* @environment SHOPIFY_FLAG_VERBOSE
Expand Down
Loading

0 comments on commit 8cad4ff

Please sign in to comment.