diff --git a/.changeset/stable-update-hydrogen-cli-11.1.10.md b/.changeset/stable-update-hydrogen-cli-11.1.10.md new file mode 100644 index 00000000000..77417aff031 --- /dev/null +++ b/.changeset/stable-update-hydrogen-cli-11.1.10.md @@ -0,0 +1,5 @@ +--- +'@shopify/cli': patch +--- + +Updates cli-hydrogen to 11.1.10 and removes the `--routes` flag and confirmation prompt from `shopify hydrogen init`, now that routes are automatically scaffolded by default. diff --git a/docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts b/docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts index 870aa736d55..34edbc9cfdc 100644 --- a/docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts +++ b/docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts @@ -43,17 +43,11 @@ export interface hydrogeninit { '--path '?: string /** - * Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --routes --markets none` + * Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --markets none` * @environment SHOPIFY_HYDROGEN_FLAG_QUICKSTART */ '--quickstart'?: '' - /** - * Generate routes for all pages. - * @environment SHOPIFY_HYDROGEN_FLAG_ROUTES - */ - '--routes'?: '' - /** * Creates a global h2 shortcut for Shopify CLI using shell aliases. Deactivate with `--no-shortcut`. * @environment SHOPIFY_HYDROGEN_FLAG_SHORTCUT diff --git a/docs-shopify.dev/generated/generated_docs_data.json b/docs-shopify.dev/generated/generated_docs_data.json index 5d51044f3a6..c1520dae057 100644 --- a/docs-shopify.dev/generated/generated_docs_data.json +++ b/docs-shopify.dev/generated/generated_docs_data.json @@ -4789,19 +4789,10 @@ "syntaxKind": "PropertySignature", "name": "--quickstart", "value": "\"\"", - "description": "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --routes --markets none`", + "description": "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --markets none`", "isOptional": true, "environmentValue": "SHOPIFY_HYDROGEN_FLAG_QUICKSTART" }, - { - "filePath": "docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts", - "syntaxKind": "PropertySignature", - "name": "--routes", - "value": "\"\"", - "description": "Generate routes for all pages.", - "isOptional": true, - "environmentValue": "SHOPIFY_HYDROGEN_FLAG_ROUTES" - }, { "filePath": "docs-shopify.dev/commands/interfaces/hydrogen-init.interface.ts", "syntaxKind": "PropertySignature", @@ -4839,7 +4830,7 @@ "environmentValue": "SHOPIFY_HYDROGEN_FLAG_FORCE" } ], - "value": "export interface hydrogeninit {\n /**\n * Overwrites the destination directory and files if they already exist.\n * @environment SHOPIFY_HYDROGEN_FLAG_FORCE\n */\n '-f, --force'?: ''\n\n /**\n * Init Git and create initial commits.\n * @environment SHOPIFY_HYDROGEN_FLAG_GIT\n */\n '--git'?: ''\n\n /**\n * Auto installs dependencies using the active package manager.\n * @environment SHOPIFY_HYDROGEN_FLAG_INSTALL_DEPS\n */\n '--install-deps'?: ''\n\n /**\n * Sets the template language to use. One of `js` or `ts`.\n * @environment SHOPIFY_HYDROGEN_FLAG_LANGUAGE\n */\n '--language '?: string\n\n /**\n * Sets the URL structure to support multiple markets. Must be one of: `subfolders`, `domains`, `subdomains`, `none`. Example: `--markets subfolders`.\n * @environment SHOPIFY_HYDROGEN_FLAG_I18N\n */\n '--markets '?: string\n\n /**\n * Use mock.shop as the data source for the storefront.\n * @environment SHOPIFY_HYDROGEN_FLAG_MOCK_DATA\n */\n '--mock-shop'?: ''\n\n /**\n * The path to the directory of the new Hydrogen storefront.\n * @environment SHOPIFY_HYDROGEN_FLAG_PATH\n */\n '--path '?: string\n\n /**\n * Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --routes --markets none`\n * @environment SHOPIFY_HYDROGEN_FLAG_QUICKSTART\n */\n '--quickstart'?: ''\n\n /**\n * Generate routes for all pages.\n * @environment SHOPIFY_HYDROGEN_FLAG_ROUTES\n */\n '--routes'?: ''\n\n /**\n * Creates a global h2 shortcut for Shopify CLI using shell aliases. Deactivate with `--no-shortcut`.\n * @environment SHOPIFY_HYDROGEN_FLAG_SHORTCUT\n */\n '--shortcut'?: ''\n\n /**\n * Sets the styling strategy to use. One of `tailwind`, `vanilla-extract`, `css-modules`, `postcss`, `none`.\n * @environment SHOPIFY_HYDROGEN_FLAG_STYLING\n */\n '--styling '?: string\n\n /**\n * Scaffolds project based on an existing template or example from the Hydrogen repository.\n * @environment SHOPIFY_HYDROGEN_FLAG_TEMPLATE\n */\n '--template '?: string\n}" + "value": "export interface hydrogeninit {\n /**\n * Overwrites the destination directory and files if they already exist.\n * @environment SHOPIFY_HYDROGEN_FLAG_FORCE\n */\n '-f, --force'?: ''\n\n /**\n * Init Git and create initial commits.\n * @environment SHOPIFY_HYDROGEN_FLAG_GIT\n */\n '--git'?: ''\n\n /**\n * Auto installs dependencies using the active package manager.\n * @environment SHOPIFY_HYDROGEN_FLAG_INSTALL_DEPS\n */\n '--install-deps'?: ''\n\n /**\n * Sets the template language to use. One of `js` or `ts`.\n * @environment SHOPIFY_HYDROGEN_FLAG_LANGUAGE\n */\n '--language '?: string\n\n /**\n * Sets the URL structure to support multiple markets. Must be one of: `subfolders`, `domains`, `subdomains`, `none`. Example: `--markets subfolders`.\n * @environment SHOPIFY_HYDROGEN_FLAG_I18N\n */\n '--markets '?: string\n\n /**\n * Use mock.shop as the data source for the storefront.\n * @environment SHOPIFY_HYDROGEN_FLAG_MOCK_DATA\n */\n '--mock-shop'?: ''\n\n /**\n * The path to the directory of the new Hydrogen storefront.\n * @environment SHOPIFY_HYDROGEN_FLAG_PATH\n */\n '--path '?: string\n\n /**\n * Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --markets none`\n * @environment SHOPIFY_HYDROGEN_FLAG_QUICKSTART\n */\n '--quickstart'?: ''\n\n /**\n * Creates a global h2 shortcut for Shopify CLI using shell aliases. Deactivate with `--no-shortcut`.\n * @environment SHOPIFY_HYDROGEN_FLAG_SHORTCUT\n */\n '--shortcut'?: ''\n\n /**\n * Sets the styling strategy to use. One of `tailwind`, `vanilla-extract`, `css-modules`, `postcss`, `none`.\n * @environment SHOPIFY_HYDROGEN_FLAG_STYLING\n */\n '--styling '?: string\n\n /**\n * Scaffolds project based on an existing template or example from the Hydrogen repository.\n * @environment SHOPIFY_HYDROGEN_FLAG_TEMPLATE\n */\n '--template '?: string\n}" } } } diff --git a/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts index 48f87ac5f97..2a2eab109f5 100644 --- a/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts +++ b/packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts @@ -84,4 +84,10 @@ export type OrganizationUserProvisionShopAccessInput = { shopifyShopId: Scalars['PropertyPublicID']['input'] } -export type Store = 'APP_DEVELOPMENT' | 'CLIENT_TRANSFER' | 'DEVELOPMENT' | 'DEVELOPMENT_SUPERSET' | 'PRODUCTION' +export type Store = + | 'APP_DEVELOPMENT' + | 'CLIENT_TRANSFER' + | 'COLLABORATOR' + | 'DEVELOPMENT' + | 'DEVELOPMENT_SUPERSET' + | 'PRODUCTION' diff --git a/packages/cli/README.md b/packages/cli/README.md index 82416a8fed7..642fb144c07 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -1481,7 +1481,7 @@ Creates a new Hydrogen storefront. ``` USAGE $ shopify hydrogen init [-f] [--git] [--install-deps] [--language ] [--markets ] [--mock-shop] - [--path ] [--quickstart] [--routes] [--shortcut] [--styling ] [--template ] + [--path ] [--quickstart] [--shortcut] [--styling ] [--template ] FLAGS -f, --force [env: SHOPIFY_HYDROGEN_FLAG_FORCE] Overwrites the destination directory and files if they @@ -1496,8 +1496,7 @@ FLAGS --path= [env: SHOPIFY_HYDROGEN_FLAG_PATH] The path to the directory of the new Hydrogen storefront. --quickstart [env: SHOPIFY_HYDROGEN_FLAG_QUICKSTART] Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart - --mock-shop --language js --shortcut --routes --markets none` - --[no-]routes [env: SHOPIFY_HYDROGEN_FLAG_ROUTES] Generate routes for all pages. + --mock-shop --language js --shortcut --markets none` --[no-]shortcut [env: SHOPIFY_HYDROGEN_FLAG_SHORTCUT] Creates a global h2 shortcut for Shopify CLI using shell aliases. Deactivate with `--no-shortcut`. --styling= [env: SHOPIFY_HYDROGEN_FLAG_STYLING] Sets the styling strategy to use. One of `tailwind`, diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json index 1035e97217d..d913e6e1418 100644 --- a/packages/cli/oclif.manifest.json +++ b/packages/cli/oclif.manifest.json @@ -4537,18 +4537,11 @@ }, "quickstart": { "allowNo": false, - "description": "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --routes --markets none`", + "description": "Scaffolds a new Hydrogen project with a set of sensible defaults. Equivalent to `shopify hydrogen init --path hydrogen-quickstart --mock-shop --language js --shortcut --markets none`", "env": "SHOPIFY_HYDROGEN_FLAG_QUICKSTART", "name": "quickstart", "type": "boolean" }, - "routes": { - "allowNo": true, - "description": "Generate routes for all pages.", - "env": "SHOPIFY_HYDROGEN_FLAG_ROUTES", - "name": "routes", - "type": "boolean" - }, "shortcut": { "allowNo": true, "description": "Creates a global h2 shortcut for Shopify CLI using shell aliases. Deactivate with `--no-shortcut`.", diff --git a/packages/cli/package.json b/packages/cli/package.json index a62dc85d484..1cf3203bf70 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -114,7 +114,7 @@ "@shopify/plugin-cloudflare": "3.91.0", "@shopify/plugin-did-you-mean": "3.91.0", "@shopify/theme": "3.91.0", - "@shopify/cli-hydrogen": "11.1.5", + "@shopify/cli-hydrogen": "11.1.10", "@types/global-agent": "3.0.0", "@typescript-eslint/eslint-plugin": "7.13.1", "@vitest/coverage-istanbul": "^3.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5da4e2188da..c754752c18a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -291,8 +291,8 @@ importers: specifier: 3.91.0 version: link:../app '@shopify/cli-hydrogen': - specifier: 11.1.5 - version: 11.1.5(@graphql-codegen/cli@5.0.4(@parcel/watcher@2.5.1)(@types/node@24.7.0)(crossws@0.3.5)(enquirer@2.4.1)(graphql@16.10.0)(typescript@5.8.3))(graphql-config@5.1.5(@types/node@24.7.0)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.8.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@24.7.0)(jiti@2.4.2)(sass@1.89.1)(yaml@2.8.2)) + specifier: 11.1.10 + version: 11.1.10(@graphql-codegen/cli@5.0.4(@parcel/watcher@2.5.1)(@types/node@24.7.0)(crossws@0.3.5)(enquirer@2.4.1)(graphql@16.10.0)(typescript@5.8.3))(graphql-config@5.1.5(@types/node@24.7.0)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.8.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@24.7.0)(jiti@2.4.2)(sass@1.89.1)(yaml@2.8.2)) '@shopify/cli-kit': specifier: 3.91.0 version: link:../cli-kit @@ -3925,15 +3925,15 @@ packages: '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} - '@shopify/cli-hydrogen@11.1.5': - resolution: {integrity: sha512-KnyKdJ2EZI44YzRK8mWifP7g0ndm3Q9daPdq2da84EnXpZ+a7AHSruud95b1fANawVBoK7i6RIeDrgcwmri0NA==} - engines: {node: '>=18.0.0'} + '@shopify/cli-hydrogen@11.1.10': + resolution: {integrity: sha512-MEnTbWVeNMeV/0dawod4y2AuhhFFLlwpaYzbaqQXJ2HMm20g+bPoOogqSnGF04DoySIT9nEVXI9CXm/TgBsvoA==} + engines: {node: ^20 || ^22 || ^24} hasBin: true peerDependencies: '@graphql-codegen/cli': ^5.0.2 - '@react-router/dev': 7.9.2 - '@shopify/hydrogen-codegen': ^0.3.3 - '@shopify/mini-oxygen': ^4.0.0 + '@react-router/dev': 7.12.0 + '@shopify/hydrogen-codegen': 0.3.3 + '@shopify/mini-oxygen': 4.0.1 graphql-config: ^5.0.3 vite: 6.4.1 peerDependenciesMeta: @@ -14287,7 +14287,7 @@ snapshots: '@shikijs/vscode-textmate@10.0.2': {} - '@shopify/cli-hydrogen@11.1.5(@graphql-codegen/cli@5.0.4(@parcel/watcher@2.5.1)(@types/node@24.7.0)(crossws@0.3.5)(enquirer@2.4.1)(graphql@16.10.0)(typescript@5.8.3))(graphql-config@5.1.5(@types/node@24.7.0)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.8.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@24.7.0)(jiti@2.4.2)(sass@1.89.1)(yaml@2.8.2))': + '@shopify/cli-hydrogen@11.1.10(@graphql-codegen/cli@5.0.4(@parcel/watcher@2.5.1)(@types/node@24.7.0)(crossws@0.3.5)(enquirer@2.4.1)(graphql@16.10.0)(typescript@5.8.3))(graphql-config@5.1.5(@types/node@24.7.0)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.8.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@24.7.0)(jiti@2.4.2)(sass@1.89.1)(yaml@2.8.2))': dependencies: '@ast-grep/napi': 0.34.1 '@oclif/core': 3.26.5 @@ -14298,10 +14298,11 @@ snapshots: chokidar: 3.5.3 cli-truncate: 4.0.0 diff: 5.2.2 + esbuild: 0.25.12 get-east-asian-width: 1.4.0 get-port: 7.1.0 gunzip-maybe: 1.4.2 - prettier: 2.8.8 + prettier: 3.7.4 semver: 7.7.3 source-map: 0.7.4 source-map-support: 0.5.21 @@ -15364,7 +15365,7 @@ snapshots: debug: 4.4.0(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 - semver: 7.7.3 + semver: 7.6.3 tsutils: 3.21.0(typescript@5.8.3) optionalDependencies: typescript: 5.8.3 @@ -15427,7 +15428,7 @@ snapshots: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.8.3) eslint: 8.57.1 eslint-scope: 5.1.1 - semver: 7.7.3 + semver: 7.6.3 transitivePeerDependencies: - supports-color - typescript @@ -18854,7 +18855,7 @@ snapshots: log-update@6.1.0: dependencies: - ansi-escapes: 7.1.1 + ansi-escapes: 7.2.0 cli-cursor: 5.0.0 slice-ansi: 7.1.2 strip-ansi: 7.1.2 @@ -20547,7 +20548,7 @@ snapshots: dependencies: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 - strip-ansi: 7.1.2 + strip-ansi: 7.1.0 string-width@7.2.0: dependencies: @@ -21500,7 +21501,7 @@ snapshots: dependencies: ansi-styles: 6.2.3 string-width: 5.1.2 - strip-ansi: 7.1.2 + strip-ansi: 7.1.0 wrap-ansi@9.0.2: dependencies: