@shopify/hydrogen 1.3.1 → 1.4.0

package/dist/node/framework/plugins/vite-plugin-hydrogen-config.js

@@ -4,108 +4,119 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
+/* -- Plugin notes:
+ * Provide configuration options to Vite to ensure Hydrogen is built correctly
+ * for worker environments, using latest ES syntax, and some other requirements.
+ */
 exports.default = (pluginOptions) => {
     const rollupOptions = {
         output: {},
     };
     const isWorker = Boolean(process.env.WORKER) && process.env.WORKER !== 'undefined';
-    if (isWorker) {
-        /**
-         * By default, SSR dedupe logic gets bundled which runs `require('module')`.
-         * We don't want this in our workers runtime, because `require` is not supported.
-         */
-        rollupOptions.output = {
-            format: 'es',
-        };
-    }
-    if (process.env.NODE_ENV !== 'development' && !process.env.LOCAL_DEV) {
-        /**
-         * Ofuscate production asset name - To prevent ad blocker logics that blocks
-         * certain files due to how it is named.
-         */
-        rollupOptions.output = {
-            ...rollupOptions.output,
-            chunkFileNames: 'assets/[hash].js',
-        };
-    }
     return {
         name: 'hydrogen:config',
-        config: async (config, env) => ({
-            resolve: {
-                alias: {
-                    // This library is currently included as a compiled vendor lib, not published yet to NPM
-                    'react-server-dom-vite/client-proxy': require.resolve('@shopify/hydrogen/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js'),
-                },
-            },
-            build: {
-                minify: config.build?.minify ?? (process.env.LOCAL_DEV ? false : 'esbuild'),
-                sourcemap: true,
-                rollupOptions: config.build?.rollupOptions
-                    ? Object.assign(rollupOptions, config.build.rollupOptions)
-                    : rollupOptions,
-                target: config.build?.ssr
-                    ? isWorker
-                        ? 'es2022' // CFW (Updates weekly to latest V8)
-                        : 'es2020' // Node (Support for v14.19 used in SB)
-                    : 'modules', // Browsers (Vite default value)
-            },
-            ssr: {
+        config: async (config, env) => {
+            // @ts-ignore
+            const isSsrBuild = env.ssrBuild ?? !!config.build?.ssr;
+            /**
+             * By default, SSR dedupe logic gets bundled which runs `require('module')`.
+             * We don't want this in our workers runtime, because `require` is not supported.
+             */
+            rollupOptions.output = {
+                format: isWorker || !isSsrBuild ? 'es' : 'cjs',
+                inlineDynamicImports: isSsrBuild ? true : undefined,
+            };
+            if (process.env.NODE_ENV !== 'development' && !process.env.LOCAL_DEV) {
                 /**
-                 * Tell Vite to bundle everything when we're building for Workers.
-                 * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
+                 * Ofuscate production asset name - To prevent ad blocker logics that blocks
+                 * certain files due to how it is named.
                  */
-                noExternal: isWorker || [/react-server-dom-vite/, /@shopify\/hydrogen/],
-                target: isWorker ? 'webworker' : 'node',
-            },
-            // Reload when updating local Hydrogen lib
-            server: process.env.LOCAL_DEV && {
-                watch: {
-                    ignored: [
-                        '!**/node_modules/@shopify/hydrogen/**',
-                        '!**/node_modules/@shopify/hydrogen-ui/**',
-                    ],
+                rollupOptions.output = {
+                    ...rollupOptions.output,
+                    chunkFileNames: 'assets/[hash].js',
+                };
+            }
+            return {
+                resolve: {
+                    alias: {
+                        // This library is currently included as a compiled vendor lib, not published yet to NPM
+                        'react-server-dom-vite/client-proxy': require.resolve('@shopify/hydrogen/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js'),
+                    },
                 },
-            },
-            optimizeDeps: {
-                exclude: [
-                    '@shopify/hydrogen',
-                    '@shopify/hydrogen/client',
-                    '@shopify/hydrogen/entry-client',
-                    '@shopify/hydrogen-ui',
-                ],
-                include: [
-                    /**
-                     * Additionally, the following dependencies have trouble loading the
-                     * correct version of the dependency (server vs client). This tells Vite to take the
-                     * server versions and optimize them for ESM.
-                     */
-                    'react-helmet-async',
-                    'react-error-boundary',
+                build: {
+                    minify: config.build?.minify ?? (process.env.LOCAL_DEV ? false : 'esbuild'),
+                    sourcemap: true,
+                    rollupOptions: config.build?.rollupOptions
+                        ? Object.assign(rollupOptions, config.build.rollupOptions)
+                        : rollupOptions,
+                    target: config.build?.ssr
+                        ? isWorker
+                            ? 'es2022' // CFW (Updates weekly to latest V8)
+                            : 'es2020' // Node (Support for v14.19 used in SB)
+                        : 'modules', // Browsers (Vite default value)
+                },
+                ssr: {
                     /**
-                     * Vite cannot find the following dependencies since they might be
-                     * required in RSC asynchronously. This tells Vite to optimize them
-                     * at server start to avoid posterior page reloads and issues (#429 #430).
+                     * Tell Vite to bundle everything when we're building for Workers.
+                     * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
                      */
-                    'react',
-                    'react-dom/client',
-                    'react-server-dom-vite/client-proxy',
-                    // https://github.com/vitejs/vite/issues/6215
-                    'react/jsx-runtime',
-                    // https://github.com/nfriedly/set-cookie-parser/issues/50
-                    'set-cookie-parser',
-                    'undici',
-                ],
-            },
-            define: {
-                __HYDROGEN_DEV__: env.mode !== 'production',
-                __HYDROGEN_WORKER__: isWorker,
-                __HYDROGEN_TEST__: false,
-                __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
-                    ? `"${crypto_1.default.randomBytes(8).toString('hex').slice(0, 8)}"`
-                    : '"__QUERY_CACHE_ID__"',
-            },
-            envPrefix: ['VITE_', 'PUBLIC_'],
-            base: process.env.HYDROGEN_ASSET_BASE_URL,
-        }),
+                    noExternal: isWorker || [
+                        /react-server-dom-vite/,
+                        /@shopify\/hydrogen/,
+                    ],
+                    target: isWorker ? 'webworker' : 'node',
+                },
+                // Reload when updating local Hydrogen lib
+                server: process.env.LOCAL_DEV && {
+                    watch: {
+                        ignored: [
+                            '!**/node_modules/@shopify/hydrogen/**',
+                            '!**/node_modules/@shopify/hydrogen-ui/**',
+                        ],
+                    },
+                },
+                optimizeDeps: {
+                    exclude: [
+                        '@shopify/hydrogen',
+                        '@shopify/hydrogen/client',
+                        '@shopify/hydrogen/entry-client',
+                        '@shopify/hydrogen-ui',
+                    ],
+                    include: [
+                        /**
+                         * Additionally, the following dependencies have trouble loading the
+                         * correct version of the dependency (server vs client). This tells Vite to take the
+                         * server versions and optimize them for ESM.
+                         */
+                        'react-helmet-async',
+                        'react-error-boundary',
+                        /**
+                         * Vite cannot find the following dependencies since they might be
+                         * required in RSC asynchronously. This tells Vite to optimize them
+                         * at server start to avoid posterior page reloads and issues (#429 #430).
+                         */
+                        'react',
+                        'react-dom/client',
+                        'react-server-dom-vite/client-proxy',
+                        // https://github.com/vitejs/vite/issues/6215
+                        'react/jsx-runtime',
+                        // https://github.com/nfriedly/set-cookie-parser/issues/50
+                        'set-cookie-parser',
+                        'undici',
+                        '@xstate/react/fsm',
+                    ],
+                },
+                define: {
+                    __HYDROGEN_DEV__: env.mode !== 'production',
+                    __HYDROGEN_WORKER__: isWorker,
+                    __HYDROGEN_TEST__: false,
+                    __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
+                        ? `"${crypto_1.default.randomBytes(8).toString('hex').slice(0, 8)}"`
+                        : '"__QUERY_CACHE_ID__"',
+                },
+                envPrefix: ['VITE_', 'PUBLIC_'],
+                base: process.env.HYDROGEN_ASSET_BASE_URL,
+            };
+        },
     };
 };

package/dist/node/framework/plugins/vite-plugin-hydrogen-middleware.js

@@ -12,15 +12,15 @@ const middleware_js_1 = require("../middleware.js");
 const in_memory_js_1 = require("../cache/in-memory.js");
 const vite_plugin_hydrogen_virtual_files_js_1 = require("./vite-plugin-hydrogen-virtual-files.js");
 exports.HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
+/* -- Plugin notes:
+ * By adding a middleware to the Vite dev server, we can handle SSR without needing
+ * a custom node script. It works by handling any requests for `text/html` documents,
+ * loading them in an SSR context, rendering them using the `entry-server` endpoint in the
+ * user's project, and injecting the static HTML into the template.
+ */
 exports.default = (pluginOptions) => {
     return {
         name: 'hydrogen:middleware',
-        /**
-         * By adding a middleware to the Vite dev server, we can handle SSR without needing
-         * a custom node script. It works by handling any requests for `text/html` documents,
-         * loading them in an SSR context, rendering them using the `entry-server` endpoint in the
-         * user's project, and injecting the static HTML into the template.
-         */
         async configureServer(server) {
             const resolve = (p) => path_1.default.resolve(server.config.root, p);
             async function getIndexTemplate(url) {
@@ -62,13 +62,5 @@ exports.default = (pluginOptions) => {
 };
 async function polyfillOxygenEnv(config) {
     const env = await (0, vite_1.loadEnv)(config.mode, config.root, '');
-    const publicPrefixes = Array.isArray(config.envPrefix)
-        ? config.envPrefix
-        : [config.envPrefix || ''];
-    for (const key of Object.keys(env)) {
-        if (publicPrefixes.some((prefix) => key.startsWith(prefix))) {
-            delete env[key];
-        }
-    }
     globalThis.Oxygen = { env };
 }

package/dist/node/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* -- Plugin notes:
+ * Vite prints some warnings automatically are not important and
+ * not actionable. We hide them here to prevent confusing devs when
+ * real warnings or errors appear.
+ */
 exports.default = () => {
     return {
         name: 'hydrogen:suppress-warnings',

package/dist/node/framework/plugins/vite-plugin-hydrogen-virtual-files.js

@@ -9,6 +9,14 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const viteception_js_1 = require("../viteception.js");
 const magic_string_1 = __importDefault(require("magic-string"));
+const vite_js_1 = require("../../utilities/vite.js");
+/* -- Plugin notes:
+ * The Hydrogen framework needs to import certain files from the user app, such as
+ * routes and config. A priori, we can't import these files from the framework
+ * because we don't know the user path to write it in an `import * from '...'` statement.
+ * Instead, we import "virtual files" that are resolved by Vite in this plugin.
+ * These virtual files can include the user path and re-export the in-app files.
+ */
 exports.HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
 // The character ":" breaks Vite with Node >= 16.15. Use "_" instead
 const VIRTUAL_PREFIX = 'virtual__';
@@ -21,6 +29,7 @@ exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDRO
 const HYDROGEN_ROUTES_ID = 'hydrogen-routes.server.jsx';
 const VIRTUAL_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + HYDROGEN_ROUTES_ID;
 exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDROGEN_ROUTES_ID;
+const VIRTUAL_STREAM_ID = 'virtual__stream';
 exports.default = (pluginOptions) => {
     let config;
     let server;
@@ -47,6 +56,7 @@ exports.default = (pluginOptions) => {
                 exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
                 VIRTUAL_HYDROGEN_ROUTES_ID,
                 VIRTUAL_ERROR_FILE,
+                VIRTUAL_STREAM_ID,
             ].includes(source)) {
                 // Virtual modules convention
                 // https://vitejs.dev/guide/api-plugin.html#virtual-modules-convention
@@ -54,6 +64,13 @@ exports.default = (pluginOptions) => {
             }
         },
         load(id) {
+            if (id === '\0' + VIRTUAL_STREAM_ID) {
+                return {
+                    code: process.env.WORKER
+                        ? `export default {};`
+                        : `export {default} from 'stream';`,
+                };
+            }
             // Likely due to a bug in Vite, but virtual modules cannot be loaded
             // directly using ssrLoadModule from a Vite plugin. It needs to be proxied as follows:
             if (id === '\0' + exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
@@ -76,7 +93,10 @@ exports.default = (pluginOptions) => {
                         routesPath += '**/*.server.[jt](s|sx)';
                     }
                     const [dirPrefix] = routesPath.split('/*');
-                    let code = `export default {\n  dirPrefix: '${dirPrefix}',\n  basePath: '${hc.routes?.basePath ?? ''}',\n  files: import.meta.globEager('${routesPath}')\n};`;
+                    const importGlob = vite_js_1.isVite3
+                        ? `import.meta.glob('${routesPath}', {eager: true})`
+                        : `import.meta.globEager('${routesPath}')`;
+                    let code = `export default {\n  dirPrefix: '${dirPrefix}',\n  basePath: '${hc.routes?.basePath ?? ''}',\n  files: ${importGlob}\n};`;
                     if (config.command === 'serve') {
                         // Add dependency on Hydrogen config for HMR
                         code += `\nimport '${VIRTUAL_HYDROGEN_CONFIG_ID}';`;

package/dist/node/framework/plugins/vite-plugin-platform-entry.js

@@ -9,10 +9,23 @@ const magic_string_1 = __importDefault(require("magic-string"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const vite_js_1 = require("../../utilities/vite.js");
 const SSR_BUNDLE_NAME = 'index.js';
 // Keep this in the outer scope to share it
 // across client <> server builds.
 let clientBuildPath;
+/* -- Plugin notes:
+ * This plugin simplifies the way a platform entry file imports user files. This is
+ * needed to write generic integrations with different platform providers.
+ *
+ * Instead of using relative paths:
+ * `import handleRequest from '../../<arbitrary_path>/src/App.server';`
+ * `import indexTemplate from '../../<arbitrary_path>/dist/client/index.html?raw';`
+ *
+ *  It allows importing from a known static path which dynamically resolves the user files:
+ * `import {handleRequest, indexTemplate} from '@shopify/hydrogen/platforms';`
+ *
+ */
 exports.default = () => {
     let config;
     let isESM;
@@ -23,7 +36,7 @@ exports.default = () => {
             config = _config;
             if (config.build.ssr) {
                 const { output = {} } = config.build.rollupOptions || {};
-                const { format = '' } = (Array.isArray(output) ? output[0] : output) || {};
+                const { format = vite_js_1.isVite3 ? 'es' : '' } = (Array.isArray(output) ? output[0] : output) || {};
                 isESM = Boolean(process.env.WORKER) || ['es', 'esm'].includes(format);
             }
         },

package/dist/node/framework/plugins/vite-plugin-ssr-interop.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/* -- Plugin notes:
+ * This plugin makes sure we don't leak server logic to the browser when importing
+ * the `useEnvContext` utility.
+ */
 exports.default = () => {
     return {
-        name: 'vite-plugin-ssr-interop',
+        name: 'hydrogen:ssr-interop',
         enforce: 'pre',
         transform(code, id, options = {}) {
             if (options.ssr && id.includes('foundation/ssr-interop')) {

package/dist/node/framework/viteception.js

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteception = void 0;
 const vite_1 = require("vite");
+const vite_js_1 = require("../utilities/vite.js");
 async function viteception(paths, options) {
     const isWorker = process.env.WORKER;
     delete process.env.WORKER;
     const server = await (0, vite_1.createServer)({
         clearScreen: false,
-        server: { middlewareMode: 'ssr' },
+        server: {
+            middlewareMode: vite_js_1.isVite3 ? true : 'ssr',
+            hmr: false,
+        },
+        // @ts-ignore
+        appType: 'custom',
         ...options,
     });
     if (isWorker) {

package/dist/node/shared-types.d.ts

@@ -26,5 +26,6 @@ export declare type ShopifyConfig = {
     storeDomain: string;
     storefrontToken: string;
     storefrontApiVersion: string;
-    multipassSecret?: string;
+    privateStorefrontToken?: string;
+    storefrontId?: string;
 };

package/dist/node/utilities/vite.d.ts

@@ -0,0 +1 @@
+export declare const isVite3: any;

package/dist/node/utilities/vite.js

@@ -0,0 +1,30 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVite3 = void 0;
+// `version` is only exported in Vite 3
+const vite = __importStar(require("vite"));
+// @ts-ignore
+exports.isVite3 = vite.version?.startsWith('3.');

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",
@@ -119,7 +119,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "serve-static": "^1.14.1",
-    "vite": "^2.9.0"
+    "vite": "^2.9.0 || ^3.0.0"
   },
   "peerDependenciesMeta": {
     "body-parser": {
@@ -134,6 +134,8 @@
   },
   "dependencies": {
     "@vitejs/plugin-react": "^1.3.0",
+    "@xstate/fsm": "^2.0.0",
+    "@xstate/react": "^3.0.0",
     "abort-controller": "^3.0.0",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
@@ -151,7 +153,7 @@
     "react-helmet-async": "^1.3.0",
     "serve-static": "^1.15.0",
     "set-cookie-parser": "^2.5.0",
-    "undici": "^5.5.1",
+    "undici": "^5.8.2",
     "uuid": "^8.3.2",
     "vite-plugin-inspect": "^0.3.6",
     "web-streams-polyfill": "^3.2.0",

package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-plugin.js

@@ -14,9 +14,9 @@
 
 var esModuleLexer = require('es-module-lexer');
 var MagicString = require('magic-string');
-var vite = require('vite');
 var fs = require('fs');
 var path = require('path');
+var vite = require('vite');
 
 function _unsupportedIterableToArray(o, minLen) {
   if (!o) return;
@@ -94,6 +94,10 @@ function _createForOfIteratorHelper(o, allowArrayLike) {
 
 var assign = Object.assign;
 
+var normalizePath = vite.normalizePath,
+    transformWithEsbuild = vite.transformWithEsbuild,
+    createServer = vite.createServer;
+var isVite3 = vite.version && vite.version.startsWith('3.');
 var rscViteFileRE = /\/react-server-dom-vite.js/;
 var noProxyRE = /[&?]no-proxy($|&)/;
 
@@ -267,11 +271,11 @@ function ReactFlightVitePlugin() {
         var injectGlobs = function (clientComponents) {
           var importerPath = path.dirname(id);
           var importers = clientComponents.map(function (absolutePath) {
-            return vite.normalizePath(path.relative(importerPath, absolutePath));
+            return normalizePath(path.relative(importerPath, absolutePath));
           });
           var injectedGlobs = "Object.assign(Object.create(null), " + importers.map(function (glob) {
             return (// Mark the globs to modify the result after Vite resolves them.
-              "\n/* HASH_BEGIN */ " + ("import.meta.glob('" + vite.normalizePath(glob) + "') /* HASH_END */")
+              "\n/* HASH_BEGIN */ " + ("import.meta.glob('" + normalizePath(glob) + "') /* HASH_END */")
             );
           }).join(', ') + ");";
           s.replace(INJECTING_RE, injectedGlobs);
@@ -358,7 +362,7 @@ async function proxyClientComponent(filepath, src) {
     src = await fs.promises.readFile(filepath, 'utf-8');
   }
 
-  var _await$transformWithE = await vite.transformWithEsbuild(src, filepath),
+  var _await$transformWithE = await transformWithEsbuild(src, filepath),
       code = _await$transformWithE.code;
 
   var _parse = esModuleLexer.parse(code),
@@ -407,12 +411,14 @@ function findClientBoundaries(moduleGraph) {
 
 async function findClientBoundariesForClientBuild(serverEntries, optimizeBoundaries, root) {
   // Viteception
-  var server = await vite.createServer({
+  var server = await createServer({
     root: root,
     clearScreen: false,
     server: {
-      middlewareMode: 'ssr'
-    }
+      middlewareMode: isVite3 ? true : 'ssr',
+      hmr: false
+    },
+    appType: 'custom'
   });
 
   try {
@@ -435,9 +441,10 @@ var hashImportsPlugin = {
     if (rscViteFileRE.test(id)) {
       var s = new MagicString(code);
       s.replace(/\/\*\s*HASH_BEGIN\s*\*\/\s*([^]+?)\/\*\s*HASH_END\s*\*\//gm, function (_, imports) {
-        return imports.trim().replace(/"([^"]+?)":/gm, function (__, relativePath) {
+        return imports.trim().replace(/"([^"]+?)":/gm, function (all, relativePath) {
+          if (relativePath === '__VITE_PRELOAD__') return all;
           var absolutePath = path.resolve(path.dirname(id.split('?')[0]), relativePath);
-          return "\"" + getComponentId(vite.normalizePath(absolutePath)) + "\":";
+          return "\"" + getComponentId(normalizePath(absolutePath)) + "\":";
         });
       });
       return {
@@ -529,17 +536,20 @@ function isDirectImportInServer(originalMod, currentMod, accModInfo) {
   });
 }
 
-function resolveModPath(modPath, dirname, retryExtension) {
-  var absolutePath = '';
+var RESOLVE_EXTENSIONS = ['', '.js', '.ts', '.jsx', '.tsx', '/index', '/index.js', '/index.ts', '/index.jsx', '/index.tsx']; // Resolve relative paths  and aliases. Examples:
+// - import {XYZ} from '~/components' => import {XYZ} from '<absolute>/src/components/index.ts'
+// - import {XYZ} from '/src/component.client' => import {XYZ} from '<absolute>/src/component.client.jsx'`
 
-  try {
-    absolutePath = modPath.startsWith('.') ? vite.normalizePath(path.resolve(dirname, modPath)) : modPath;
-    return vite.normalizePath(require.resolve(absolutePath + (retryExtension || '')));
-  } catch (error) {
-    if (!/\.[jt]sx?$/.test(absolutePath) && retryExtension !== '.tsx') {
-      // Node cannot infer .[jt]sx extensions.
-      // Append them here and retry a couple of times.
-      return resolveModPath(absolutePath, dirname, retryExtension ? '.tsx' : '.jsx');
+function resolveModPath(modPath, dirname) {
+  var extensions = /\.[jt]sx?$/.test(modPath) ? [''] : RESOLVE_EXTENSIONS;
+
+  for (var i = 0; i < extensions.length; i++) {
+    var extension = extensions[i];
+
+    try {
+      var absolutePath = modPath.startsWith('.') ? normalizePath(path.resolve(dirname, modPath)) : modPath;
+      return normalizePath(require.resolve(absolutePath + extension));
+    } catch (error) {// Do not throw, this is likely a virtual module or another exception
     }
   }
 }
@@ -551,7 +561,7 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
   var _id$split = id.split('?'),
       source = _id$split[0];
 
-  var dirname = vite.normalizePath(path.dirname(source));
+  var dirname = normalizePath(path.dirname(source));
 
   var _parse2 = esModuleLexer.parse(code),
       rawImports = _parse2[0],
@@ -582,7 +592,7 @@ function augmentModuleGraph(moduleGraph, id, code, root, resolveAlias) {
 
     if (modPath && modPath.startsWith('/src/')) {
       // Vite default alias
-      modPath = vite.normalizePath(path.join(root, modPath));
+      modPath = normalizePath(path.join(root, modPath));
     }
 
     var resolvedPath = resolveModPath(modPath, dirname);