@shopify/cli 3.75.1 → 3.75.2

package/dist/assets/hydrogen/starter/app/routes/collections.$handle.tsx

@@ -1,4 +1,4 @@
-import {defer, redirect, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {redirect, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {useLoaderData, Link, type MetaFunction} from '@remix-run/react';
 import {
   getPaginationVariables,
@@ -21,7 +21,7 @@ export async function loader(args: LoaderFunctionArgs) {
   // Await the critical data required to render initial state of the page
   const criticalData = await loadCriticalData(args);
 
-  return defer({...deferredData, ...criticalData});
+  return {...deferredData, ...criticalData};
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/collections._index.tsx

@@ -1,5 +1,5 @@
 import {useLoaderData, Link} from '@remix-run/react';
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {getPaginationVariables, Image} from '@shopify/hydrogen';
 import type {CollectionFragment} from 'storefrontapi.generated';
 import {PaginatedResourceSection} from '~/components/PaginatedResourceSection';
@@ -11,7 +11,7 @@ export async function loader(args: LoaderFunctionArgs) {
   // Await the critical data required to render initial state of the page
   const criticalData = await loadCriticalData(args);
 
-  return defer({...deferredData, ...criticalData});
+  return {...deferredData, ...criticalData};
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/collections.all.tsx

@@ -1,4 +1,4 @@
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {useLoaderData, Link, type MetaFunction} from '@remix-run/react';
 import {getPaginationVariables, Image, Money} from '@shopify/hydrogen';
 import type {ProductItemFragment} from 'storefrontapi.generated';
@@ -16,7 +16,7 @@ export async function loader(args: LoaderFunctionArgs) {
   // Await the critical data required to render initial state of the page
   const criticalData = await loadCriticalData(args);
 
-  return defer({...deferredData, ...criticalData});
+  return {...deferredData, ...criticalData};
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/pages.$handle.tsx

@@ -1,4 +1,4 @@
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {useLoaderData, type MetaFunction} from '@remix-run/react';
 
 export const meta: MetaFunction<typeof loader> = ({data}) => {
@@ -12,7 +12,7 @@ export async function loader(args: LoaderFunctionArgs) {
   // Await the critical data required to render initial state of the page
   const criticalData = await loadCriticalData(args);
 
-  return defer({...deferredData, ...criticalData});
+  return {...deferredData, ...criticalData};
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/policies.$handle.tsx

@@ -1,4 +1,4 @@
-import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {Link, useLoaderData, type MetaFunction} from '@remix-run/react';
 import {type Shop} from '@shopify/hydrogen/storefront-api-types';
 
@@ -38,7 +38,7 @@ export async function loader({params, context}: LoaderFunctionArgs) {
     throw new Response('Could not find the policy', {status: 404});
   }
 
-  return json({policy});
+  return {policy};
 }
 
 export default function Policy() {

package/dist/assets/hydrogen/starter/app/routes/policies._index.tsx

@@ -1,4 +1,4 @@
-import {json, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {useLoaderData, Link} from '@remix-run/react';
 
 export async function loader({context}: LoaderFunctionArgs) {
@@ -9,7 +9,7 @@ export async function loader({context}: LoaderFunctionArgs) {
     throw new Response('No policies found', {status: 404});
   }
 
-  return json({policies});
+  return {policies};
 }
 
 export default function Policies() {

package/dist/assets/hydrogen/starter/app/routes/products.$handle.tsx

@@ -1,4 +1,4 @@
-import {defer, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
+import {type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import {useLoaderData, type MetaFunction} from '@remix-run/react';
 import {
   getSelectedProductOptions,
@@ -29,7 +29,7 @@ export async function loader(args: LoaderFunctionArgs) {
   // Await the critical data required to render initial state of the page
   const criticalData = await loadCriticalData(args);
 
-  return defer({...deferredData, ...criticalData});
+  return {...deferredData, ...criticalData};
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/search.tsx

@@ -1,5 +1,4 @@
 import {
-  json,
   type LoaderFunctionArgs,
   type ActionFunctionArgs,
 } from '@shopify/remix-oxygen';
@@ -29,7 +28,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     return {term: '', result: null, error: error.message};
   });
 
-  return json(await searchPromise);
+  return await searchPromise;
 }
 
 /**

package/dist/assets/hydrogen/starter/eslint.config.js

@@ -0,0 +1,261 @@
+import {fixupConfigRules, fixupPluginRules} from '@eslint/compat';
+import eslintComments from 'eslint-plugin-eslint-comments';
+import react from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+import jsxA11Y from 'eslint-plugin-jsx-a11y';
+import globals from 'globals';
+import typescriptEslint from '@typescript-eslint/eslint-plugin';
+import _import from 'eslint-plugin-import';
+import tsParser from '@typescript-eslint/parser';
+import jest from 'eslint-plugin-jest';
+import path from 'node:path';
+import {fileURLToPath} from 'node:url';
+import js from '@eslint/js';
+import {FlatCompat} from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  {
+    ignores: [
+      '**/node_modules/',
+      '**/build/',
+      '**/*.graphql.d.ts',
+      '**/*.graphql.ts',
+      '**/*.generated.d.ts',
+    ],
+  },
+  ...fixupConfigRules(
+    compat.extends(
+      'eslint:recommended',
+      'plugin:eslint-comments/recommended',
+      'plugin:react/recommended',
+      'plugin:react-hooks/recommended',
+      'plugin:jsx-a11y/recommended',
+    ),
+  ),
+  {
+    plugins: {
+      'eslint-comments': fixupPluginRules(eslintComments),
+      react: fixupPluginRules(react),
+      'react-hooks': fixupPluginRules(reactHooks),
+      'jsx-a11y': fixupPluginRules(jsxA11Y),
+    },
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+    rules: {
+      'eslint-comments/no-unused-disable': 'error',
+      'no-console': [
+        'warn',
+        {
+          allow: ['warn', 'error'],
+        },
+      ],
+      'no-use-before-define': 'off',
+      'no-warning-comments': 'off',
+      'object-shorthand': [
+        'error',
+        'always',
+        {
+          avoidQuotes: true,
+        },
+      ],
+      'no-useless-escape': 'off',
+      'no-case-declarations': 'off',
+    },
+  },
+  ...fixupConfigRules(
+    compat.extends(
+      'plugin:react/recommended',
+      'plugin:react/jsx-runtime',
+      'plugin:react-hooks/recommended',
+      'plugin:jsx-a11y/recommended',
+    ),
+  ).map((config) => ({
+    ...config,
+    files: ['**/*.{js,jsx,ts,tsx}'],
+  })),
+  {
+    files: ['**/*.{js,jsx,ts,tsx}'],
+    plugins: {
+      react: fixupPluginRules(react),
+      'jsx-a11y': fixupPluginRules(jsxA11Y),
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+      formComponents: ['Form'],
+      linkComponents: [
+        {
+          name: 'Link',
+          linkAttribute: 'to',
+        },
+        {
+          name: 'NavLink',
+          linkAttribute: 'to',
+        },
+      ],
+      'import/resolver': {
+        typescript: {},
+      },
+    },
+    rules: {
+      'jsx-a11y/control-has-associated-label': 'off',
+      'jsx-a11y/label-has-for': 'off',
+      'react/display-name': 'off',
+      'react/no-array-index-key': 'warn',
+      'react/prop-types': 'off',
+      'react/react-in-jsx-scope': 'off',
+    },
+  },
+  ...fixupConfigRules(
+    compat.extends(
+      'plugin:@typescript-eslint/recommended',
+      'plugin:import/recommended',
+      'plugin:import/typescript',
+    ),
+  ).map((config) => ({
+    ...config,
+    files: ['**/*.{ts,tsx}'],
+  })),
+  {
+    files: ['**/*.{ts,tsx}'],
+    plugins: {
+      '@typescript-eslint': fixupPluginRules(typescriptEslint),
+      import: fixupPluginRules(_import),
+    },
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        projectService: {
+          allowDefaultProject: ['.graphqlrc.ts'],
+        },
+        tsconfigRootDir: __dirname,
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+    settings: {
+      'import/internal-regex': '^~/',
+      'import/resolvers': {
+        node: {
+          extensions: ['.ts', '.tsx'],
+        },
+        typescript: {
+          alwaysTryTypes: true,
+          project: __dirname,
+        },
+      },
+    },
+    rules: {
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/naming-convention': 'off',
+      '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
+    },
+  },
+  {
+    files: ['**/.eslintrc.cjs'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+  ...compat.extends('plugin:jest/recommended').map((config) => ({
+    ...config,
+    files: ['**/*.test.*'],
+  })),
+  {
+    files: ['**/*.test.*'],
+    plugins: {
+      jest,
+    },
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+    },
+  },
+  {
+    files: ['**/*.server.*'],
+    rules: {
+      'react-hooks/rules-of-hooks': 'off',
+    },
+  },
+  ...fixupConfigRules(
+    compat.extends(
+      'plugin:@typescript-eslint/eslint-recommended',
+      'plugin:@typescript-eslint/recommended',
+    ),
+  ).map((config) => ({
+    ...config,
+    files: ['**/*.ts', '**/*.tsx'],
+  })),
+  {
+    files: ['**/*.ts', '**/*.tsx'],
+    languageOptions: {
+      parser: tsParser,
+    },
+    rules: {
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/naming-convention': [
+        'error',
+        {
+          selector: 'default',
+          format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
+          leadingUnderscore: 'allowSingleOrDouble',
+          trailingUnderscore: 'allowSingleOrDouble',
+        },
+        {
+          selector: 'typeLike',
+          format: ['PascalCase'],
+        },
+        {
+          selector: 'typeParameter',
+          format: ['PascalCase'],
+          leadingUnderscore: 'allow',
+        },
+        {
+          selector: 'interface',
+          format: ['PascalCase'],
+        },
+        {
+          selector: 'property',
+          format: null,
+        },
+      ],
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-empty-interface': 'off',
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      'react/prop-types': 'off',
+    },
+  },
+];

package/dist/assets/hydrogen/starter/guides/predictiveSearch/predictiveSearch.md

@@ -194,7 +194,7 @@ async function predictiveSearch({
 
   const total = Object.values(items).reduce((acc, {length}) => acc + length, 0);
 
-  return json({term, result: {items, total}, error: null});
+  return {term, result: {items, total}, error: null};
 }
 ```
 
@@ -217,7 +217,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
   const isPredictive = url.searchParams.has('predictive');
 
   if (!isPredictive) {
-    return json({})
+    return {}
   }
 
   const searchPromise = predictiveSearch({request, context})
@@ -227,7 +227,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     return {term: '', result: null, error: error.message};
   });
 
-  return json(await searchPromise);
+  return await searchPromise;
 }
 ```
 

package/dist/assets/hydrogen/starter/guides/search/search.md

@@ -191,7 +191,7 @@ async function search({
     return acc + nodes.length;
   }, 0);
 
-  return json({term, result: {total, items}});
+  return {term, result: {total, items}};
 }
 ```
 
@@ -212,7 +212,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
   const isRegular = !url.searchParams.has('predictive');
 
   if (!isRegular) {
-    return json({})
+    return {}
   }
 
   const searchPromise = regularSearch({request, context});
@@ -222,7 +222,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     return {term: '', result: null, error: error.message};
   });
 
-  return json(await searchPromise);
+  return await searchPromise;
 }
 ```
 

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

@@ -2,43 +2,55 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "2025.1.0",
+  "version": "2025.1.1",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
     "dev": "shopify hydrogen dev --codegen",
     "preview": "shopify hydrogen preview --build",
-    "lint": "eslint --no-error-on-unmatched-pattern --ext .js,.ts,.jsx,.tsx .",
+    "lint": "eslint --no-error-on-unmatched-pattern .",
     "typecheck": "tsc --noEmit",
     "codegen": "shopify hydrogen codegen"
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@remix-run/react": "^2.15.2",
-    "@remix-run/server-runtime": "^2.15.2",
-    "@shopify/hydrogen": "2025.1.0",
-    "@shopify/remix-oxygen": "^2.0.10",
+    "@remix-run/react": "^2.15.3",
+    "@remix-run/server-runtime": "^2.15.3",
+    "@shopify/hydrogen": "2025.1.1",
+    "@shopify/remix-oxygen": "^2.0.11",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
-    "isbot": "^3.8.0",
+    "isbot": "^5.1.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "@eslint/compat": "^1.2.5",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.18.0",
     "@graphql-codegen/cli": "5.0.2",
-    "@remix-run/dev": "^2.15.2",
-    "@remix-run/eslint-config": "^2.15.2",
+    "@remix-run/dev": "^2.15.3",
     "@shopify/cli": "~3.74.1",
     "@shopify/hydrogen-codegen": "^0.3.2",
     "@shopify/mini-oxygen": "^3.1.1",
     "@shopify/oxygen-workers-types": "^4.1.2",
     "@shopify/prettier-config": "^1.1.2",
     "@total-typescript/ts-reset": "^0.4.2",
-    "@types/eslint": "^8.4.10",
+    "@types/eslint": "^9.6.1",
     "@types/react": "^18.2.22",
     "@types/react-dom": "^18.2.7",
-    "eslint": "^8.20.0",
-    "eslint-plugin-hydrogen": "0.12.2",
+    "@typescript-eslint/eslint-plugin": "^8.21.0",
+    "@typescript-eslint/parser": "^8.21.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.0.1",
+    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.11.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react-hooks": "^5.1.0",
+    "globals": "^15.14.0",
     "prettier": "^2.8.4",
     "typescript": "^5.2.2",
     "vite": "^5.1.8",

package/dist/assets/hydrogen/starter/server.ts

@@ -1,5 +1,7 @@
-// @ts-ignore
 // Virtual entry point for the app
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+// eslint-disable-next-line import/no-unresolved
 import * as remixBuild from 'virtual:remix/server-build';
 import {storefrontRedirect} from '@shopify/hydrogen';
 import {createRequestHandler} from '@shopify/remix-oxygen';
@@ -55,7 +57,6 @@ export default {
 
       return response;
     } catch (error) {
-      // eslint-disable-next-line no-console
       console.error(error);
       return new Response('An unexpected error occurred', {status: 500});
     }

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

@@ -14,7 +14,11 @@
     "forceConsistentCasingInFileNames": true,
     "skipLibCheck": true,
     "baseUrl": ".",
-    "types": ["@shopify/oxygen-workers-types", "@remix-run/node", "vite/client"],
+    "types": [
+      "@shopify/oxygen-workers-types",
+      "@remix-run/node",
+      "vite/client"
+    ],
     "paths": {
       "~/*": ["app/*"]
     },

package/dist/assets/hydrogen/starter/vite.config.ts

@@ -4,6 +4,12 @@ import {oxygen} from '@shopify/mini-oxygen/vite';
 import {vitePlugin as remix} from '@remix-run/dev';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
+declare module "@remix-run/server-runtime" {
+  interface Future {
+    v3_singleFetch: true;
+  }
+}
+
 export default defineConfig({
   plugins: [
     hydrogen(),
@@ -15,6 +21,7 @@ export default defineConfig({
         v3_relativeSplatPath: true,
         v3_throwAbortReason: true,
         v3_lazyRouteDiscovery: true,
+        v3_singleFetch: true,
       },
     }),
     tsconfigPaths(),

package/dist/assets/hydrogen/vite/package.json

@@ -5,7 +5,7 @@
     "dev": "shopify hydrogen dev --codegen"
   },
   "dependencies": {
-    "isbot": "^3.8.0"
+    "isbot": "^5.1.21"
   },
   "devDependencies": {
     "vite": "^5.1.8",

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

@@ -14,7 +14,6 @@ export default defineConfig({
         v3_fetcherPersist: true,
         v3_relativeSplatPath: true,
         v3_throwAbortReason: true,
-        v3_lazyRouteDiscovery: true,
       },
     }),
     tsconfigPaths(),

package/dist/{chunk-LJHVF5TJ.js → chunk-2OIJ27EK.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-25IMI7TH.js";
 import {
   CLI_KIT_VERSION
-} from "./chunk-UYZDNGSJ.js";
+} from "./chunk-VMNX6XTS.js";
 import {
   Environment,
   firstPartyDev,
@@ -14,7 +14,7 @@ import {
   outputDebug,
   runWithTimer,
   serviceEnvironment
-} from "./chunk-YEOP3EMX.js";
+} from "./chunk-3AS5GKO6.js";
 import {
   __commonJS,
   __require,
@@ -31271,4 +31271,4 @@ mime-types/index.js:
    * MIT Licensed
    *)
 */
-//# sourceMappingURL=chunk-LJHVF5TJ.js.map
+//# sourceMappingURL=chunk-2OIJ27EK.js.map

package/dist/{chunk-YEOP3EMX.js → chunk-3AS5GKO6.js}

@@ -29471,7 +29471,7 @@ function createRuntimeMetadataContainer(defaultPublicMetadata = {}) {
       try {
         await getAndSet();
       } catch (error) {
-        let { sendErrorToBugsnag } = await import("./error-handler-VQHDL26P.js");
+        let { sendErrorToBugsnag } = await import("./error-handler-YTUPADNE.js");
         await sendErrorToBugsnag(error, "unexpected_error");
       }
   }, durationStack = [];
@@ -31476,4 +31476,4 @@ react-reconciler/cjs/react-reconciler-constants.development.js:
    * LICENSE file in the root directory of this source tree.
    *)
 */
-//# sourceMappingURL=chunk-YEOP3EMX.js.map
+//# sourceMappingURL=chunk-3AS5GKO6.js.map

package/dist/{chunk-4MJNU2QF.js → chunk-3LRCKABH.js}

@@ -1,9 +1,9 @@
 import {
   generate
-} from "./chunk-SXT3JFLA.js";
+} from "./chunk-URFDLLOJ.js";
 import {
   base_command_default
-} from "./chunk-KR2ZEBN3.js";
+} from "./chunk-SWU2TFTH.js";
 import {
   init_cjs_shims
 } from "./chunk-PKR7KJ6P.js";
@@ -25,4 +25,4 @@ var Generate = class extends base_command_default {
 export {
   Generate
 };
-//# sourceMappingURL=chunk-4MJNU2QF.js.map
+//# sourceMappingURL=chunk-3LRCKABH.js.map

package/dist/{chunk-2TEPYAPA.js → chunk-3PD7N6QH.js}

@@ -1,9 +1,9 @@
 import {
   searchService
-} from "./chunk-U673QDO3.js";
+} from "./chunk-OZMNUR4V.js";
 import {
   base_command_default
-} from "./chunk-KR2ZEBN3.js";
+} from "./chunk-SWU2TFTH.js";
 import {
   require_lib
 } from "./chunk-VSKRQ3JT.js";
@@ -45,4 +45,4 @@ var import_core = __toESM(require_lib(), 1), Search = class _Search extends base
 export {
   Search
 };
-//# sourceMappingURL=chunk-2TEPYAPA.js.map
+//# sourceMappingURL=chunk-3PD7N6QH.js.map

package/dist/{chunk-VSC4NMYT.js → chunk-3WJDY4FZ.js}

@@ -1,6 +1,6 @@
 import {
   base_command_default
-} from "./chunk-KR2ZEBN3.js";
+} from "./chunk-SWU2TFTH.js";
 import {
   require_lib
 } from "./chunk-VSKRQ3JT.js";
@@ -43,4 +43,4 @@ var HelpCommand = class _HelpCommand extends base_command_default {
 export {
   HelpCommand
 };
-//# sourceMappingURL=chunk-VSC4NMYT.js.map
+//# sourceMappingURL=chunk-3WJDY4FZ.js.map