From a6ebe37d0700cc0f94b46b22ce4fbda1610ce453 Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 11:05:31 -0700 Subject: [PATCH 01/11] Bump cli-hydrogen --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 75 ++++++++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 22 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 7b30970c0f..6058189dbe 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -113,7 +113,7 @@ "@shopify/plugin-cloudflare": "3.69.0", "@shopify/plugin-did-you-mean": "3.69.0", "@shopify/theme": "3.69.0", - "@shopify/cli-hydrogen": "8.4.6", + "@shopify/cli-hydrogen": "9.0.0", "@types/node": "18.19.3", "@typescript-eslint/eslint-plugin": "7.13.1", "@vitest/coverage-istanbul": "^1.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d4c96903d0..53ac98b9b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -278,8 +278,8 @@ importers: specifier: 3.69.0 version: link:../app '@shopify/cli-hydrogen': - specifier: 8.4.6 - version: 8.4.6(@graphql-codegen/cli@5.0.2)(react-dom@17.0.2)(react@17.0.2) + specifier: 9.0.0 + version: 9.0.0(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2) '@shopify/cli-kit': specifier: 3.69.0 version: link:../cli-kit @@ -3222,6 +3222,13 @@ packages: resolution: {integrity: sha512-70jFkWKscK2osm7bnFbPLevrzHClrygM3UcKetKs/l81Xuzlxnu1SS3onN5OUl9kd9RN4XMFr46Pv5jSqWqImQ==} dependencies: '@bugsnag/core': 7.22.7 + dev: false + + /@bugsnag/browser@8.1.2: + resolution: {integrity: sha512-COP3OanbGCOS/K4g0rGwSYk2/RcIooG2PqxqdrF0MDY4u3Nz44iOaJg8w7WlOr8CckmDEiwSW2DVR+M7qZcoQw==} + dependencies: + '@bugsnag/core': 8.1.1 + dev: true /@bugsnag/core@7.22.7: resolution: {integrity: sha512-9DPWBkkBjhFJc5dCFy/wVC3HE0Aw3ZiLJKjyAxgywSKbILgtpD+qT1Xe8sacWyxU92znamlZ8H8ziQOe7jhhbA==} @@ -3231,6 +3238,17 @@ packages: error-stack-parser: 2.1.4 iserror: 0.0.2 stack-generator: 2.0.10 + dev: false + + /@bugsnag/core@8.1.1: + resolution: {integrity: sha512-ytOWqwm4H2h8rADqYPR+tQpDHsBav3NEZ5E2VSCCxPbT2R89Q0/t0PZTbQVlOS+TRutajO29VxTV9qsAREfpSw==} + dependencies: + '@bugsnag/cuid': 3.1.1 + '@bugsnag/safe-json-stringify': 6.0.0 + error-stack-parser: 2.1.4 + iserror: 0.0.2 + stack-generator: 2.0.10 + dev: true /@bugsnag/cuid@3.1.1: resolution: {integrity: sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==} @@ -3242,11 +3260,11 @@ packages: '@bugsnag/node': 7.22.7 dev: false - /@bugsnag/js@7.22.7: - resolution: {integrity: sha512-Qq8l06rSDTZtxgNIDpTeXHrin9C30INNbPfnR2CNcEsCmfqyVQb4USPEuRb0xg5wiaLKU9r4IAatMqiCgdzG6A==} + /@bugsnag/js@8.1.2: + resolution: {integrity: sha512-vMl/TlMTpm0Xv4IKqYpmsjeVE4nPWAZL8uOxOi0JI6dgTaWE8+VQF6KuSpeKiA7Pr34uUxpWhSBrkZ3uSwCBdg==} dependencies: - '@bugsnag/browser': 7.22.7 - '@bugsnag/node': 7.23.0 + '@bugsnag/browser': 8.1.2 + '@bugsnag/node': 8.1.1 dev: true /@bugsnag/node@7.22.7: @@ -3260,10 +3278,10 @@ packages: stack-generator: 2.0.10 dev: false - /@bugsnag/node@7.23.0: - resolution: {integrity: sha512-eXA8/h+J2booEMlKsuRl1NAszebwm4KZ9zxCSg/xN4sw5boXia7kMifLf8QTqk+UBtIhNKBsyQQKHXbawKyE6Q==} + /@bugsnag/node@8.1.1: + resolution: {integrity: sha512-Ckdgj4tQto3CH4wWo12BAG0lQuS9s5SUpZvwmYF3meW5Qxq7D8XHZzrfGQo9nb1VTvmwOB+uyMt8En6Cy86Jcg==} dependencies: - '@bugsnag/core': 7.22.7 + '@bugsnag/core': 8.1.1 byline: 5.0.0 error-stack-parser: 2.1.4 iserror: 0.0.2 @@ -6000,15 +6018,15 @@ packages: requiresBuild: true optional: true - /@shopify/cli-hydrogen@8.4.6(@graphql-codegen/cli@5.0.2)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-net3yDdzexoIbqSNgC1zxpzq9XDUS8xk9Cd9C2EsmyNpCd6bt8GZKTmsWGZCurEbG8ipPImY1eR9Xp55JHFVyw==} + /@shopify/cli-hydrogen@9.0.0(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-7AvAC/O/j3IA90+3gSR18o1CL5q3fTl+Db6A8ec2Gx/NL4VgGAblKEt+wncEXZ4hwfdq0dlOn7X3M3lx/kPJgA==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: '@graphql-codegen/cli': ^5.0.2 '@remix-run/dev': ^2.1.0 - '@shopify/hydrogen-codegen': ^0.3.1 - '@shopify/mini-oxygen': ^3.0.6 + '@shopify/hydrogen-codegen': ^0.3.2 + '@shopify/mini-oxygen': ^3.1.0 graphql-config: ^5.0.3 vite: 5.3.1 peerDependenciesMeta: @@ -6028,8 +6046,8 @@ packages: '@ast-grep/napi': 0.11.0 '@graphql-codegen/cli': 5.0.2(@types/node@18.19.3)(graphql@16.8.1)(typescript@5.2.2) '@oclif/core': 3.26.5 - '@shopify/cli-kit': link:packages/cli-kit - '@shopify/oxygen-cli': 4.4.9(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) + '@shopify/cli': 3.69.2 + '@shopify/oxygen-cli': 4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) '@shopify/plugin-cloudflare': link:packages/plugin-cloudflare ansi-escapes: 6.2.0 chokidar: 3.5.3 @@ -6046,10 +6064,21 @@ packages: ts-morph: 20.0.0 use-resize-observer: 9.1.0(react-dom@17.0.2)(react@17.0.2) transitivePeerDependencies: + - '@shopify/cli-kit' - react - react-dom dev: true + /@shopify/cli@3.69.2: + resolution: {integrity: sha512-FQzxdOV16u2qQ0PbftilxqkGXFMjdsEC6gPhffmiLXHlmwmw6l6lXd2lOZoPWoFvg+X0bolD7MRywQ/2Pwvyzw==} + engines: {node: ^18.20.0 || >=20.10.0} + os: [darwin, linux, win32] + hasBin: true + dependencies: + '@ast-grep/napi': 0.11.0 + esbuild: 0.19.8 + dev: true + /@shopify/dates@1.1.5: resolution: {integrity: sha512-WpShtWjylq0iH4FQhpEz1g5tCZRw/GgZ00uYUxUinVyBqaUbRqiAq7EnwXzGO/aTpAUF6yXgDTxoji3aFOiC8A==} engines: {node: '>=12.14.0'} @@ -6137,8 +6166,8 @@ packages: ohm-js: 16.6.0 dev: false - /@shopify/oxygen-cli@4.4.9(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit): - resolution: {integrity: sha512-NCpMyRyXaBtLMSSIDuJsX4hYCiudyMCMeoqvtN7HYgjCZNsC5F2dvZLpu0mVOSqXrNB89PG/QnaXlcZZW+3IjQ==} + /@shopify/oxygen-cli@4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit): + resolution: {integrity: sha512-mCpseNEqDbR26fPmIKL83BDsYSxXu/eeWrRGTG8cdQhq1z+xbDn93w/So/gi0r0MRH2vYsPOzJOIUyiWWVawDQ==} engines: {node: '>=18.12.0'} os: [darwin, linux, win32] hasBin: true @@ -6146,12 +6175,12 @@ packages: '@oclif/core': 3.26.5 '@shopify/cli-kit': ^3.58.0 dependencies: - '@bugsnag/core': 7.22.7 - '@bugsnag/js': 7.22.7 - '@bugsnag/node': 7.23.0 + '@bugsnag/core': 8.1.1 + '@bugsnag/js': 8.1.2 + '@bugsnag/node': 8.1.1 '@oclif/core': 3.26.5 '@shopify/cli-kit': link:packages/cli-kit - async: 3.2.5 + async: 3.2.6 dev: true /@shopify/polaris-icons@8.0.0: @@ -7985,6 +8014,10 @@ packages: /async@3.2.5: resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==} + /async@3.2.6: + resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==} + dev: true + /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} From 3a8b2987762a9253a4499b083e9b6b0896e3a610 Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 11:09:49 -0700 Subject: [PATCH 02/11] update manifest and readme --- packages/cli/README.md | 2 +- packages/cli/oclif.manifest.json | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/cli/README.md b/packages/cli/README.md index 96829eadce..9d23246f12 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -1000,7 +1000,7 @@ FLAGS --no-verify Skip the routability verification step after deployment. --path= The path to the directory of the Hydrogen storefront. Defaults to the current directory where the command is run. - --preview Deploys to the Preview environment. Overrides --env-branch and Git metadata. + --preview Deploys to the Preview environment. DESCRIPTION Builds and deploys a Hydrogen storefront to Oxygen. diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json index 8b6664a330..5d47583ba1 100644 --- a/packages/cli/oclif.manifest.json +++ b/packages/cli/oclif.manifest.json @@ -2966,7 +2966,7 @@ }, "preview": { "allowNo": false, - "description": "Deploys to the Preview environment. Overrides --env-branch and Git metadata.", + "description": "Deploys to the Preview environment.", "name": "preview", "required": false, "type": "boolean" @@ -3165,11 +3165,6 @@ "name": "verbose", "required": false, "type": "boolean" - }, - "worker": { - "hidden": true, - "name": "worker", - "type": "boolean" } }, "hasDynamicHelp": false, @@ -3883,11 +3878,6 @@ "description": "Watches for changes and rebuilds the project.", "name": "watch", "type": "boolean" - }, - "worker": { - "hidden": true, - "name": "worker", - "type": "boolean" } }, "hasDynamicHelp": false, From c829c20fdcb90330ce64d0b020a861483df65c5b Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 12:28:01 -0700 Subject: [PATCH 03/11] regenerate snapshot --- packages/features/snapshots/commands.txt | 155 ++++++++++++----------- 1 file changed, 79 insertions(+), 76 deletions(-) diff --git a/packages/features/snapshots/commands.txt b/packages/features/snapshots/commands.txt index d70b5e0680..6396e913e5 100644 --- a/packages/features/snapshots/commands.txt +++ b/packages/features/snapshots/commands.txt @@ -1,76 +1,79 @@ - app build @shopify/cli - app config link @shopify/cli - app config use @shopify/cli - app deploy @shopify/cli - app dev @shopify/cli - app env pull @shopify/cli - app env show @shopify/cli - app function build @shopify/cli - app function run @shopify/cli - app function schema @shopify/cli - app function typegen @shopify/cli - app generate extension @shopify/cli - app import-extensions @shopify/cli - app info @shopify/cli - app init @shopify/cli - app release @shopify/cli - app versions list @shopify/cli - app webhook trigger @shopify/cli - auth logout @shopify/cli - commands @shopify/cli - config autocorrect off @shopify/cli - config autocorrect on @shopify/cli - config autocorrect status @shopify/cli - help @shopify/cli - hydrogen build @shopify/cli-hydrogen - hydrogen check @shopify/cli-hydrogen - hydrogen codegen @shopify/cli-hydrogen - hydrogen customer-account push @shopify/cli-hydrogen - hydrogen debug cpu @shopify/cli-hydrogen - hydrogen deploy @shopify/cli-hydrogen - hydrogen dev @shopify/cli-hydrogen - hydrogen env list @shopify/cli-hydrogen - hydrogen env pull @shopify/cli-hydrogen - hydrogen env push @shopify/cli-hydrogen - hydrogen generate route @shopify/cli-hydrogen - hydrogen generate routes @shopify/cli-hydrogen - hydrogen init @shopify/cli-hydrogen - hydrogen link @shopify/cli-hydrogen - hydrogen list @shopify/cli-hydrogen - hydrogen login @shopify/cli-hydrogen - hydrogen logout @shopify/cli-hydrogen - hydrogen preview @shopify/cli-hydrogen - hydrogen setup @shopify/cli-hydrogen - hydrogen setup css @shopify/cli-hydrogen - hydrogen setup markets @shopify/cli-hydrogen - hydrogen setup vite @shopify/cli-hydrogen - hydrogen shortcut @shopify/cli-hydrogen - hydrogen unlink @shopify/cli-hydrogen - hydrogen upgrade @shopify/cli-hydrogen - plugins add @shopify/cli - plugins inspect @shopify/cli - plugins install @shopify/cli - plugins link @shopify/cli - plugins remove @shopify/cli - plugins reset @shopify/cli - plugins uninstall @shopify/cli - plugins unlink @shopify/cli - plugins update @shopify/cli - search @shopify/cli - theme check @shopify/cli - theme console @shopify/cli - theme delete @shopify/cli - theme dev @shopify/cli - theme info @shopify/cli - theme init @shopify/cli - theme language-server @shopify/cli - theme list @shopify/cli - theme open @shopify/cli - theme package @shopify/cli - theme publish @shopify/cli - theme pull @shopify/cli - theme push @shopify/cli - theme rename @shopify/cli - theme share @shopify/cli - upgrade @shopify/cli - version @shopify/cli + app build @shopify/cli + app config link @shopify/cli + app config use @shopify/cli + app deploy @shopify/cli + app dev @shopify/cli + app env pull @shopify/cli + app env show @shopify/cli + app function build @shopify/cli + app function replay @shopify/cli + app function run @shopify/cli + app function schema @shopify/cli + app function typegen @shopify/cli + app generate extension @shopify/cli + app import-extensions @shopify/cli + app info @shopify/cli + app init @shopify/cli + app logs @shopify/cli + app logs sources @shopify/cli + app release @shopify/cli + app versions list @shopify/cli + app webhook trigger @shopify/cli + auth logout @shopify/cli + commands @shopify/cli + config autocorrect off @shopify/cli + config autocorrect on @shopify/cli + config autocorrect status @shopify/cli + help @shopify/cli + hydrogen build @shopify/cli + hydrogen check @shopify/cli + hydrogen codegen @shopify/cli + hydrogen customer-account-push @shopify/cli + hydrogen debug cpu @shopify/cli + hydrogen deploy @shopify/cli + hydrogen dev @shopify/cli + hydrogen env list @shopify/cli + hydrogen env pull @shopify/cli + hydrogen env push @shopify/cli + hydrogen generate route @shopify/cli + hydrogen generate routes @shopify/cli + hydrogen init @shopify/cli + hydrogen link @shopify/cli + hydrogen list @shopify/cli + hydrogen login @shopify/cli + hydrogen logout @shopify/cli + hydrogen preview @shopify/cli + hydrogen setup @shopify/cli + hydrogen setup css @shopify/cli + hydrogen setup markets @shopify/cli + hydrogen setup vite @shopify/cli + hydrogen shortcut @shopify/cli + hydrogen unlink @shopify/cli + hydrogen upgrade @shopify/cli + plugins add @shopify/cli + plugins inspect @shopify/cli + plugins install @shopify/cli + plugins link @shopify/cli + plugins remove @shopify/cli + plugins reset @shopify/cli + plugins uninstall @shopify/cli + plugins unlink @shopify/cli + plugins update @shopify/cli + search @shopify/cli + theme check @shopify/cli + theme console @shopify/cli + theme delete @shopify/cli + theme dev @shopify/cli + theme info @shopify/cli + theme init @shopify/cli + theme language-server @shopify/cli + theme list @shopify/cli + theme open @shopify/cli + theme package @shopify/cli + theme publish @shopify/cli + theme pull @shopify/cli + theme push @shopify/cli + theme rename @shopify/cli + theme share @shopify/cli + upgrade @shopify/cli + version @shopify/cli From 5fffff78de349cfc2a51a2ab30f77690f69ba8ea Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 15:56:39 -0700 Subject: [PATCH 04/11] update cli-hydrogen version --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 6058189dbe..d28cb95c1c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -113,7 +113,7 @@ "@shopify/plugin-cloudflare": "3.69.0", "@shopify/plugin-did-you-mean": "3.69.0", "@shopify/theme": "3.69.0", - "@shopify/cli-hydrogen": "9.0.0", + "@shopify/cli-hydrogen": "9.0.1", "@types/node": "18.19.3", "@typescript-eslint/eslint-plugin": "7.13.1", "@vitest/coverage-istanbul": "^1.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53ac98b9b8..f4e736a195 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -278,8 +278,8 @@ importers: specifier: 3.69.0 version: link:../app '@shopify/cli-hydrogen': - specifier: 9.0.0 - version: 9.0.0(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2) + specifier: 9.0.1 + version: 9.0.1(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2) '@shopify/cli-kit': specifier: 3.69.0 version: link:../cli-kit @@ -6018,8 +6018,8 @@ packages: requiresBuild: true optional: true - /@shopify/cli-hydrogen@9.0.0(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-7AvAC/O/j3IA90+3gSR18o1CL5q3fTl+Db6A8ec2Gx/NL4VgGAblKEt+wncEXZ4hwfdq0dlOn7X3M3lx/kPJgA==} + /@shopify/cli-hydrogen@9.0.1(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-aKu95NOXtv3QqTRV1wMN0FK4zTWg43Sn65K2Q5ks7EBCnbPlZxl8oVantX65erqJif9dRDo+k7LylHqVD+1yJg==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: @@ -6046,7 +6046,7 @@ packages: '@ast-grep/napi': 0.11.0 '@graphql-codegen/cli': 5.0.2(@types/node@18.19.3)(graphql@16.8.1)(typescript@5.2.2) '@oclif/core': 3.26.5 - '@shopify/cli': 3.69.2 + '@shopify/cli': 3.69.3 '@shopify/oxygen-cli': 4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) '@shopify/plugin-cloudflare': link:packages/plugin-cloudflare ansi-escapes: 6.2.0 @@ -6069,8 +6069,8 @@ packages: - react-dom dev: true - /@shopify/cli@3.69.2: - resolution: {integrity: sha512-FQzxdOV16u2qQ0PbftilxqkGXFMjdsEC6gPhffmiLXHlmwmw6l6lXd2lOZoPWoFvg+X0bolD7MRywQ/2Pwvyzw==} + /@shopify/cli@3.69.3: + resolution: {integrity: sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==} engines: {node: ^18.20.0 || >=20.10.0} os: [darwin, linux, win32] hasBin: true From 63a771d185bace40f2f35cf82ee298fc42cfbbdb Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 16:05:27 -0700 Subject: [PATCH 05/11] manually fix pnpm --- pnpm-lock.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4e736a195..71721395a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6046,7 +6046,7 @@ packages: '@ast-grep/napi': 0.11.0 '@graphql-codegen/cli': 5.0.2(@types/node@18.19.3)(graphql@16.8.1)(typescript@5.2.2) '@oclif/core': 3.26.5 - '@shopify/cli': 3.69.3 + '@shopify/cli-kit': link:packages/cli-kit '@shopify/oxygen-cli': 4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) '@shopify/plugin-cloudflare': link:packages/plugin-cloudflare ansi-escapes: 6.2.0 @@ -6069,16 +6069,6 @@ packages: - react-dom dev: true - /@shopify/cli@3.69.3: - resolution: {integrity: sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==} - engines: {node: ^18.20.0 || >=20.10.0} - os: [darwin, linux, win32] - hasBin: true - dependencies: - '@ast-grep/napi': 0.11.0 - esbuild: 0.19.8 - dev: true - /@shopify/dates@1.1.5: resolution: {integrity: sha512-WpShtWjylq0iH4FQhpEz1g5tCZRw/GgZ00uYUxUinVyBqaUbRqiAq7EnwXzGO/aTpAUF6yXgDTxoji3aFOiC8A==} engines: {node: '>=12.14.0'} From f857246f8d5247f42882acd46f13fee52f283a6b Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 16:07:42 -0700 Subject: [PATCH 06/11] missed a line --- pnpm-lock.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71721395a1..71a3ec7972 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6064,7 +6064,6 @@ packages: ts-morph: 20.0.0 use-resize-observer: 9.1.0(react-dom@17.0.2)(react@17.0.2) transitivePeerDependencies: - - '@shopify/cli-kit' - react - react-dom dev: true From fb76e88763f1561ff368bee2ade4c7d2c8732d3e Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Tue, 29 Oct 2024 16:11:30 -0700 Subject: [PATCH 07/11] refresh pnpm lock file again --- pnpm-lock.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71a3ec7972..f4e736a195 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6046,7 +6046,7 @@ packages: '@ast-grep/napi': 0.11.0 '@graphql-codegen/cli': 5.0.2(@types/node@18.19.3)(graphql@16.8.1)(typescript@5.2.2) '@oclif/core': 3.26.5 - '@shopify/cli-kit': link:packages/cli-kit + '@shopify/cli': 3.69.3 '@shopify/oxygen-cli': 4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) '@shopify/plugin-cloudflare': link:packages/plugin-cloudflare ansi-escapes: 6.2.0 @@ -6064,10 +6064,21 @@ packages: ts-morph: 20.0.0 use-resize-observer: 9.1.0(react-dom@17.0.2)(react@17.0.2) transitivePeerDependencies: + - '@shopify/cli-kit' - react - react-dom dev: true + /@shopify/cli@3.69.3: + resolution: {integrity: sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==} + engines: {node: ^18.20.0 || >=20.10.0} + os: [darwin, linux, win32] + hasBin: true + dependencies: + '@ast-grep/napi': 0.11.0 + esbuild: 0.19.8 + dev: true + /@shopify/dates@1.1.5: resolution: {integrity: sha512-WpShtWjylq0iH4FQhpEz1g5tCZRw/GgZ00uYUxUinVyBqaUbRqiAq7EnwXzGO/aTpAUF6yXgDTxoji3aFOiC8A==} engines: {node: '>=12.14.0'} From 837f06801e8942dbcf219bfde5bc60a939c1d7c7 Mon Sep 17 00:00:00 2001 From: rbshop Date: Wed, 30 Oct 2024 14:35:31 +0000 Subject: [PATCH 08/11] Bump @shopify/cli-hydrogen to 9.0.2 to pull in cli-kit restore --- packages/cli/package.json | 2 +- pnpm-lock.yaml | 21 +++++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index d28cb95c1c..d986e93eeb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -113,7 +113,7 @@ "@shopify/plugin-cloudflare": "3.69.0", "@shopify/plugin-did-you-mean": "3.69.0", "@shopify/theme": "3.69.0", - "@shopify/cli-hydrogen": "9.0.1", + "@shopify/cli-hydrogen": "9.0.2", "@types/node": "18.19.3", "@typescript-eslint/eslint-plugin": "7.13.1", "@vitest/coverage-istanbul": "^1.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4e736a195..eed299c8cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -278,8 +278,8 @@ importers: specifier: 3.69.0 version: link:../app '@shopify/cli-hydrogen': - specifier: 9.0.1 - version: 9.0.1(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2) + specifier: 9.0.2 + version: 9.0.2(@graphql-codegen/cli@5.0.2)(react-dom@17.0.2)(react@17.0.2) '@shopify/cli-kit': specifier: 3.69.0 version: link:../cli-kit @@ -6018,8 +6018,8 @@ packages: requiresBuild: true optional: true - /@shopify/cli-hydrogen@9.0.1(@graphql-codegen/cli@5.0.2)(@shopify/cli-kit@packages+cli-kit)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-aKu95NOXtv3QqTRV1wMN0FK4zTWg43Sn65K2Q5ks7EBCnbPlZxl8oVantX65erqJif9dRDo+k7LylHqVD+1yJg==} + /@shopify/cli-hydrogen@9.0.2(@graphql-codegen/cli@5.0.2)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-KRlBmgik6fdzIw8z9Xj31swE2dIgTFavCSTS/tonumlu2RX5DrT2M+OTjiQv8s6wLJn5a4Nn6/+5Ds/hKGaKEQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: @@ -6046,7 +6046,7 @@ packages: '@ast-grep/napi': 0.11.0 '@graphql-codegen/cli': 5.0.2(@types/node@18.19.3)(graphql@16.8.1)(typescript@5.2.2) '@oclif/core': 3.26.5 - '@shopify/cli': 3.69.3 + '@shopify/cli-kit': link:packages/cli-kit '@shopify/oxygen-cli': 4.5.3(@oclif/core@3.26.5)(@shopify/cli-kit@packages+cli-kit) '@shopify/plugin-cloudflare': link:packages/plugin-cloudflare ansi-escapes: 6.2.0 @@ -6064,21 +6064,10 @@ packages: ts-morph: 20.0.0 use-resize-observer: 9.1.0(react-dom@17.0.2)(react@17.0.2) transitivePeerDependencies: - - '@shopify/cli-kit' - react - react-dom dev: true - /@shopify/cli@3.69.3: - resolution: {integrity: sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==} - engines: {node: ^18.20.0 || >=20.10.0} - os: [darwin, linux, win32] - hasBin: true - dependencies: - '@ast-grep/napi': 0.11.0 - esbuild: 0.19.8 - dev: true - /@shopify/dates@1.1.5: resolution: {integrity: sha512-WpShtWjylq0iH4FQhpEz1g5tCZRw/GgZ00uYUxUinVyBqaUbRqiAq7EnwXzGO/aTpAUF6yXgDTxoji3aFOiC8A==} engines: {node: '>=12.14.0'} From c5694a6a8d6dafdfab5439b1c42017e0189068d0 Mon Sep 17 00:00:00 2001 From: rbshop Date: Wed, 30 Oct 2024 14:44:17 +0000 Subject: [PATCH 09/11] ran pnpm update-docs --- .../commands/interfaces/hydrogen-deploy.interface.ts | 2 +- docs-shopify.dev/generated/generated_docs_data.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs-shopify.dev/commands/interfaces/hydrogen-deploy.interface.ts b/docs-shopify.dev/commands/interfaces/hydrogen-deploy.interface.ts index b8c941b25e..6cde83822f 100644 --- a/docs-shopify.dev/commands/interfaces/hydrogen-deploy.interface.ts +++ b/docs-shopify.dev/commands/interfaces/hydrogen-deploy.interface.ts @@ -85,7 +85,7 @@ export interface hydrogendeploy { '--path '?: string /** - * Deploys to the Preview environment. Overrides --env-branch and Git metadata. + * Deploys to the Preview environment. * */ '--preview'?: '' diff --git a/docs-shopify.dev/generated/generated_docs_data.json b/docs-shopify.dev/generated/generated_docs_data.json index 2bd0a6bb98..f4877371d7 100644 --- a/docs-shopify.dev/generated/generated_docs_data.json +++ b/docs-shopify.dev/generated/generated_docs_data.json @@ -2910,7 +2910,7 @@ "syntaxKind": "PropertySignature", "name": "--preview", "value": "\"\"", - "description": "Deploys to the Preview environment. Overrides --env-branch and Git metadata.", + "description": "Deploys to the Preview environment.", "isOptional": true }, { @@ -2941,7 +2941,7 @@ "environmentValue": "SHOPIFY_HYDROGEN_DEPLOYMENT_TOKEN" } ], - "value": "export interface hydrogendeploy {\n /**\n * Generate an authentication bypass token, which can be used to perform end-to-end tests against the deployment.\n * @environment AUTH_BYPASS_TOKEN\n */\n '--auth-bypass-token'?: ''\n\n /**\n * Specify the duration (in hours) up to 12 hours for the authentication bypass token. Defaults to `2`\n * @environment AUTH_BYPASS_TOKEN_DURATION\n */\n '--auth-bypass-token-duration '?: string\n\n /**\n * Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.\n *\n */\n '--build-command '?: string\n\n /**\n * Entry file for the worker. Defaults to `./server`.\n * @environment SHOPIFY_HYDROGEN_FLAG_ENTRY\n */\n '--entry '?: string\n\n /**\n * Specifies the environment to perform the operation using its handle. Fetch the handle using the `env list` command.\n *\n */\n '--env '?: string\n\n /**\n * Specifies the environment to perform the operation using its Git branch name.\n * @environment SHOPIFY_HYDROGEN_ENVIRONMENT_BRANCH\n */\n '--env-branch '?: string\n\n /**\n * Path to an environment file to override existing environment variables for the deployment.\n *\n */\n '--env-file '?: string\n\n /**\n * Forces a deployment to proceed if there are uncommited changes in its Git repository.\n * @environment SHOPIFY_HYDROGEN_FLAG_FORCE\n */\n '-f, --force'?: ''\n\n /**\n * Create a JSON file containing the deployment details in CI environments. Defaults to true, use `--no-json-output` to disable.\n *\n */\n '--json-output'?: ''\n\n /**\n * Checks that there is exactly one valid lockfile in the project. Defaults to `true`. Deactivate with `--no-lockfile-check`.\n * @environment SHOPIFY_HYDROGEN_FLAG_LOCKFILE_CHECK\n */\n '--lockfile-check'?: ''\n\n /**\n * Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.\n * @environment SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION\n */\n '--metadata-description '?: string\n\n /**\n * User that initiated the deployment. Will be saved and displayed in the Shopify admin\n * @environment SHOPIFY_HYDROGEN_FLAG_METADATA_USER\n */\n '--metadata-user '?: string\n\n /**\n * Skip the routability verification step after deployment.\n *\n */\n '--no-verify'?: ''\n\n /**\n * The path to the directory of the Hydrogen storefront. Defaults to the current directory where the command is run.\n * @environment SHOPIFY_HYDROGEN_FLAG_PATH\n */\n '--path '?: string\n\n /**\n * Deploys to the Preview environment. Overrides --env-branch and Git metadata.\n *\n */\n '--preview'?: ''\n\n /**\n * Shop URL. It can be the shop prefix (janes-apparel) or the full myshopify.com URL (janes-apparel.myshopify.com, https://janes-apparel.myshopify.com).\n * @environment SHOPIFY_SHOP\n */\n '-s, --shop '?: string\n\n /**\n * Oxygen deployment token. Defaults to the linked storefront's token if available.\n * @environment SHOPIFY_HYDROGEN_DEPLOYMENT_TOKEN\n */\n '-t, --token '?: string\n}" + "value": "export interface hydrogendeploy {\n /**\n * Generate an authentication bypass token, which can be used to perform end-to-end tests against the deployment.\n * @environment AUTH_BYPASS_TOKEN\n */\n '--auth-bypass-token'?: ''\n\n /**\n * Specify the duration (in hours) up to 12 hours for the authentication bypass token. Defaults to `2`\n * @environment AUTH_BYPASS_TOKEN_DURATION\n */\n '--auth-bypass-token-duration '?: string\n\n /**\n * Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.\n *\n */\n '--build-command '?: string\n\n /**\n * Entry file for the worker. Defaults to `./server`.\n * @environment SHOPIFY_HYDROGEN_FLAG_ENTRY\n */\n '--entry '?: string\n\n /**\n * Specifies the environment to perform the operation using its handle. Fetch the handle using the `env list` command.\n *\n */\n '--env '?: string\n\n /**\n * Specifies the environment to perform the operation using its Git branch name.\n * @environment SHOPIFY_HYDROGEN_ENVIRONMENT_BRANCH\n */\n '--env-branch '?: string\n\n /**\n * Path to an environment file to override existing environment variables for the deployment.\n *\n */\n '--env-file '?: string\n\n /**\n * Forces a deployment to proceed if there are uncommited changes in its Git repository.\n * @environment SHOPIFY_HYDROGEN_FLAG_FORCE\n */\n '-f, --force'?: ''\n\n /**\n * Create a JSON file containing the deployment details in CI environments. Defaults to true, use `--no-json-output` to disable.\n *\n */\n '--json-output'?: ''\n\n /**\n * Checks that there is exactly one valid lockfile in the project. Defaults to `true`. Deactivate with `--no-lockfile-check`.\n * @environment SHOPIFY_HYDROGEN_FLAG_LOCKFILE_CHECK\n */\n '--lockfile-check'?: ''\n\n /**\n * Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.\n * @environment SHOPIFY_HYDROGEN_FLAG_METADATA_DESCRIPTION\n */\n '--metadata-description '?: string\n\n /**\n * User that initiated the deployment. Will be saved and displayed in the Shopify admin\n * @environment SHOPIFY_HYDROGEN_FLAG_METADATA_USER\n */\n '--metadata-user '?: string\n\n /**\n * Skip the routability verification step after deployment.\n *\n */\n '--no-verify'?: ''\n\n /**\n * The path to the directory of the Hydrogen storefront. Defaults to the current directory where the command is run.\n * @environment SHOPIFY_HYDROGEN_FLAG_PATH\n */\n '--path '?: string\n\n /**\n * Deploys to the Preview environment.\n *\n */\n '--preview'?: ''\n\n /**\n * Shop URL. It can be the shop prefix (janes-apparel) or the full myshopify.com URL (janes-apparel.myshopify.com, https://janes-apparel.myshopify.com).\n * @environment SHOPIFY_SHOP\n */\n '-s, --shop '?: string\n\n /**\n * Oxygen deployment token. Defaults to the linked storefront's token if available.\n * @environment SHOPIFY_HYDROGEN_DEPLOYMENT_TOKEN\n */\n '-t, --token '?: string\n}" } } } From be47381ced110875628321faeaf952dfdad18cc1 Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Wed, 30 Oct 2024 08:41:24 -0700 Subject: [PATCH 10/11] fix types --- .../business-platform-organizations/generated/types.d.ts | 2 ++ 1 file changed, 2 insertions(+) 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 3b5e3d0efa..27f6e42be4 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 @@ -16,6 +16,8 @@ export type Scalars = { /** The ID for a AccessRole. */ AccessRoleID: {input: any; output: any} AccessRoleRecordId: {input: any; output: any} + /** The ID for a ActionAudit. */ + ActionAuditID: {input: any; output: any} GlobalID: {input: string; output: string} /** The ID for a Group. */ GroupID: {input: any; output: any} From 7da2c4dbde40cd2b6412a0d682e16c7ad32f6e94 Mon Sep 17 00:00:00 2001 From: Helen Lin Date: Wed, 30 Oct 2024 08:47:16 -0700 Subject: [PATCH 11/11] add changeset --- .changeset/red-jars-kick.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/red-jars-kick.md diff --git a/.changeset/red-jars-kick.md b/.changeset/red-jars-kick.md new file mode 100644 index 0000000000..5bb6242edd --- /dev/null +++ b/.changeset/red-jars-kick.md @@ -0,0 +1,5 @@ +--- +'@shopify/cli': patch +--- + +Bump cli-hydrogen to 9.0.2