From 6f9145bae152dd20abb0326c0ea3d6a9815bad47 Mon Sep 17 00:00:00 2001 From: Fran Dios Date: Tue, 16 Jul 2024 23:24:30 +0900 Subject: [PATCH] Update cli-kit (#2337) * Update to latest CLI release * Remove local dependency on cli-hydrogen * Update local cli-kit dependencies to latest * Remove references to cli-hydrogen in code * Revert "Remove references to cli-hydrogen in code" This reverts commit 6169aa9f56bbbb36fd0c8df152f84cc5217d68d0. * Revert "Remove local dependency on cli-hydrogen" This reverts commit 581f2aa241dc6c11a8a152aae9d901101196fb7d. * Fix init hook for diff examples without dependencies --- examples/express/package.json | 2 +- package-lock.json | 168 ++++++++++++++++---------------- package.json | 2 +- packages/cli/package.json | 4 +- packages/cli/src/hooks/init.ts | 12 ++- templates/skeleton/package.json | 2 +- 6 files changed, 98 insertions(+), 92 deletions(-) diff --git a/examples/express/package.json b/examples/express/package.json index b0169a3e7..88636e817 100644 --- a/examples/express/package.json +++ b/examples/express/package.json @@ -14,7 +14,7 @@ "@remix-run/node": "^2.10.1", "@remix-run/react": "^2.10.1", "@remix-run/server-runtime": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/hydrogen": "2024.7.1", "compression": "^1.7.4", "cross-env": "^7.0.3", diff --git a/package-lock.json b/package-lock.json index 7425ca553..6af5edd6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,7 +114,7 @@ "@remix-run/node": "^2.10.1", "@remix-run/react": "^2.10.1", "@remix-run/server-runtime": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/hydrogen": "2024.7.1", "compression": "^1.7.4", "cross-env": "^7.0.3", @@ -5564,9 +5564,9 @@ } }, "node_modules/@npmcli/package-json/node_modules/glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", @@ -5579,9 +5579,6 @@ "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=18" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -6192,7 +6189,9 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz", "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", @@ -7698,9 +7697,9 @@ "license": "MIT" }, "node_modules/@shopify/cli": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.63.2.tgz", - "integrity": "sha512-bkUUxA3r9G6DfMyhfuA0YalCA5GHqnQ/18pD9H7ppV43646iMpZrAEi0MtiyrFwerLZ//1Ic3NgMMKqkcmOQxg==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.64.0.tgz", + "integrity": "sha512-0bZ4mfMdvZSHJp/VIcTRZ8ZOEjkmM+AcWWp+X9eWai3UBnxodTa8ikN/uRLj6LxsgNkUOpOCljmk6f/wjowRlA==", "os": [ "darwin", "linux", @@ -7715,9 +7714,6 @@ }, "engines": { "node": "^18.20.0 || >=20.10.0" - }, - "optionalDependencies": { - "@parcel/watcher": "2.4.1" } }, "node_modules/@shopify/cli-hydrogen": { @@ -7725,9 +7721,9 @@ "link": true }, "node_modules/@shopify/cli-kit": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.63.2.tgz", - "integrity": "sha512-8TQ1RlKdnSdSukroIdsiUHZI9JOfkV9za5ev5wB4e+0JqSjBNRZ6cRxwAxEpzAcgeG0TKLTKklSXrygJ/wkiwg==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.64.0.tgz", + "integrity": "sha512-kCbwopX40LA02tn7G9BTOkzChaYHdyivNEegrQfD1lwqWC33n3j5bhZRC3grzcuR6HdEgbBjHgN+Te5qIWRCUg==", "os": [ "darwin", "linux", @@ -8197,9 +8193,9 @@ "dev": true }, "node_modules/@shopify/plugin-cloudflare": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/plugin-cloudflare/-/plugin-cloudflare-3.63.2.tgz", - "integrity": "sha512-tDzuPPhYaZ3ZR5wAX9y/yNJXKgypMjnyUL4I/0Im//Q3F3QPEoDW98wVyorh9VIIE6mPoge9caV2opD6HVnzNA==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/plugin-cloudflare/-/plugin-cloudflare-3.64.0.tgz", + "integrity": "sha512-vWqm+ZILaLsMbg868FkjbbA8rFdkmai70u5nIRBPoWZAhzLFcXalkuSl+L10Dt7sK55XT2w9ROvEWwEUGts3CA==", "os": [ "darwin", "linux", @@ -8207,7 +8203,7 @@ ], "dependencies": { "@oclif/core": "3.26.5", - "@shopify/cli-kit": "3.63.2" + "@shopify/cli-kit": "3.64.0" }, "engines": { "node": "^18.20.0 || >=20.10.0" @@ -11022,9 +11018,9 @@ } }, "node_modules/cacache/node_modules/glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", @@ -11037,9 +11033,6 @@ "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=18" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -11735,14 +11728,14 @@ } }, "node_modules/conf/node_modules/ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dependencies": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -12693,7 +12686,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "devOptional": true, + "dev": true, "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -14353,6 +14346,11 @@ "fast-decode-uri-component": "^1.0.1" } }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==" + }, "node_modules/fast-url-parser": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", @@ -22056,7 +22054,9 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.0.0.tgz", "integrity": "sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/node-domexception": { "version": "1.0.0", @@ -23149,13 +23149,10 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz", - "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==", - "dev": true, - "engines": { - "node": ">=18" - } + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true }, "node_modules/path-to-regexp": { "version": "0.1.7", @@ -26475,9 +26472,9 @@ } }, "node_modules/sucrase/node_modules/glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", @@ -26490,9 +26487,6 @@ "bin": { "glob": "dist/esm/bin.mjs" }, - "engines": { - "node": ">=18" - }, "funding": { "url": "https://github.com/sponsors/isaacs" } @@ -29711,9 +29705,9 @@ "dependencies": { "@ast-grep/napi": "0.11.0", "@oclif/core": "3.26.5", - "@shopify/cli-kit": "3.63.2", + "@shopify/cli-kit": "3.64.0", "@shopify/oxygen-cli": "4.4.9", - "@shopify/plugin-cloudflare": "3.63.2", + "@shopify/plugin-cloudflare": "3.64.0", "ansi-escapes": "^6.2.0", "chokidar": "3.5.3", "cli-truncate": "^4.0.0", @@ -32417,7 +32411,7 @@ "@graphql-codegen/cli": "5.0.2", "@remix-run/dev": "^2.10.1", "@remix-run/eslint-config": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/hydrogen-codegen": "^0.3.1", "@shopify/mini-oxygen": "^3.0.4", "@shopify/oxygen-workers-types": "^4.1.2", @@ -36232,9 +36226,9 @@ } }, "glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "requires": { "foreground-child": "^3.1.0", @@ -36668,7 +36662,9 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz", "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==", + "dev": true, "optional": true, + "peer": true, "requires": { "@parcel/watcher-android-arm64": "2.4.1", "@parcel/watcher-darwin-arm64": "2.4.1", @@ -37526,12 +37522,11 @@ "dev": true }, "@shopify/cli": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.63.2.tgz", - "integrity": "sha512-bkUUxA3r9G6DfMyhfuA0YalCA5GHqnQ/18pD9H7ppV43646iMpZrAEi0MtiyrFwerLZ//1Ic3NgMMKqkcmOQxg==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.64.0.tgz", + "integrity": "sha512-0bZ4mfMdvZSHJp/VIcTRZ8ZOEjkmM+AcWWp+X9eWai3UBnxodTa8ikN/uRLj6LxsgNkUOpOCljmk6f/wjowRlA==", "requires": { "@ast-grep/napi": "0.11.0", - "@parcel/watcher": "2.4.1", "esbuild": "0.19.8" } }, @@ -37541,9 +37536,9 @@ "@ast-grep/napi": "0.11.0", "@oclif/core": "3.26.5", "@remix-run/dev": "^2.10.1", - "@shopify/cli-kit": "3.63.2", + "@shopify/cli-kit": "3.64.0", "@shopify/oxygen-cli": "4.4.9", - "@shopify/plugin-cloudflare": "3.63.2", + "@shopify/plugin-cloudflare": "3.64.0", "@types/diff": "^5.0.2", "@types/gunzip-maybe": "^1.4.0", "@types/prettier": "^2.7.2", @@ -37663,9 +37658,9 @@ } }, "@shopify/cli-kit": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.63.2.tgz", - "integrity": "sha512-8TQ1RlKdnSdSukroIdsiUHZI9JOfkV9za5ev5wB4e+0JqSjBNRZ6cRxwAxEpzAcgeG0TKLTKklSXrygJ/wkiwg==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.64.0.tgz", + "integrity": "sha512-kCbwopX40LA02tn7G9BTOkzChaYHdyivNEegrQfD1lwqWC33n3j5bhZRC3grzcuR6HdEgbBjHgN+Te5qIWRCUg==", "requires": { "@apidevtools/json-schema-ref-parser": "11.6.4", "@bugsnag/js": "7.21.0", @@ -39581,12 +39576,12 @@ "dev": true }, "@shopify/plugin-cloudflare": { - "version": "3.63.2", - "resolved": "https://registry.npmjs.org/@shopify/plugin-cloudflare/-/plugin-cloudflare-3.63.2.tgz", - "integrity": "sha512-tDzuPPhYaZ3ZR5wAX9y/yNJXKgypMjnyUL4I/0Im//Q3F3QPEoDW98wVyorh9VIIE6mPoge9caV2opD6HVnzNA==", + "version": "3.64.0", + "resolved": "https://registry.npmjs.org/@shopify/plugin-cloudflare/-/plugin-cloudflare-3.64.0.tgz", + "integrity": "sha512-vWqm+ZILaLsMbg868FkjbbA8rFdkmai70u5nIRBPoWZAhzLFcXalkuSl+L10Dt7sK55XT2w9ROvEWwEUGts3CA==", "requires": { "@oclif/core": "3.26.5", - "@shopify/cli-kit": "3.63.2" + "@shopify/cli-kit": "3.64.0" } }, "@shopify/prettier-config": { @@ -41575,9 +41570,9 @@ } }, "glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "requires": { "foreground-child": "^3.1.0", @@ -42068,14 +42063,14 @@ }, "dependencies": { "ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "requires": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" } }, "json-schema-traverse": { @@ -42675,7 +42670,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "devOptional": true + "dev": true }, "devlop": { "version": "1.1.0", @@ -43678,7 +43673,7 @@ "@remix-run/node": "^2.10.1", "@remix-run/react": "^2.10.1", "@remix-run/server-runtime": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/hydrogen": "2024.7.1", "@types/compression": "^1.7.2", "@types/express": "^4.17.17", @@ -43901,6 +43896,11 @@ "fast-decode-uri-component": "^1.0.1" } }, + "fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==" + }, "fast-url-parser": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", @@ -48830,7 +48830,9 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.0.0.tgz", "integrity": "sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "node-domexception": { "version": "1.0.0", @@ -49560,9 +49562,9 @@ }, "dependencies": { "lru-cache": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz", - "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==", + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true } } @@ -51277,7 +51279,7 @@ "@remix-run/eslint-config": "^2.10.1", "@remix-run/react": "^2.10.1", "@remix-run/server-runtime": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/cli-hydrogen": "*", "@shopify/hydrogen": "2024.7.1", "@shopify/hydrogen-codegen": "^0.3.1", @@ -51888,9 +51890,9 @@ "dev": true }, "glob": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", - "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", "dev": true, "requires": { "foreground-child": "^3.1.0", diff --git a/package.json b/package.json index 7978eba62..d3bb9b183 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,6 @@ }, "overrides": { "@oclif/core": "3.26.5", - "@shopify/cli-kit": "3.63.2" + "@shopify/cli-kit": "3.64.0" } } diff --git a/packages/cli/package.json b/packages/cli/package.json index 2af8713c0..73084b052 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -34,9 +34,9 @@ "dependencies": { "@ast-grep/napi": "0.11.0", "@oclif/core": "3.26.5", - "@shopify/cli-kit": "3.63.2", + "@shopify/cli-kit": "3.64.0", "@shopify/oxygen-cli": "4.4.9", - "@shopify/plugin-cloudflare": "3.63.2", + "@shopify/plugin-cloudflare": "3.64.0", "ansi-escapes": "^6.2.0", "chokidar": "3.5.3", "cli-truncate": "^4.0.0", diff --git a/packages/cli/src/hooks/init.ts b/packages/cli/src/hooks/init.ts index c616d2266..d78eb4907 100644 --- a/packages/cli/src/hooks/init.ts +++ b/packages/cli/src/hooks/init.ts @@ -81,11 +81,15 @@ function commandNeedsVM(id = '', argv: string[] = []) { function isHydrogenProject(projectPath: string) { try { const require = createRequire(import.meta.url); - const {dependencies} = require(joinPath(projectPath, 'package.json')); + const {dependencies, scripts} = require(joinPath( + projectPath, + 'package.json', + )); + return ( - !!dependencies['@shopify/hydrogen'] || - // Diff examples only have this package as a dependency - !!dependencies['@shopify/cli-hydrogen'] + !!dependencies?.['@shopify/hydrogen'] || + // Diff examples don't have dependencies: + !!scripts?.dev?.includes('--diff') ); } catch { return false; diff --git a/templates/skeleton/package.json b/templates/skeleton/package.json index 7d66b7880..bbd2af797 100644 --- a/templates/skeleton/package.json +++ b/templates/skeleton/package.json @@ -29,7 +29,7 @@ "@graphql-codegen/cli": "5.0.2", "@remix-run/dev": "^2.10.1", "@remix-run/eslint-config": "^2.10.1", - "@shopify/cli": "^3.63.2", + "@shopify/cli": "^3.64.0", "@shopify/hydrogen-codegen": "^0.3.1", "@shopify/mini-oxygen": "^3.0.4", "@shopify/oxygen-workers-types": "^4.1.2",