@shopify/cli-hydrogen 8.4.0 → 8.4.1

package/dist/assets/hydrogen/starter/CHANGELOG.md

@@ -1,5 +1,12 @@
 # skeleton
 
+## 2024.7.5
+
+### Patch Changes
+
+- Updated dependencies [[`b0d3bc06`](https://github.com/Shopify/hydrogen/commit/b0d3bc0696d266fcfc4eb93d0a4adb9ccb56ade6)]:
+  - @shopify/hydrogen@2024.7.4
+
 ## 2024.7.4
 
 ### Patch Changes

package/dist/assets/hydrogen/starter/package.json

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2024.7.4",
+  "version": "2024.7.5",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@remix-run/react": "^2.10.1",
     "@remix-run/server-runtime": "^2.10.1",
-    "@shopify/hydrogen": "2024.7.3",
+    "@shopify/hydrogen": "2024.7.4",
     "@shopify/remix-oxygen": "^2.0.6",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
@@ -28,7 +28,7 @@
     "@graphql-codegen/cli": "5.0.2",
     "@remix-run/dev": "^2.10.1",
     "@remix-run/eslint-config": "^2.10.1",
-    "@shopify/cli": "3.65.1",
+    "@shopify/cli": "~3.65.3",
     "@shopify/hydrogen-codegen": "^0.3.1",
     "@shopify/mini-oxygen": "^3.0.4",
     "@shopify/oxygen-workers-types": "^4.1.2",

package/dist/commands/hydrogen/upgrade.js

@@ -187,6 +187,7 @@ function hasOutdatedDependencies({
     ...release.dependencies,
     ...release.devDependencies
   }).some(([name, version]) => {
+    if (name === "@shopify/cli") return false;
     const currentDependencyVersion = currentDependencies?.[name];
     if (!currentDependencyVersion) return false;
     const isDependencyOutdated = semver.gt(

package/dist/lib/onboarding/remote.js

@@ -7,7 +7,6 @@ import { renderTasks, renderInfo } from '@shopify/cli-kit/node/ui';
 import { downloadExternalRepo, downloadMonorepoTemplates } from '../template-downloader.js';
 import { applyTemplateDiff } from '../template-diff.js';
 import { getCliCommand } from '../shell.js';
-import { replaceFileContent } from '../file.js';
 import { createAbortHandler, handleProjectLocation, handleLanguage, createInitialCommit, handleDependencies, commitAll, renderProjectReady } from './common.js';
 
 const DEMO_STORE_REPO = "shopify/hydrogen-demo-store";
@@ -30,16 +29,6 @@ async function setupRemoteTemplate(options, controller) {
       return applyTemplateDiff(project.directory, sourcePath, skeletonPath);
     }
     await copyFile(sourcePath, project.directory);
-    await replaceFileContent(
-      joinPath(project.directory, "package.json"),
-      false,
-      (content) => (
-        // Remove the cli plugin dependency from the package.json because it's
-        // only used for monorepo development. This line is present in non-diff
-        // examples like `express` when scaffolding a new project:
-        content.replace(/^\s*"@shopify\/cli-hydrogen": "[^"]+",?\n/m, "")
-      )
-    );
   }).catch(abort);
   const supportsTranspilation = await fileExists(
     joinPath(downloaded.sourcePath, "tsconfig.json")

package/dist/lib/template-diff.js

@@ -126,16 +126,10 @@ ${colors.dim(
     async copyDiffBuild() {
       const target = joinPath(diffDirectory, "dist");
       await removeFile(target);
-      await Promise.all([
-        cp(joinPath(targetDirectory, "dist"), target, {
-          force: true,
-          recursive: true
-        }),
-        copyFile(
-          joinPath(targetDirectory, ".env"),
-          joinPath(diffDirectory, ".env")
-        )
-      ]);
+      await cp(joinPath(targetDirectory, "dist"), target, {
+        force: true,
+        recursive: true
+      });
     },
     /**
      * Brings the generated d.ts files back to the original project.
@@ -183,9 +177,6 @@ async function applyTemplateDiff(targetDirectory, diffDirectory, templateDir) {
   await mergePackageJson(diffDirectory, targetDirectory, {
     ignoredKeys: ["h2:diff"],
     onResult: (pkgJson) => {
-      if (pkgJson.dependencies) {
-        delete pkgJson.dependencies["@shopify/cli-hydrogen"];
-      }
       for (const key of ["build", "dev", "preview"]) {
         const scriptLine = pkgJson.scripts?.[key];
         if (pkgJson.scripts?.[key] && typeof scriptLine === "string") {

package/oclif.manifest.json

@@ -1751,5 +1751,5 @@
       ]
     }
   },
-  "version": "8.4.0"
+  "version": "8.4.1"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "8.4.0",
+  "version": "8.4.1",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -34,9 +34,9 @@
   "dependencies": {
     "@ast-grep/napi": "0.11.0",
     "@oclif/core": "3.26.5",
-    "@shopify/cli-kit": "3.65.1",
+    "@shopify/cli-kit": "3.65.3",
     "@shopify/oxygen-cli": "4.4.9",
-    "@shopify/plugin-cloudflare": "3.65.1",
+    "@shopify/plugin-cloudflare": "3.65.3",
     "ansi-escapes": "^6.2.0",
     "chokidar": "3.5.3",
     "cli-truncate": "^4.0.0",