@shopify/cli 3.65.1 → 3.65.3

package/dist/{ui-BXWWRIFS.js → ui-S7L55PBH.js}

@@ -17,7 +17,7 @@ import {
   renderText,
   renderTextPrompt,
   renderWarning
-} from "./chunk-EID6L4PR.js";
+} from "./chunk-T4Y7NDNJ.js";
 import "./chunk-JIJ65JT6.js";
 import "./chunk-UMWKJFTM.js";
 import "./chunk-GEN4RXTD.js";
@@ -54,4 +54,4 @@ export {
   renderTextPrompt,
   renderWarning
 };
-//# sourceMappingURL=ui-BXWWRIFS.js.map
+//# sourceMappingURL=ui-S7L55PBH.js.map

package/dist/{workerd-A5NCF6UA.js → workerd-OLKE7G4X.js}

@@ -10,19 +10,19 @@ import {
   importLocal,
   logRequestLine,
   setConstructors
-} from "./chunk-GDARYUPU.js";
-import "./chunk-YXPGPWR2.js";
+} from "./chunk-K7KD247K.js";
+import "./chunk-U2PN6QZ2.js";
 import "./chunk-NPH2SXRO.js";
 import "./chunk-EJITPGUJ.js";
-import "./chunk-EZ5DG73H.js";
-import "./chunk-F2Y7KYHZ.js";
-import "./chunk-3REVOIEW.js";
+import "./chunk-PEAIOYXD.js";
+import "./chunk-EIUQV76I.js";
+import "./chunk-UBCH575K.js";
 import "./chunk-DL3MKXVR.js";
-import "./chunk-ZXJU6UP4.js";
-import "./chunk-CFFAWVDL.js";
+import "./chunk-O3JOUAA5.js";
+import "./chunk-N3YORLAS.js";
 import "./chunk-FMKVOTQK.js";
-import "./chunk-TDWX3KIR.js";
-import "./chunk-J7BYFGNJ.js";
+import "./chunk-3LDWVYMD.js";
+import "./chunk-3GSKXZGY.js";
 import "./chunk-PRJ3U7MR.js";
 import {
   AbortError,
@@ -31,7 +31,7 @@ import {
   readFile,
   renderSuccess,
   source_default
-} from "./chunk-EID6L4PR.js";
+} from "./chunk-T4Y7NDNJ.js";
 import "./chunk-JIJ65JT6.js";
 import "./chunk-UMWKJFTM.js";
 import "./chunk-GEN4RXTD.js";
@@ -54,7 +54,7 @@ import {
   init_cjs_shims
 } from "./chunk-ZPL24Y2D.js";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.3.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/mini-oxygen/workerd.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@8.4.0_@graphql-codegen+cli@5.0.2_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/mini-oxygen/workerd.js
 init_cjs_shims();
 import { createRequire } from "node:module";
 async function startWorkerdServer({
@@ -191,4 +191,4 @@ async function startWorkerdServer({
 export {
   startWorkerdServer
 };
-//# sourceMappingURL=workerd-A5NCF6UA.js.map
+//# sourceMappingURL=workerd-OLKE7G4X.js.map

package/oclif.manifest.json

@@ -2714,6 +2714,14 @@
           "required": false,
           "type": "option"
         },
+        "diff": {
+          "allowNo": false,
+          "description": "Applies the current files on top of Hydrogen's starter template in a temporary directory.",
+          "hidden": true,
+          "name": "diff",
+          "required": false,
+          "type": "boolean"
+        },
         "force-sfapi-version": {
           "description": "Force generating Storefront API types for a specific version instead of using the one provided in Hydrogen. A token can also be provided with this format: `<version>:<token>`.",
           "hasDynamicHelp": false,
@@ -3153,6 +3161,15 @@
           "name": "env-branch",
           "type": "option"
         },
+        "env-file": {
+          "default": ".env",
+          "description": "Path to an environment file to override existing environment variables. Defaults to the '.env' located in your project path `--path`.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "name": "env-file",
+          "required": false,
+          "type": "option"
+        },
         "host": {
           "allowNo": false,
           "description": "Expose the server to the local network",
@@ -3282,6 +3299,15 @@
           "name": "env-branch",
           "type": "option"
         },
+        "env-file": {
+          "default": ".env",
+          "description": "Path to an environment file to override existing environment variables. Defaults to the '.env' located in your project path `--path`.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "name": "env-file",
+          "required": false,
+          "type": "option"
+        },
         "force": {
           "allowNo": false,
           "char": "f",
@@ -3328,10 +3354,12 @@
           "type": "option"
         },
         "env-file": {
-          "description": "Path to an environment file to override existing environment variables for the selected environment. Defaults to the '.env' located in your project path `--path`.",
+          "default": ".env",
+          "description": "Path to an environment file to override existing environment variables. Defaults to the '.env' located in your project path `--path`.",
           "hasDynamicHelp": false,
           "multiple": false,
           "name": "env-file",
+          "required": false,
           "type": "option"
         },
         "path": {
@@ -3857,6 +3885,15 @@
           "name": "env-branch",
           "type": "option"
         },
+        "env-file": {
+          "default": ".env",
+          "description": "Path to an environment file to override existing environment variables. Defaults to the '.env' located in your project path `--path`.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "name": "env-file",
+          "required": false,
+          "type": "option"
+        },
         "inspector-port": {
           "description": "The port where the inspector is available. Defaults to 9229.",
           "env": "SHOPIFY_HYDROGEN_FLAG_INSPECTOR_PORT",
@@ -6536,5 +6573,5 @@
       "summary": "Trigger delivery of a sample webhook topic payload to a designated address."
     }
   },
-  "version": "3.65.1"
+  "version": "3.65.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopify/cli",
-  "version": "3.65.1",
+  "version": "3.65.3",
   "private": false,
   "description": "A CLI tool to build for the Shopify platform",
   "keywords": [
@@ -92,12 +92,12 @@
     "@oclif/core": "3.26.5",
     "@oclif/plugin-commands": "3.3.2",
     "@oclif/plugin-plugins": "5.1.2",
-    "@shopify/app": "3.65.1",
-    "@shopify/cli-kit": "3.65.1",
-    "@shopify/plugin-cloudflare": "3.65.1",
-    "@shopify/plugin-did-you-mean": "3.65.1",
-    "@shopify/theme": "3.65.1",
-    "@shopify/cli-hydrogen": "8.3.0",
+    "@shopify/app": "3.65.3",
+    "@shopify/cli-kit": "3.65.3",
+    "@shopify/plugin-cloudflare": "3.65.3",
+    "@shopify/plugin-did-you-mean": "3.65.3",
+    "@shopify/theme": "3.65.3",
+    "@shopify/cli-hydrogen": "8.4.0",
     "@types/node": "18.19.3",
     "@vitest/coverage-istanbul": "^1.6.0",
     "esbuild-plugin-copy": "^2.1.1",

package/dist/assets/hydrogen/starter/app/components/Search.tsx

@@ -1,514 +0,0 @@
-import {
-  Link,
-  Form,
-  useParams,
-  useFetcher,
-  type FormProps,
-} from '@remix-run/react';
-import {Image, Money, Pagination} from '@shopify/hydrogen';
-import React, {useRef, useEffect} from 'react';
-import {applyTrackingParams} from '~/lib/search';
-
-import type {
-  PredictiveProductFragment,
-  PredictiveCollectionFragment,
-  PredictiveArticleFragment,
-  SearchQuery,
-} from 'storefrontapi.generated';
-
-import type {PredictiveSearchAPILoader} from '../routes/api.predictive-search';
-
-type PredicticeSearchResultItemImage =
-  | PredictiveCollectionFragment['image']
-  | PredictiveArticleFragment['image']
-  | PredictiveProductFragment['variants']['nodes'][0]['image'];
-
-type PredictiveSearchResultItemPrice =
-  | PredictiveProductFragment['variants']['nodes'][0]['price'];
-
-export type NormalizedPredictiveSearchResultItem = {
-  __typename: string | undefined;
-  handle: string;
-  id: string;
-  image?: PredicticeSearchResultItemImage;
-  price?: PredictiveSearchResultItemPrice;
-  styledTitle?: string;
-  title: string;
-  url: string;
-};
-
-export type NormalizedPredictiveSearchResults = Array<
-  | {type: 'queries'; items: Array<NormalizedPredictiveSearchResultItem>}
-  | {type: 'products'; items: Array<NormalizedPredictiveSearchResultItem>}
-  | {type: 'collections'; items: Array<NormalizedPredictiveSearchResultItem>}
-  | {type: 'pages'; items: Array<NormalizedPredictiveSearchResultItem>}
-  | {type: 'articles'; items: Array<NormalizedPredictiveSearchResultItem>}
->;
-
-export type NormalizedPredictiveSearch = {
-  results: NormalizedPredictiveSearchResults;
-  totalResults: number;
-};
-
-type FetchSearchResultsReturn = {
-  searchResults: {
-    results: SearchQuery | null;
-    totalResults: number;
-  };
-  searchTerm: string;
-};
-
-export const NO_PREDICTIVE_SEARCH_RESULTS: NormalizedPredictiveSearchResults = [
-  {type: 'queries', items: []},
-  {type: 'products', items: []},
-  {type: 'collections', items: []},
-  {type: 'pages', items: []},
-  {type: 'articles', items: []},
-];
-
-export function SearchForm({searchTerm}: {searchTerm: string}) {
-  const inputRef = useRef<HTMLInputElement | null>(null);
-
-  // focus the input when cmd+k is pressed
-  useEffect(() => {
-    function handleKeyDown(event: KeyboardEvent) {
-      if (event.key === 'k' && event.metaKey) {
-        event.preventDefault();
-        inputRef.current?.focus();
-      }
-
-      if (event.key === 'Escape') {
-        inputRef.current?.blur();
-      }
-    }
-
-    document.addEventListener('keydown', handleKeyDown);
-
-    return () => {
-      document.removeEventListener('keydown', handleKeyDown);
-    };
-  }, []);
-
-  return (
-    <Form method="get">
-      <input
-        defaultValue={searchTerm}
-        name="q"
-        placeholder="Search…"
-        ref={inputRef}
-        type="search"
-      />
-      &nbsp;
-      <button type="submit">Search</button>
-    </Form>
-  );
-}
-
-export function SearchResults({
-  results,
-  searchTerm,
-}: Pick<FetchSearchResultsReturn['searchResults'], 'results'> & {
-  searchTerm: string;
-}) {
-  if (!results) {
-    return null;
-  }
-  const keys = Object.keys(results) as Array<keyof typeof results>;
-  return (
-    <div>
-      {results &&
-        keys.map((type) => {
-          const resourceResults = results[type];
-
-          if (resourceResults.nodes[0]?.__typename === 'Page') {
-            const pageResults = resourceResults as SearchQuery['pages'];
-            return resourceResults.nodes.length ? (
-              <SearchResultPageGrid key="pages" pages={pageResults} />
-            ) : null;
-          }
-
-          if (resourceResults.nodes[0]?.__typename === 'Product') {
-            const productResults = resourceResults as SearchQuery['products'];
-            return resourceResults.nodes.length ? (
-              <SearchResultsProductsGrid
-                key="products"
-                products={productResults}
-                searchTerm={searchTerm}
-              />
-            ) : null;
-          }
-
-          if (resourceResults.nodes[0]?.__typename === 'Article') {
-            const articleResults = resourceResults as SearchQuery['articles'];
-            return resourceResults.nodes.length ? (
-              <SearchResultArticleGrid
-                key="articles"
-                articles={articleResults}
-              />
-            ) : null;
-          }
-
-          return null;
-        })}
-    </div>
-  );
-}
-
-function SearchResultsProductsGrid({
-  products,
-  searchTerm,
-}: Pick<SearchQuery, 'products'> & {searchTerm: string}) {
-  return (
-    <div className="search-result">
-      <h2>Products</h2>
-      <Pagination connection={products}>
-        {({nodes, isLoading, NextLink, PreviousLink}) => {
-          const ItemsMarkup = nodes.map((product) => {
-            const trackingParams = applyTrackingParams(
-              product,
-              `q=${encodeURIComponent(searchTerm)}`,
-            );
-
-            return (
-              <div className="search-results-item" key={product.id}>
-                <Link
-                  prefetch="intent"
-                  to={`/products/${product.handle}${trackingParams}`}
-                >
-                  {product.variants.nodes[0].image && (
-                    <Image
-                      data={product.variants.nodes[0].image}
-                      alt={product.title}
-                      width={50}
-                    />
-                  )}
-                  <div>
-                    <p>{product.title}</p>
-                    <small>
-                      <Money data={product.variants.nodes[0].price} />
-                    </small>
-                  </div>
-                </Link>
-              </div>
-            );
-          });
-          return (
-            <div>
-              <div>
-                <PreviousLink>
-                  {isLoading ? 'Loading...' : <span>↑ Load previous</span>}
-                </PreviousLink>
-              </div>
-              <div>
-                {ItemsMarkup}
-                <br />
-              </div>
-              <div>
-                <NextLink>
-                  {isLoading ? 'Loading...' : <span>Load more ↓</span>}
-                </NextLink>
-              </div>
-            </div>
-          );
-        }}
-      </Pagination>
-      <br />
-    </div>
-  );
-}
-
-function SearchResultPageGrid({pages}: Pick<SearchQuery, 'pages'>) {
-  return (
-    <div className="search-result">
-      <h2>Pages</h2>
-      <div>
-        {pages?.nodes?.map((page) => (
-          <div className="search-results-item" key={page.id}>
-            <Link prefetch="intent" to={`/pages/${page.handle}`}>
-              {page.title}
-            </Link>
-          </div>
-        ))}
-      </div>
-      <br />
-    </div>
-  );
-}
-
-function SearchResultArticleGrid({articles}: Pick<SearchQuery, 'articles'>) {
-  return (
-    <div className="search-result">
-      <h2>Articles</h2>
-      <div>
-        {articles?.nodes?.map((article) => (
-          <div className="search-results-item" key={article.id}>
-            <Link prefetch="intent" to={`/blogs/${article.handle}`}>
-              {article.title}
-            </Link>
-          </div>
-        ))}
-      </div>
-      <br />
-    </div>
-  );
-}
-
-export function NoSearchResults() {
-  return <p>No results, try a different search.</p>;
-}
-
-type ChildrenRenderProps = {
-  fetchResults: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  fetcher: ReturnType<typeof useFetcher<PredictiveSearchAPILoader>>;
-  inputRef: React.MutableRefObject<HTMLInputElement | null>;
-};
-
-type SearchFromProps = {
-  action?: FormProps['action'];
-  className?: string;
-  children: (passedProps: ChildrenRenderProps) => React.ReactNode;
-  [key: string]: unknown;
-};
-
-/**
- *  Search form component that sends search requests to the `/search` route
- **/
-export function PredictiveSearchForm({
-  action,
-  children,
-  className = 'predictive-search-form',
-  ...props
-}: SearchFromProps) {
-  const params = useParams();
-  const fetcher = useFetcher<PredictiveSearchAPILoader>({
-    key: 'search',
-  });
-  const inputRef = useRef<HTMLInputElement | null>(null);
-
-  function fetchResults(event: React.ChangeEvent<HTMLInputElement>) {
-    const searchAction = action ?? '/api/predictive-search';
-    const newSearchTerm = event.target.value || '';
-    const localizedAction = params.locale
-      ? `/${params.locale}${searchAction}`
-      : searchAction;
-
-    fetcher.submit(
-      {q: newSearchTerm, limit: '6'},
-      {method: 'GET', action: localizedAction},
-    );
-  }
-
-  // ensure the passed input has a type of search, because SearchResults
-  // will select the element based on the input
-  useEffect(() => {
-    inputRef?.current?.setAttribute('type', 'search');
-  }, []);
-
-  return (
-    <fetcher.Form
-      {...props}
-      className={className}
-      onSubmit={(event) => {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!inputRef?.current || inputRef.current.value === '') {
-          return;
-        }
-        inputRef.current.blur();
-      }}
-    >
-      {children({fetchResults, inputRef, fetcher})}
-    </fetcher.Form>
-  );
-}
-
-export function PredictiveSearchResults() {
-  const {results, totalResults, searchInputRef, searchTerm, state} =
-    usePredictiveSearch();
-
-  function goToSearchResult(event: React.MouseEvent<HTMLAnchorElement>) {
-    if (!searchInputRef.current) return;
-    searchInputRef.current.blur();
-    searchInputRef.current.value = '';
-    // close the aside
-    window.location.href = event.currentTarget.href;
-  }
-
-  if (state === 'loading') {
-    return <div>Loading...</div>;
-  }
-
-  if (!totalResults) {
-    return <NoPredictiveSearchResults searchTerm={searchTerm} />;
-  }
-
-  return (
-    <div className="predictive-search-results">
-      <div>
-        {results.map(({type, items}) => (
-          <PredictiveSearchResult
-            goToSearchResult={goToSearchResult}
-            items={items}
-            key={type}
-            searchTerm={searchTerm}
-            type={type}
-          />
-        ))}
-      </div>
-      {searchTerm.current && (
-        <Link onClick={goToSearchResult} to={`/search?q=${searchTerm.current}`}>
-          <p>
-            View all results for <q>{searchTerm.current}</q>
-            &nbsp; →
-          </p>
-        </Link>
-      )}
-    </div>
-  );
-}
-
-function NoPredictiveSearchResults({
-  searchTerm,
-}: {
-  searchTerm: React.MutableRefObject<string>;
-}) {
-  if (!searchTerm.current) {
-    return null;
-  }
-  return (
-    <p>
-      No results found for <q>{searchTerm.current}</q>
-    </p>
-  );
-}
-
-type SearchResultTypeProps = {
-  goToSearchResult: (event: React.MouseEvent<HTMLAnchorElement>) => void;
-  items: NormalizedPredictiveSearchResultItem[];
-  searchTerm: UseSearchReturn['searchTerm'];
-  type: NormalizedPredictiveSearchResults[number]['type'];
-};
-
-function PredictiveSearchResult({
-  goToSearchResult,
-  items,
-  searchTerm,
-  type,
-}: SearchResultTypeProps) {
-  const isSuggestions = type === 'queries';
-  const categoryUrl = `/search?q=${
-    searchTerm.current
-  }&type=${pluralToSingularSearchType(type)}`;
-
-  return (
-    <div className="predictive-search-result" key={type}>
-      <Link prefetch="intent" to={categoryUrl} onClick={goToSearchResult}>
-        <h5>{isSuggestions ? 'Suggestions' : type}</h5>
-      </Link>
-      <ul>
-        {items.map((item: NormalizedPredictiveSearchResultItem) => (
-          <SearchResultItem
-            goToSearchResult={goToSearchResult}
-            item={item}
-            key={item.id}
-          />
-        ))}
-      </ul>
-    </div>
-  );
-}
-
-type SearchResultItemProps = Pick<SearchResultTypeProps, 'goToSearchResult'> & {
-  item: NormalizedPredictiveSearchResultItem;
-};
-
-function SearchResultItem({goToSearchResult, item}: SearchResultItemProps) {
-  return (
-    <li className="predictive-search-result-item" key={item.id}>
-      <Link onClick={goToSearchResult} to={item.url}>
-        {item.image?.url && (
-          <Image
-            alt={item.image.altText ?? ''}
-            src={item.image.url}
-            width={50}
-            height={50}
-          />
-        )}
-        <div>
-          {item.styledTitle ? (
-            <div
-              dangerouslySetInnerHTML={{
-                __html: item.styledTitle,
-              }}
-            />
-          ) : (
-            <span>{item.title}</span>
-          )}
-          {item?.price && (
-            <small>
-              <Money data={item.price} />
-            </small>
-          )}
-        </div>
-      </Link>
-    </li>
-  );
-}
-
-type UseSearchReturn = NormalizedPredictiveSearch & {
-  searchInputRef: React.MutableRefObject<HTMLInputElement | null>;
-  searchTerm: React.MutableRefObject<string>;
-  state: ReturnType<typeof useFetcher<PredictiveSearchAPILoader>>['state'];
-};
-
-function usePredictiveSearch(): UseSearchReturn {
-  const searchFetcher = useFetcher<FetchSearchResultsReturn>({key: 'search'});
-  const searchTerm = useRef<string>('');
-  const searchInputRef = useRef<HTMLInputElement | null>(null);
-
-  if (searchFetcher?.state === 'loading') {
-    searchTerm.current = (searchFetcher.formData?.get('q') || '') as string;
-  }
-
-  const search = (searchFetcher?.data?.searchResults || {
-    results: NO_PREDICTIVE_SEARCH_RESULTS,
-    totalResults: 0,
-  }) as NormalizedPredictiveSearch;
-
-  // capture the search input element as a ref
-  useEffect(() => {
-    if (searchInputRef.current) return;
-    searchInputRef.current = document.querySelector('input[type="search"]');
-  }, []);
-
-  return {...search, searchInputRef, searchTerm, state: searchFetcher.state};
-}
-
-/**
- * Converts a plural search type to a singular search type
- *
- * @example
- * ```js
- * pluralToSingularSearchType('articles'); // => 'ARTICLE'
- * pluralToSingularSearchType(['articles', 'products']); // => 'ARTICLE,PRODUCT'
- * ```
- */
-function pluralToSingularSearchType(
-  type:
-    | NormalizedPredictiveSearchResults[number]['type']
-    | Array<NormalizedPredictiveSearchResults[number]['type']>,
-) {
-  const plural = {
-    articles: 'ARTICLE',
-    collections: 'COLLECTION',
-    pages: 'PAGE',
-    products: 'PRODUCT',
-    queries: 'QUERY',
-  };
-
-  if (typeof type === 'string') {
-    return plural[type];
-  }
-
-  return type.map((t) => plural[t]).join(',');
-}