@shopify/hydrogen 2024.4.2 → 2024.4.4

package/dist/vite/plugin.js

@@ -6,12 +6,15 @@ import { getVirtualRoutes } from "./get-virtual-routes.js";
 const sharedOptions = {};
 function hydrogen(pluginOptions = {}) {
   let middlewareOptions = {};
-  const isRemixChildCompiler = (config) => !config.plugins?.some((plugin) => plugin.name === "remix");
   return [
     {
       name: "hydrogen:main",
       config(_, env) {
         sharedOptions.command = env.command;
+        const isHydrogenMonorepo = new URL(
+          "../../..",
+          import.meta.url
+        ).pathname.endsWith("/hydrogen/packages/");
         return {
           ssr: {
             optimizeDeps: {
@@ -24,16 +27,16 @@ function hydrogen(pluginOptions = {}) {
                 "react/jsx-dev-runtime",
                 "react-dom",
                 "react-dom/server",
-                // Remix deps:
-                "set-cookie-parser",
-                "cookie"
+                "@remix-run/server-runtime"
               ]
             }
           },
           // Vite performs an initial reload after optimizing these dependencies.
           // Do it early to avoid the initial reload:
           optimizeDeps: {
-            include: ["@shopify/hydrogen"]
+            // Avoid optimizing Hydrogen itself in the monorepo
+            // to prevent caching source code changes:
+            include: isHydrogenMonorepo ? ["content-security-policy-builder", "worktop/cookie"] : ["@shopify/hydrogen"]
           }
         };
       },
@@ -54,7 +57,6 @@ function hydrogen(pluginOptions = {}) {
         );
         middlewareOptions.isOxygen = !!oxygenPlugin;
         oxygenPlugin?.api?.registerPluginOptions?.({
-          shouldStartRuntime: () => !isRemixChildCompiler(resolvedConfig),
           requestHook: ({ request, response, meta }) => {
             emitRequestEvent(
               {
@@ -112,15 +114,16 @@ function hydrogen(pluginOptions = {}) {
           ]
         });
       },
-      configureServer(viteDevServer) {
-        if (isRemixChildCompiler(viteDevServer.config))
-          return;
-        return () => {
-          setupHydrogenMiddleware(
-            viteDevServer,
-            mergeOptions(pluginOptions, middlewareOptions)
-          );
-        };
+      configureServer: {
+        order: "pre",
+        handler: (viteDevServer) => {
+          return () => {
+            setupHydrogenMiddleware(
+              viteDevServer,
+              mergeOptions(pluginOptions, middlewareOptions)
+            );
+          };
+        }
       }
     }
   ];

package/dist/vite/request-events.js

@@ -1,10 +1,11 @@
 import path from "node:path";
 import { EventEmitter } from "node:events";
 import { mapSourcePosition } from "source-map-support";
-const DEV_ROUTES = /* @__PURE__ */ new Set([
+const IGNORED_ROUTES = /* @__PURE__ */ new Set([
   "/graphiql",
   "/subrequest-profiler",
-  "/debug-network-server"
+  "/debug-network-server",
+  "/favicon.ico"
 ]);
 const EVENT_MAP = {
   request: "Request",
@@ -32,7 +33,7 @@ function emitRequestEvent(payload, root) {
   }
   delete payload.__fromVite;
   const { pathname } = new URL(payload.url, "http://localhost");
-  if (DEV_ROUTES.has(pathname))
+  if (IGNORED_ROUTES.has(pathname))
     return;
   const {
     url: descriptionUrl,

package/dist/vite/virtual-routes/routes/index.jsx

@@ -2,7 +2,6 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useLoaderData } from "@remix-run/react";
 import { HydrogenLogoBaseBW } from "../components/HydrogenLogoBaseBW.jsx";
 import { HydrogenLogoBaseColor } from "../components/HydrogenLogoBaseColor.jsx";
-import { IconDiscord } from "../components/IconDiscord.jsx";
 import { IconGithub } from "../components/IconGithub.jsx";
 import { IconTwitter } from "../components/IconTwitter.jsx";
 import { IconBanner } from "../components/IconBanner.jsx";
@@ -218,15 +217,6 @@ function Layout({
       /* @__PURE__ */ jsx("h1", { children: shopName?.toUpperCase() }),
       /* @__PURE__ */ jsx("p", { children: "\xA0Dev Mode\xA0" }),
       /* @__PURE__ */ jsxs("nav", { children: [
-        /* @__PURE__ */ jsx(
-          "a",
-          {
-            target: "_blank",
-            rel: "norefferer noopener",
-            href: "https://discord.com/invite/shopifydevs",
-            children: /* @__PURE__ */ jsx(IconDiscord, {})
-          }
-        ),
         /* @__PURE__ */ jsx(
           "a",
           {

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "type": "module",
-  "version": "2024.4.2",
+  "version": "2024.4.4",
   "license": "MIT",
   "main": "dist/index.cjs",
   "module": "dist/production/index.js",
@@ -63,21 +63,23 @@
     "dist"
   ],
   "dependencies": {
-    "@shopify/hydrogen-react": "2024.4.2",
+    "@shopify/hydrogen-react": "2024.4.3",
     "content-security-policy-builder": "^2.2.0",
     "type-fest": "^4.5.0",
     "source-map-support": "^0.5.21",
-    "tiny-invariant": "^1.3.1",
-    "use-resize-observer": "^9.1.0"
+    "use-resize-observer": "^9.1.0",
+    "worktop": "^0.7.3"
   },
   "devDependencies": {
-    "@remix-run/react": "^2.8.0",
-    "@remix-run/server-runtime": "^2.8.0",
+    "@remix-run/dev": "^2.9.2",
+    "@remix-run/react": "^2.9.2",
+    "@remix-run/server-runtime": "^2.9.2",
     "@shopify/generate-docs": "0.11.1",
     "@shopify/hydrogen-codegen": "*",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^14.0.0",
     "@types/source-map-support": "^0.5.10",
+    "formdata-polyfill": "^4.0.10",
     "happy-dom": "^8.9.0",
     "react": "^18.2.0",
     "schema-dts": "^1.1.0",

package/dist/vite/virtual-routes/components/IconDiscord.jsx

@@ -1,21 +0,0 @@
-import { jsx } from "react/jsx-runtime";
-const IconDiscord = (props) => /* @__PURE__ */ jsx(
-  "svg",
-  {
-    width: 26,
-    height: 20,
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg",
-    ...props,
-    children: /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M21.19 1.675A19.91 19.91 0 0 0 16.03 0c-.223.415-.482.973-.661 1.418a18.355 18.355 0 0 0-5.72 0A15.367 15.367 0 0 0 8.98 0a19.844 19.844 0 0 0-5.165 1.68C.55 6.776-.336 11.747.106 16.647c2.167 1.67 4.266 2.686 6.33 3.35.51-.724.964-1.495 1.356-2.306a13.149 13.149 0 0 1-2.135-1.073c.179-.137.354-.28.523-.428 4.116 1.989 8.588 1.989 12.655 0 .172.148.347.291.524.428a13.12 13.12 0 0 1-2.139 1.075c.392.81.844 1.582 1.356 2.306 2.066-.664 4.167-1.68 6.333-3.352.52-5.68-.887-10.606-3.718-14.973ZM8.353 13.635c-1.235 0-2.249-1.192-2.249-2.643 0-1.45.992-2.644 2.25-2.644 1.257 0 2.27 1.191 2.248 2.644.002 1.45-.991 2.642-2.249 2.642Zm8.311 0c-1.235 0-2.249-1.192-2.249-2.643 0-1.45.992-2.644 2.25-2.644 1.257 0 2.27 1.191 2.248 2.644 0 1.45-.991 2.642-2.249 2.642Z",
-        fill: "#5C5F62"
-      }
-    )
-  }
-);
-export {
-  IconDiscord
-};