@shopify/cli-hydrogen 4.0.9 → 4.1.0

package/dist/{utils → lib}/template-downloader.js

@@ -2,17 +2,19 @@ import path from 'path';
 import { pipeline } from 'stream/promises';
 import gunzipMaybe from 'gunzip-maybe';
 import { extract } from 'tar-fs';
-import { http, file } from '@shopify/cli-kit';
+import { fetch } from '@shopify/cli-kit/node/http';
+import { fileExists, mkdir } from '@shopify/cli-kit/node/fs';
+import { AbortError } from '@shopify/cli-kit/node/error';
 import { fileURLToPath } from 'url';
 
 const REPO_RELEASES_URL = `https://api.github.com/repos/shopify/hydrogen/releases/latest`;
+const getTryMessage = (status) => status === 403 ? `If you are using a VPN, WARP, or similar service, consider disabling it momentarily.` : void 0;
 async function getLatestReleaseDownloadUrl() {
-  const response = await http.fetch(REPO_RELEASES_URL);
+  const response = await fetch(REPO_RELEASES_URL);
   if (!response.ok || response.status >= 400) {
-    throw new Error(
-      `Failed to fetch the latest release information. Status ${response.status} ${response.statusText.replace(/\.$/, "")}.` + (response.status === 403 ? `
-
-If you are using a VPN, WARP, or similar service, consider disabling it momentarily.` : "")
+    throw new AbortError(
+      `Failed to fetch the latest release information. Status ${response.status} ${response.statusText.replace(/\.$/, "")}.`,
+      getTryMessage(response.status)
     );
   }
   const release = await response.json();
@@ -22,10 +24,11 @@ If you are using a VPN, WARP, or similar service, consider disabling it momentar
   };
 }
 async function downloadTarball(url, storageDir) {
-  const response = await http.fetch(url);
+  const response = await fetch(url);
   if (!response.ok || response.status >= 400) {
-    throw new Error(
-      `Failed to download the latest release files. Status ${response.status} ${response.statusText}}`
+    throw new AbortError(
+      `Failed to download the latest release files. Status ${response.status} ${response.statusText}}`,
+      getTryMessage(response.status)
     );
   }
   await pipeline(
@@ -46,11 +49,11 @@ async function getLatestTemplates() {
     const templateStoragePath = fileURLToPath(
       new URL("../starter-templates", import.meta.url)
     );
-    if (!await file.exists(templateStoragePath)) {
-      await file.mkdir(templateStoragePath);
+    if (!await fileExists(templateStoragePath)) {
+      await mkdir(templateStoragePath);
     }
     const templateStorageVersionPath = path.join(templateStoragePath, version);
-    if (!await file.exists(templateStorageVersionPath)) {
+    if (!await fileExists(templateStorageVersionPath)) {
       await downloadTarball(url, templateStorageVersionPath);
     }
     return {
@@ -59,12 +62,14 @@ async function getLatestTemplates() {
     };
   } catch (e) {
     const error = e;
-    error.message = `Could not download Hydrogen templates from GitHub.
+    throw new AbortError(
+      `Could not download Hydrogen templates from GitHub.
 Please check your internet connection and the following error:
 
-` + error.message;
-    throw error;
+` + error.message,
+      error.tryMessage
+    );
   }
 }
 
-export { downloadTarball, getLatestReleaseDownloadUrl, getLatestTemplates };
+export { getLatestTemplates };

package/dist/{utils → lib}/transpile-ts.js

@@ -3,7 +3,7 @@ import fs from 'fs/promises';
 import prettier from 'prettier';
 import ts from 'typescript';
 import glob from 'fast-glob';
-import { output } from '@shopify/cli-kit';
+import { outputDebug } from '@shopify/cli-kit/node/output';
 
 const escapeNewLines = (code) => code.replace(/\n\n/g, "\n/* :newline: */");
 const restoreNewLines = (code) => code.replace(/\/\* :newline: \*\//g, "\n");
@@ -112,7 +112,7 @@ async function transpileProject(projectDir) {
     remixConfig = remixConfig.replace(/\/server\.ts/gim, "/server.js");
     await fs.writeFile(remixConfigPath, remixConfig);
   } catch (error) {
-    output.debug(
+    outputDebug(
       "Could not change TS extensions in remix.config.js:\n" + error.stack
     );
   }
@@ -129,7 +129,7 @@ async function transpileProject(projectDir) {
       "utf8"
     );
   } catch (error) {
-    output.debug(
+    outputDebug(
       "Could not transpile tsconfig.json:\n" + error.stack
     );
   }
@@ -150,7 +150,7 @@ async function transpileProject(projectDir) {
       JSON.stringify(pkgJson, null, 2)
     );
   } catch (error) {
-    output.debug(
+    outputDebug(
       "Could not remove TS dependencies from package.json:\n" + error.stack
     );
   }
@@ -160,7 +160,7 @@ async function transpileProject(projectDir) {
     eslintrc = eslintrc.replace(/\/\*\*[\s*]+@type.+\s+\*\/\s?/gim, "").replace(/\s*,?\s*['"`]plugin:hydrogen\/typescript['"`]/gim, "").replace(/\s+['"`]@typescript-eslint\/.+,/gim, "");
     await fs.writeFile(eslintrcPath, eslintrc);
   } catch (error) {
-    output.debug(
+    outputDebug(
       "Could not remove TS rules from .eslintrc:\n" + error.stack
     );
   }

package/dist/lib/virtual-routes.test.d.ts

@@ -0,0 +1 @@
+

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

@@ -9,14 +9,6 @@ import { IconError } from "../components/IconError.jsx";
 import favicon from "../assets/favicon.svg";
 import interVariableFontWoff2 from "../assets/inter-variable-font.woff2";
 import jetbrainsmonoVariableFontWoff2 from "../assets/jetbrainsmono-variable-font.woff2";
-const meta = () => {
-  return {
-    title: "Hydrogen",
-    description: "A custom storefront powered by Hydrogen",
-    charset: "utf-8",
-    viewport: "width=device-width,initial-scale=1"
-  };
-};
 const links = () => [
   {
     rel: "icon",
@@ -43,9 +35,6 @@ async function loader({ context }) {
   return { layout };
 }
 const HYDROGEN_SHOP_ID = "gid://shopify/Shop/55145660472";
-function CatchBoundary() {
-  return <ErrorPage />;
-}
 function ErrorBoundary() {
   return <ErrorPage />;
 }
@@ -74,7 +63,7 @@ function Index() {
         <code>.env</code>
         {". Then, create your first route with the file"}
         {` `}
-        <code>/app/routes/index.jsx</code>
+        <code>/app/routes/_index.jsx</code>
         {". Learn more about"}
         {` `}
         <a target="_blank" rel="norefferer noopener" href="https://shopify.dev/docs/custom-storefronts/hydrogen/environment-variables">editing environment variables</a>
@@ -153,11 +142,9 @@ const LAYOUT_QUERY = `#graphql
   }
 `;
 export {
-  CatchBoundary,
   ErrorBoundary,
   HYDROGEN_SHOP_ID,
   Index as default,
   links,
-  loader,
-  meta
+  loader
 };

package/dist/virtual-routes/virtual-root.jsx

@@ -14,13 +14,13 @@ const links = () => {
     { rel: "icon", type: "image/svg+xml", href: favicon }
   ];
 };
-const meta = () => ({
-  charset: "utf-8",
-  viewport: "width=device-width,initial-scale=1"
-});
 function App() {
   return <html lang="en">
     <head>
+      <meta charSet="utf-8" />
+      <meta name="viewport" content="width=device-width,initial-scale=1" />
+      <title>Hydrogen</title>
+      <meta name="description" content="A custom storefront powered by Hydrogen" />
       <Meta />
       <Links />
     </head>
@@ -33,6 +33,5 @@ function App() {
 }
 export {
   App as default,
-  links,
-  meta
+  links
 };

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"4.0.9","commands":{"hydrogen:build":{"id":"hydrogen:build","description":"Builds a Hydrogen storefront for production.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"sourcemap":{"name":"sourcemap","type":"boolean","description":"Generate sourcemaps for the build.","allowNo":false},"disable-route-warning":{"name":"disable-route-warning","type":"boolean","description":"Disable warning about missing standard routes.","allowNo":false},"base":{"name":"base","type":"option","hidden":true,"multiple":false},"entry":{"name":"entry","type":"option","hidden":true,"multiple":false},"target":{"name":"target","type":"option","hidden":true,"multiple":false}},"args":[]},"hydrogen:check":{"id":"hydrogen:check","description":"Returns diagnostic information about a Hydrogen storefront.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[{"name":"resource","description":"The resource to check. Currently only 'routes' is supported.","required":true,"options":["routes"]}]},"hydrogen:dev":{"id":"hydrogen:dev","description":"Runs Hydrogen storefront in an Oxygen worker for development.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"port":{"name":"port","type":"option","description":"Port to run the server on.","multiple":false,"default":3000},"disable-virtual-routes":{"name":"disable-virtual-routes","type":"boolean","description":"Disable rendering fallback routes when a route file doesn't exist","allowNo":false},"host":{"name":"host","type":"option","hidden":true,"multiple":false}},"args":[]},"hydrogen:init":{"id":"hydrogen:init","description":"Creates a new Hydrogen storefront.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the new Hydrogen storefront.","multiple":false},"language":{"name":"language","type":"option","description":"Sets the template language to use. One of `js` or `ts`.","multiple":false},"template":{"name":"template","type":"option","description":"Sets the template to use. One of `demo-store` or `hello-world`.","multiple":false},"install-deps":{"name":"install-deps","type":"boolean","description":"Auto install dependencies using the active package manager","allowNo":true}},"args":[]},"hydrogen:preview":{"id":"hydrogen:preview","description":"Runs a Hydrogen storefront in an Oxygen worker for production.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"port":{"name":"port","type":"option","description":"Port to run the server on.","multiple":false,"default":3000}},"args":[]},"hydrogen:generate:route":{"id":"hydrogen:generate:route","description":"Generates a standard Shopify route.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"adapter":{"name":"adapter","type":"option","description":"Remix adapter used in the route. The default is `@shopify/remix-oxygen`.","multiple":false},"typescript":{"name":"typescript","type":"boolean","description":"Generate TypeScript files","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[{"name":"route","description":"The route to generate. One of home,page,cart,products,collections,policies,robots,sitemap,account,all.","required":true,"options":["home","page","cart","products","collections","policies","robots","sitemap","account","all"]}]},"hydrogen:generate:routes":{"id":"hydrogen:generate:routes","description":"Generates all supported standard shopify routes.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"adapter":{"name":"adapter","type":"option","description":"Remix adapter used in the route. The default is `@shopify/remix-oxygen`.","multiple":false},"typescript":{"name":"typescript","type":"boolean","description":"Generate TypeScript files","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[]}}}
+{"version":"4.1.0","commands":{"hydrogen:build":{"id":"hydrogen:build","description":"Builds a Hydrogen storefront for production.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"sourcemap":{"name":"sourcemap","type":"boolean","description":"Generate sourcemaps for the build.","allowNo":false},"disable-route-warning":{"name":"disable-route-warning","type":"boolean","description":"Disable warning about missing standard routes.","allowNo":false},"base":{"name":"base","type":"option","hidden":true,"multiple":false},"entry":{"name":"entry","type":"option","hidden":true,"multiple":false},"target":{"name":"target","type":"option","hidden":true,"multiple":false}},"args":[]},"hydrogen:check":{"id":"hydrogen:check","description":"Returns diagnostic information about a Hydrogen storefront.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[{"name":"resource","description":"The resource to check. Currently only 'routes' is supported.","required":true,"options":["routes"]}]},"hydrogen:dev":{"id":"hydrogen:dev","description":"Runs Hydrogen storefront in an Oxygen worker for development.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"port":{"name":"port","type":"option","description":"Port to run the server on.","multiple":false,"default":3000},"disable-virtual-routes":{"name":"disable-virtual-routes","type":"boolean","description":"Disable rendering fallback routes when a route file doesn't exist","allowNo":false},"host":{"name":"host","type":"option","hidden":true,"multiple":false}},"args":[]},"hydrogen:g":{"id":"hydrogen:g","description":"Shortcut for `hydrogen generate`. See `hydrogen generate --help` for more information.","strict":false,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","hidden":true,"aliases":[],"flags":{},"args":[]},"hydrogen:init":{"id":"hydrogen:init","description":"Creates a new Hydrogen storefront.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the new Hydrogen storefront.","multiple":false},"language":{"name":"language","type":"option","description":"Sets the template language to use. One of `js` or `ts`.","multiple":false},"template":{"name":"template","type":"option","description":"Sets the template to use. One of `demo-store` or `hello-world`.","multiple":false},"install-deps":{"name":"install-deps","type":"boolean","description":"Auto install dependencies using the active package manager","allowNo":true}},"args":[]},"hydrogen:preview":{"id":"hydrogen:preview","description":"Runs a Hydrogen storefront in an Oxygen worker for production.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false},"port":{"name":"port","type":"option","description":"Port to run the server on.","multiple":false,"default":3000}},"args":[]},"hydrogen:shortcut":{"id":"hydrogen:shortcut","description":"Creates a global `h2` shortcut for the Hydrogen CLI","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{},"args":[]},"hydrogen:generate:route":{"id":"hydrogen:generate:route","description":"Generates a standard Shopify route.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"adapter":{"name":"adapter","type":"option","description":"Remix adapter used in the route. The default is `@shopify/remix-oxygen`.","multiple":false},"typescript":{"name":"typescript","type":"boolean","description":"Generate TypeScript files","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[{"name":"route","description":"The route to generate. One of home,page,cart,products,collections,policies,robots,sitemap,account,all.","required":true,"options":["home","page","cart","products","collections","policies","robots","sitemap","account","all"]}]},"hydrogen:generate:routes":{"id":"hydrogen:generate:routes","description":"Generates all supported standard shopify routes.","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"adapter":{"name":"adapter","type":"option","description":"Remix adapter used in the route. The default is `@shopify/remix-oxygen`.","multiple":false},"typescript":{"name":"typescript","type":"boolean","description":"Generate TypeScript files","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite the destination directory and files if they already exist.","allowNo":false},"path":{"name":"path","type":"option","description":"The path to the directory of the Hydrogen storefront. The default is the current directory.","multiple":false}},"args":[]}}}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "4.0.9",
+  "version": "4.1.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
   "scripts": {
@@ -21,20 +21,21 @@
     "@types/prettier": "^2.7.2",
     "@types/recursive-readdir": "^2.2.1",
     "@types/tar-fs": "^2.0.1",
-    "oclif": "^3.4.2",
-    "vitest": "^0.28.1",
-    "tempy": "^3.0.0"
+    "oclif": "2.1.4",
+    "tempy": "^3.0.0",
+    "vitest": "^0.28.1"
   },
   "peerDependencies": {
-    "@remix-run/react": "^1.14.0",
-    "@shopify/hydrogen-react": "^2023.1.7",
-    "@shopify/remix-oxygen": "^1.0.4"
+    "@remix-run/react": "^1.15.0",
+    "@shopify/hydrogen-react": "^2023.1.8",
+    "@shopify/remix-oxygen": "^1.0.5"
   },
   "dependencies": {
-    "@oclif/core": "^1.20.4",
-    "@remix-run/dev": "^1.14.0",
-    "@shopify/cli-kit": "3.29.0",
+    "@oclif/core": "2.1.4",
+    "@remix-run/dev": "1.15.0",
+    "@shopify/cli-kit": "3.45.0",
     "@shopify/mini-oxygen": "^1.3.1",
+    "ansi-colors": "^4.1.3",
     "fast-glob": "^3.2.12",
     "fs-extra": "^10.1.0",
     "gunzip-maybe": "^1.4.2",

package/dist/utils/template-downloader.d.ts

@@ -1,11 +0,0 @@
-declare function getLatestReleaseDownloadUrl(): Promise<{
-    version: string;
-    url: string;
-}>;
-declare function downloadTarball(url: string, storageDir: string): Promise<void>;
-declare function getLatestTemplates(): Promise<{
-    version: string;
-    templatesDir: string;
-}>;
-
-export { downloadTarball, getLatestReleaseDownloadUrl, getLatestTemplates };