From 86ba1821ffe90a9a827d2806ad92ec824991d539 Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 2 Mar 2026 12:55:37 -0800 Subject: [PATCH 1/2] Bump cli-hydrogen to 11.1.10 --- .../interfaces/hydrogen-init.interface.ts | 8 +- .../generated/generated_docs_data.json | 13 +-- packages/cli/README.md | 5 +- packages/cli/oclif.manifest.json | 9 +- packages/cli/package.json | 2 +- packages/features/snapshots/commands.txt | 109 ------------------ pnpm-lock.yaml | 27 ++--- 7 files changed, 21 insertions(+), 152 deletions(-) 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 d25a20bd95c..7ef17db2290 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/cli/README.md b/packages/cli/README.md index 63fa0299535..1ec629c094c 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -1482,7 +1482,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 @@ -1497,8 +1497,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 ba48270931b..4d19f2598f7 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 2ab9b5d5d9e..676e432badd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -64,7 +64,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", "@vitest/coverage-istanbul": "^3.1.4", "esbuild-plugin-copy": "^2.1.1" diff --git a/packages/features/snapshots/commands.txt b/packages/features/snapshots/commands.txt index 5a978dfe6ba..e69de29bb2d 100644 --- a/packages/features/snapshots/commands.txt +++ b/packages/features/snapshots/commands.txt @@ -1,109 +0,0 @@ -├─ app -│ ├─ build -│ ├─ bulk -│ │ ├─ cancel -│ │ ├─ execute -│ │ └─ status -│ ├─ config -│ │ ├─ link -│ │ ├─ pull -│ │ └─ use -│ ├─ deploy -│ ├─ dev -│ │ └─ clean -│ ├─ env -│ │ ├─ pull -│ │ └─ show -│ ├─ execute -│ ├─ function -│ │ ├─ build -│ │ ├─ info -│ │ ├─ replay -│ │ ├─ run -│ │ ├─ schema -│ │ └─ typegen -│ ├─ generate -│ │ └─ extension -│ ├─ import-custom-data-definitions -│ ├─ import-extensions -│ ├─ info -│ ├─ init -│ ├─ logs -│ │ └─ sources -│ ├─ release -│ ├─ versions -│ │ └─ list -│ └─ webhook -│ └─ trigger -├─ auth -│ ├─ login -│ └─ logout -├─ commands -├─ config -│ └─ autocorrect -│ ├─ off -│ ├─ on -│ └─ status -├─ help -├─ hydrogen -│ ├─ build -│ ├─ check -│ ├─ codegen -│ ├─ customer-account-push -│ ├─ debug -│ │ └─ cpu -│ ├─ deploy -│ ├─ dev -│ ├─ env -│ │ ├─ list -│ │ ├─ pull -│ │ └─ push -│ ├─ generate -│ │ ├─ route -│ │ └─ routes -│ ├─ init -│ ├─ link -│ ├─ list -│ ├─ login -│ ├─ logout -│ ├─ preview -│ ├─ setup -│ │ ├─ css -│ │ ├─ markets -│ │ └─ vite -│ ├─ shortcut -│ ├─ unlink -│ └─ upgrade -├─ plugins -│ ├─ add -│ ├─ inspect -│ ├─ install -│ ├─ link -│ ├─ remove -│ ├─ reset -│ ├─ uninstall -│ ├─ unlink -│ └─ update -├─ search -├─ theme -│ ├─ check -│ ├─ console -│ ├─ delete -│ ├─ dev -│ ├─ duplicate -│ ├─ info -│ ├─ init -│ ├─ language-server -│ ├─ list -│ ├─ metafields -│ │ └─ pull -│ ├─ open -│ ├─ package -│ ├─ profile -│ ├─ publish -│ ├─ pull -│ ├─ push -│ ├─ rename -│ └─ share -├─ upgrade -└─ version diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9494c8dfb30..4bcb5306395 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -292,8 +292,8 @@ importers: specifier: 3.91.0 version: link:../app '@shopify/cli-hydrogen': - specifier: 11.1.5 - version: 11.1.5(@graphql-codegen/cli@6.0.1(@parcel/watcher@2.5.6)(@types/node@18.19.70)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql-config@5.1.5(@types/node@22.19.11)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0)) + specifier: 11.1.10 + version: 11.1.10(@graphql-codegen/cli@6.0.1(@parcel/watcher@2.5.6)(@types/node@18.19.70)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql-config@5.1.5(@types/node@22.19.11)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0)) '@shopify/cli-kit': specifier: 3.91.0 version: link:../cli-kit @@ -3583,15 +3583,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: @@ -13218,7 +13218,7 @@ snapshots: '@shikijs/vscode-textmate@10.0.2': {} - '@shopify/cli-hydrogen@11.1.5(@graphql-codegen/cli@6.0.1(@parcel/watcher@2.5.6)(@types/node@18.19.70)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql-config@5.1.5(@types/node@22.19.11)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0))': + '@shopify/cli-hydrogen@11.1.10(@graphql-codegen/cli@6.0.1(@parcel/watcher@2.5.6)(@types/node@18.19.70)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql-config@5.1.5(@types/node@22.19.11)(crossws@0.3.5)(graphql@16.10.0)(typescript@5.9.3))(graphql@16.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0))': dependencies: '@ast-grep/napi': 0.34.1 '@oclif/core': 3.26.5 @@ -13229,10 +13229,11 @@ snapshots: chokidar: 3.5.3 cli-truncate: 4.0.0 diff: 5.2.2 + esbuild: 0.25.12 get-east-asian-width: 1.5.0 get-port: 7.1.0 gunzip-maybe: 1.4.2 - prettier: 2.8.8 + prettier: 3.8.1 semver: 7.7.4 source-map: 0.7.6 source-map-support: 0.5.21 @@ -14356,14 +14357,14 @@ snapshots: msw: 2.12.10(@types/node@18.19.70)(typescript@5.9.3) vite: 6.4.1(@types/node@18.19.70)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0) - '@vitest/mocker@3.2.4(msw@2.12.10(@types/node@22.19.11)(typescript@5.9.3))(vite@6.4.1(@types/node@18.19.70)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0))': + '@vitest/mocker@3.2.4(msw@2.12.10(@types/node@22.19.11)(typescript@5.9.3))(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: msw: 2.12.10(@types/node@22.19.11)(typescript@5.9.3) - vite: 6.4.1(@types/node@18.19.70)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0) + vite: 6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0) '@vitest/pretty-format@3.2.4': dependencies: @@ -19897,7 +19898,7 @@ snapshots: dependencies: '@types/chai': 5.2.3 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(msw@2.12.10(@types/node@22.19.11)(typescript@5.9.3))(vite@6.4.1(@types/node@18.19.70)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0)) + '@vitest/mocker': 3.2.4(msw@2.12.10(@types/node@22.19.11)(typescript@5.9.3))(vite@6.4.1(@types/node@22.19.11)(jiti@2.6.1)(sass@1.97.3)(yaml@2.7.0)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 From cb1b94369981c905966b55befb49b621d4b6a55e Mon Sep 17 00:00:00 2001 From: Andrew Nguyen Date: Mon, 2 Mar 2026 15:49:29 -0800 Subject: [PATCH 2/2] fix: adds back in the commands.txt snapshot --- packages/features/snapshots/commands.txt | 109 +++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/packages/features/snapshots/commands.txt b/packages/features/snapshots/commands.txt index e69de29bb2d..5a978dfe6ba 100644 --- a/packages/features/snapshots/commands.txt +++ b/packages/features/snapshots/commands.txt @@ -0,0 +1,109 @@ +├─ app +│ ├─ build +│ ├─ bulk +│ │ ├─ cancel +│ │ ├─ execute +│ │ └─ status +│ ├─ config +│ │ ├─ link +│ │ ├─ pull +│ │ └─ use +│ ├─ deploy +│ ├─ dev +│ │ └─ clean +│ ├─ env +│ │ ├─ pull +│ │ └─ show +│ ├─ execute +│ ├─ function +│ │ ├─ build +│ │ ├─ info +│ │ ├─ replay +│ │ ├─ run +│ │ ├─ schema +│ │ └─ typegen +│ ├─ generate +│ │ └─ extension +│ ├─ import-custom-data-definitions +│ ├─ import-extensions +│ ├─ info +│ ├─ init +│ ├─ logs +│ │ └─ sources +│ ├─ release +│ ├─ versions +│ │ └─ list +│ └─ webhook +│ └─ trigger +├─ auth +│ ├─ login +│ └─ logout +├─ commands +├─ config +│ └─ autocorrect +│ ├─ off +│ ├─ on +│ └─ status +├─ help +├─ hydrogen +│ ├─ build +│ ├─ check +│ ├─ codegen +│ ├─ customer-account-push +│ ├─ debug +│ │ └─ cpu +│ ├─ deploy +│ ├─ dev +│ ├─ env +│ │ ├─ list +│ │ ├─ pull +│ │ └─ push +│ ├─ generate +│ │ ├─ route +│ │ └─ routes +│ ├─ init +│ ├─ link +│ ├─ list +│ ├─ login +│ ├─ logout +│ ├─ preview +│ ├─ setup +│ │ ├─ css +│ │ ├─ markets +│ │ └─ vite +│ ├─ shortcut +│ ├─ unlink +│ └─ upgrade +├─ plugins +│ ├─ add +│ ├─ inspect +│ ├─ install +│ ├─ link +│ ├─ remove +│ ├─ reset +│ ├─ uninstall +│ ├─ unlink +│ └─ update +├─ search +├─ theme +│ ├─ check +│ ├─ console +│ ├─ delete +│ ├─ dev +│ ├─ duplicate +│ ├─ info +│ ├─ init +│ ├─ language-server +│ ├─ list +│ ├─ metafields +│ │ └─ pull +│ ├─ open +│ ├─ package +│ ├─ profile +│ ├─ publish +│ ├─ pull +│ ├─ push +│ ├─ rename +│ └─ share +├─ upgrade +└─ version