@shopify/cli-hydrogen 8.1.0 → 8.2.0

package/dist/lib/template-downloader.js

@@ -6,7 +6,7 @@ import { fetch } from '@shopify/cli-kit/node/http';
 import { parseGitHubRepositoryURL } from '@shopify/cli-kit/node/github';
 import { fileExists, mkdir, rmdir } from '@shopify/cli-kit/node/fs';
 import { AbortError } from '@shopify/cli-kit/node/error';
-import { getSkeletonSourceDir, getAssetsDir } from './build.js';
+import { isHydrogenMonorepo, getSkeletonSourceDir, getAssetsDir } from './build.js';
 import { joinPath } from '@shopify/cli-kit/node/path';
 import { downloadGitRepository } from '@shopify/cli-kit/node/git';
 
@@ -53,7 +53,7 @@ async function downloadMonorepoTarball(url, storageDir, signal) {
 async function downloadMonorepoTemplates({
   signal
 } = {}) {
-  if (process.env.LOCAL_DEV) {
+  if (isHydrogenMonorepo && process.env.FORCE_TEMPLATES_SOURCE !== "remote") {
     const templatesDir = path.dirname(getSkeletonSourceDir());
     return {
       version: "local",

package/dist/lib/transpile/morph/functions.js

@@ -53,8 +53,7 @@ function generateParameterDocumentation(functionNode, docNode) {
   paramTags.forEach((tag) => tag.remove());
   for (const param of params) {
     const paramType = sanitizeType(param.getTypeNode()?.getText());
-    if (!paramType)
-      continue;
+    if (!paramType) continue;
     const paramName = param.compilerNode.name?.getText();
     const isOptional = param.isOptional();
     const isRest = param.isRestParameter();
@@ -65,8 +64,7 @@ function generateParameterDocumentation(functionNode, docNode) {
       defaultValue = paramInitializer?.getText().replaceAll(/(\s|\t)*\n(\s|\t)*/g, " ");
     }
     let paramNameOut = paramName;
-    if (paramNameOut.match(/[{},]/))
-      paramNameOut = "";
+    if (paramNameOut.match(/[{},]/)) paramNameOut = "";
     if (paramNameOut && isOptional) {
       const defaultValueOut = defaultValue !== void 0 ? `=${defaultValue}` : "";
       paramNameOut = `[${paramNameOut}${defaultValueOut}]`;
@@ -82,8 +80,7 @@ function generateParameterDocumentation(functionNode, docNode) {
 function getOutputJsDocNodeOrCreate(functionNode, docNode) {
   if (docNode) {
     const funcNodeDocs = functionNode.getJsDocs();
-    if (funcNodeDocs.length)
-      return functionNode;
+    if (funcNodeDocs.length) return functionNode;
     getJsDocOrCreate(docNode);
     return docNode;
   }

package/dist/lib/transpile/morph/index.js

@@ -42,8 +42,7 @@ function transpileTsWithJSDocs(src, filepath, compilerOptions = {}) {
   sourceFile.getFunctions().forEach((node) => generateFunctionDocumentation(node));
   sourceFile.getVariableDeclarations().forEach((varDeclaration) => {
     const initializer = varDeclaration.getInitializerIfKind(SyntaxKind.ArrowFunction) || varDeclaration.getInitializerIfKind(SyntaxKind.FunctionExpression);
-    if (!initializer)
-      return void 0;
+    if (!initializer) return void 0;
     generateFunctionDocumentation(
       initializer,
       varDeclaration.getVariableStatement()
@@ -57,8 +56,7 @@ function transpileTsWithJSDocs(src, filepath, compilerOptions = {}) {
   let result = project.emitToMemory()?.getFiles()?.find(
     (file) => file.filePath.slice(0, -3) === sourceFile.getFilePath().slice(0, -3)
   )?.text;
-  if (!result)
-    throw new Error("Could not emit output to memory.");
+  if (!result) throw new Error("Could not emit output to memory.");
   result = restoreCode(result);
   result = generateTypeDefs(sourceFile, result);
   return result.replace(/^\s*\/\*[*\s]+\*\/$\n/gm, "\n").trim() + "\n";

package/dist/lib/transpile/morph/typedefs.js

@@ -94,8 +94,7 @@ function generateInterfaceDocumentation(interfaceNode) {
 function generateTypedefDocumentation(typeNode, sourceFile) {
   const name = typeNode.getName();
   let { type } = typeNode.getStructure();
-  if (typeof type !== "string")
-    return "";
+  if (typeof type !== "string") return "";
   type = sanitizeType(type);
   const dummyNode = sourceFile.addVariableStatement({
     declarations: [{ name: `__dummy${name}`, initializer: "null" }]
@@ -129,15 +128,13 @@ function getChildProperties(node) {
 }
 function generateObjectPropertyDocumentation(node, jsDoc, name = "", topLevelCall = true) {
   name = name || node.getName();
-  if (!topLevelCall)
-    name = `${name}.${node.getName()}`;
+  if (!topLevelCall) name = `${name}.${node.getName()}`;
   let propType = node.getTypeNode()?.getText()?.replace(/\n/g, "")?.replace(/\s/g, "");
   propType = sanitizeType(propType);
   const isOptional = node.hasQuestionToken() || node.getJsDocs()?.[0]?.getTags()?.some((tag) => tag.getTagName() === "optional");
   const existingPropDocs = node.getJsDocs()?.[0]?.getDescription() || "";
   const children = getChildProperties(node);
-  if (children.length)
-    propType = "Object";
+  if (children.length) propType = "Object";
   jsDoc.addTag({
     tagName: "property",
     text: `{${propType}} ${isOptional ? `[${name}]` : name} ${existingPropDocs}`

package/dist/lib/transpile/morph/utils.js

@@ -2,13 +2,11 @@ function getJsDocOrCreate(node) {
   return node.getJsDocs().at(-1) || node.addJsDoc({ description: "\n" });
 }
 function sanitizeType(str) {
-  if (!str)
-    return str;
+  if (!str) return str;
   const extractedClassFromTypeof = /{*typeof\s+([^(?:}|\s);]*)/gm.exec(
     str
   )?.[1];
-  if (!extractedClassFromTypeof)
-    return str;
+  if (!extractedClassFromTypeof) return str;
   return `Class<${extractedClassFromTypeof}>`;
 }
 

package/dist/lib/transpile/project.js

@@ -46,13 +46,14 @@ function convertConfigToJS(tsConfig, keepTypes = false) {
 async function transpileProject(projectDir, keepTypes = true) {
   const entries = await glob("**/*.+(ts|tsx)", {
     absolute: true,
-    cwd: projectDir
+    cwd: projectDir,
+    dot: true,
+    ignore: ["**/node_modules/**"]
   });
   const formatConfig = await getCodeFormatOptions();
   for (const entry of entries) {
     if (entry.endsWith(".d.ts")) {
-      if (!keepTypes)
-        await removeFile(entry);
+      if (!keepTypes) await removeFile(entry);
       continue;
     }
     const tsx = await readFile(entry);

package/oclif.manifest.json

@@ -76,7 +76,7 @@
           "type": "boolean"
         },
         "bundle-stats": {
-          "description": "[Classic Remix Compiler] Show a bundle size summary after building. Defaults to true, use `--no-bundle-stats` to disable.",
+          "description": "Show a bundle size summary after building. Defaults to true, use `--no-bundle-stats` to disable.",
           "name": "bundle-stats",
           "allowNo": true,
           "type": "boolean"
@@ -89,6 +89,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Builds a Hydrogen storefront for production. The client and app worker files are compiled to a `/dist` folder in your Hydrogen project directory.",
       "isESM": true,
       "relativePath": [
@@ -128,6 +129,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Checks whether your Hydrogen app includes a set of standard Shopify routes.",
       "isESM": true,
       "relativePath": [
@@ -181,6 +183,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Automatically generates GraphQL types for your project’s Storefront API queries.",
       "isESM": true,
       "relativePath": [
@@ -240,6 +243,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -295,6 +299,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Builds the app and runs the resulting code to profile the server startup time, watching for changes. This command can be used to [debug slow app startup times](https://shopify.dev/docs/custom-storefronts/hydrogen/debugging/cpu-startup) that cause failed deployments in Oxygen.\n\n  The profiling results are written to a `.cpuprofile` file that can be viewed with certain tools such as [Flame Chart Visualizer for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-js-profile-flame).",
       "isESM": true,
       "relativePath": [
@@ -373,11 +378,24 @@
         },
         "auth-bypass-token": {
           "description": "Generate an authentication bypass token, which can be used to perform end-to-end tests against the deployment.",
+          "env": "AUTH_BYPASS_TOKEN",
           "name": "auth-bypass-token",
           "required": false,
           "allowNo": false,
           "type": "boolean"
         },
+        "auth-bypass-token-duration": {
+          "dependsOn": [
+            "auth-bypass-token"
+          ],
+          "description": "Specify the duration (in hours) up to 12 hours for the authentication bypass token. Defaults to `2`",
+          "env": "AUTH_BYPASS_TOKEN_DURATION",
+          "name": "auth-bypass-token-duration",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "build-command": {
           "description": "Specify a build command to run before deploying. If not specified, `shopify hydrogen build` will be used.",
           "name": "build-command",
@@ -479,6 +497,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Builds and deploys your Hydrogen storefront to Oxygen. Requires an Oxygen deployment token to be set with the `--token` flag or an environment variable (`SHOPIFY_HYDROGEN_DEPLOYMENT_TOKEN`). If the storefront is [linked](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-link) then the Oxygen deployment token for the linked storefront will be used automatically.",
       "isESM": true,
       "relativePath": [
@@ -653,6 +672,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Runs a Hydrogen storefront in a local runtime that emulates an Oxygen worker for development.\n\n  If your project is [linked](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-link) to a Hydrogen storefront, then its environment variables will be loaded with the runtime.",
       "isESM": true,
       "relativePath": [
@@ -683,6 +703,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Lists all environments available on the linked Hydrogen storefront.",
       "isESM": true,
       "relativePath": [
@@ -744,6 +765,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Pulls environment variables from the linked Hydrogen storefront and writes them to an `.env` file.",
       "isESM": true,
       "relativePath": [
@@ -792,6 +814,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -814,6 +837,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": false,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -894,6 +918,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Generates a set of default routes from the starter template.",
       "isESM": true,
       "relativePath": [
@@ -956,6 +981,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -1016,6 +1042,14 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "styling": {
+          "description": "Sets the styling strategy to use. One of `tailwind`, `vanilla-extract`, `css-modules`, `postcss`, `none`.",
+          "env": "SHOPIFY_HYDROGEN_FLAG_STYLING",
+          "name": "styling",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "markets": {
           "description": "Sets the URL structure to support multiple markets. Must be one of: `subfolders`, `domains`, `subdomains`, `none`. Example: `--markets subfolders`.",
           "env": "SHOPIFY_HYDROGEN_FLAG_I18N",
@@ -1074,6 +1108,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Creates a new Hydrogen storefront.",
       "isESM": true,
       "relativePath": [
@@ -1120,6 +1155,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Links your local development environment to a remote Hydrogen storefront. You can link an unlimited number of development environments to a single Hydrogen storefront.\n\n  Linking to a Hydrogen storefront enables you to run [dev](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-dev) and automatically inject your linked Hydrogen storefront's environment variables directly into the server runtime.\n\n  After you run the `link` command, you can access the [env list](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-env-list), [env pull](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-env-pull), and [unlink](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-unlink) commands.",
       "isESM": true,
       "relativePath": [
@@ -1150,6 +1186,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Lists all remote Hydrogen storefronts available to link to your local development environment.",
       "isESM": true,
       "relativePath": [
@@ -1189,6 +1226,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Logs in to the specified shop and saves the shop domain to the project.",
       "isESM": true,
       "relativePath": [
@@ -1219,6 +1257,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Log out from the current shop.",
       "isESM": true,
       "relativePath": [
@@ -1372,6 +1411,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Runs a server in your local development environment that serves your Hydrogen app's production build. Requires running the [build](https://shopify.dev/docs/api/shopify-cli/hydrogen/hydrogen-build) command first.",
       "isESM": true,
       "relativePath": [
@@ -1432,6 +1472,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -1444,12 +1485,12 @@
       "aliases": [],
       "args": {
         "strategy": {
-          "description": "The CSS strategy to setup. One of tailwind,css-modules,vanilla-extract,postcss",
+          "description": "The CSS strategy to setup. One of tailwind,vanilla-extract,css-modules,postcss",
           "name": "strategy",
           "options": [
             "tailwind",
-            "css-modules",
             "vanilla-extract",
+            "css-modules",
             "postcss"
           ]
         }
@@ -1487,6 +1528,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Adds support for certain CSS strategies to your project.",
       "isESM": true,
       "relativePath": [
@@ -1528,6 +1570,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Adds support for multiple [markets](https://shopify.dev/docs/custom-storefronts/hydrogen/markets) to your project by using the URL structure.",
       "isESM": true,
       "relativePath": [
@@ -1559,6 +1602,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "isESM": true,
       "relativePath": [
         "dist",
@@ -1580,6 +1624,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Creates a global h2 shortcut for Shopify CLI using shell aliases.\n\n  The following shells are supported:\n\n  - Bash (using `~/.bashrc`)\n  - ZSH (using `~/.zshrc`)\n  - Fish (using `~/.config/fish/functions`)\n  - PowerShell (added to `$PROFILE`)\n\n  After the alias is created, you can call Shopify CLI from anywhere in your project using `h2 <command>`.",
       "isESM": true,
       "relativePath": [
@@ -1610,6 +1655,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Unlinks your local development environment from a remote Hydrogen storefront.",
       "isESM": true,
       "relativePath": [
@@ -1657,6 +1703,7 @@
       "pluginName": "@shopify/cli-hydrogen",
       "pluginType": "core",
       "strict": true,
+      "enableJsonFlag": false,
       "descriptionWithMarkdown": "Upgrade Hydrogen project dependencies, preview features, fixes and breaking changes. The command also generates an instruction file for each upgrade.",
       "isESM": true,
       "relativePath": [
@@ -1667,5 +1714,5 @@
       ]
     }
   },
-  "version": "8.1.0"
+  "version": "8.2.0"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "8.1.0",
+  "version": "8.2.0",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -12,13 +12,12 @@
     "dev": "tsup --watch ./src --watch ../../templates/skeleton",
     "typecheck": "tsc --noEmit",
     "generate:manifest": "node scripts/generate-manifest.mjs",
-    "test": "cross-env SHOPIFY_UNIT_TEST=1 vitest run --test-timeout=20000",
-    "test:watch": "cross-env SHOPIFY_UNIT_TEST=1 vitest --test-timeout=20000"
+    "test": "cross-env SHOPIFY_UNIT_TEST=1 vitest run --test-timeout=60000",
+    "test:watch": "cross-env SHOPIFY_UNIT_TEST=1 vitest --test-timeout=60000"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.9.2",
+    "@remix-run/dev": "^2.10.1",
     "@types/diff": "^5.0.2",
-    "@types/fs-extra": "^11.0.1",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/prettier": "^2.7.2",
     "@types/source-map-support": "^0.5.10",
@@ -35,13 +34,13 @@
   "dependencies": {
     "@ast-grep/napi": "0.11.0",
     "@oclif/core": "3.26.5",
-    "@shopify/cli-kit": "3.60.0",
+    "@shopify/cli-kit": "3.63.2",
     "@shopify/oxygen-cli": "4.4.9",
-    "@shopify/plugin-cloudflare": "3.60.0",
+    "@shopify/plugin-cloudflare": "3.63.2",
     "ansi-escapes": "^6.2.0",
+    "chokidar": "3.5.3",
     "cli-truncate": "^4.0.0",
     "diff": "^5.1.0",
-    "fs-extra": "^11.1.0",
     "get-port": "^7.0.0",
     "gunzip-maybe": "^1.4.2",
     "prettier": "^2.8.4",
@@ -53,14 +52,11 @@
     "ts-morph": "20.0.0",
     "use-resize-observer": "^9.1.0"
   },
-  "optionalDependencies": {
-    "@parcel/watcher": "^2.3.0"
-  },
   "peerDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
     "@remix-run/dev": "^2.1.0",
     "@shopify/hydrogen-codegen": "^0.3.1",
-    "@shopify/mini-oxygen": "^3.0.3",
+    "@shopify/mini-oxygen": "^3.0.4",
     "graphql-config": "^5.0.3",
     "vite": "^5.1.0"
   },

package/dist/assets/hydrogen/css-modules/package.json

@@ -1,6 +0,0 @@
-{
-  "comment": "Remix version is automatically updated by the CLI",
-  "dependencies": {
-    "@remix-run/css-bundle": "^1"
-  }
-}

package/dist/assets/hydrogen/postcss/package.json

@@ -1,10 +0,0 @@
-{
-  "browserslist": [
-    "defaults"
-  ],
-  "devDependencies": {
-    "postcss": "^8.4.21",
-    "postcss-import": "^15.1.0",
-    "postcss-preset-env": "^8.2.0"
-  }
-}

package/dist/assets/hydrogen/postcss/postcss.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  plugins: {
-    'postcss-import': {},
-    'postcss-preset-env': {
-      features: {'nesting-rules': false},
-    },
-  },
-};