vite 2.7.0-beta.4 → 2.7.0-beta.5

package/dist/node/chunks/{dep-6cab8e8a.js → dep-6920cd01.js}

@@ -20385,7 +20385,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-9583e954.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-0a2fa784.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21350,7 +21350,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-ef63fa34.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-bc61ebc7.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -30183,11 +30183,28 @@ function tryNodeResolve(id, importer, options, targetWeb, server, ssr) {
     const lastArrowIndex = id.lastIndexOf('>');
     const nestedRoot = id.substring(0, lastArrowIndex).trim();
     const nestedPath = id.substring(lastArrowIndex + 1).trim();
-    // check for deep import, e.g. "my-lib/foo"
-    const deepMatch = nestedPath.match(deepImportRE);
-    const pkgId = deepMatch ? deepMatch[1] || deepMatch[2] : nestedPath;
+    const possiblePkgIds = [];
+    for (let prevSlashIndex = -1;;) {
+        let slashIndex = nestedPath.indexOf('/', prevSlashIndex + 1);
+        if (slashIndex < 0) {
+            slashIndex = nestedPath.length;
+        }
+        const part = nestedPath.slice(prevSlashIndex + 1, (prevSlashIndex = slashIndex));
+        if (!part) {
+            break;
+        }
+        // Assume path parts with an extension are not package roots, except for the
+        // first path part (since periods are sadly allowed in package names).
+        // At the same time, skip the first path part if it begins with "@"
+        // (since "@foo/bar" should be treated as the top-level path).
+        if (possiblePkgIds.length ? path__default.extname(part) : part[0] === '@') {
+            continue;
+        }
+        const possiblePkgId = nestedPath.slice(0, slashIndex);
+        possiblePkgIds.push(possiblePkgId);
+    }
     let basedir;
-    if (dedupe && dedupe.includes(pkgId)) {
+    if (dedupe === null || dedupe === void 0 ? void 0 : dedupe.some((id) => possiblePkgIds.includes(id))) {
         basedir = root;
     }
     else if (importer &&
@@ -30202,13 +30219,17 @@ function tryNodeResolve(id, importer, options, targetWeb, server, ssr) {
     if (nestedRoot) {
         basedir = nestedResolveFrom(nestedRoot, basedir, options.preserveSymlinks);
     }
-    const pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks);
+    let pkg;
+    const pkgId = possiblePkgIds.reverse().find((pkgId) => {
+        pkg = resolvePackageData(pkgId, basedir, options.preserveSymlinks);
+        return pkg;
+    });
     if (!pkg) {
         return;
     }
-    let resolved = deepMatch
-        ? resolveDeepImport('.' + id.slice(pkgId.length), pkg, options, targetWeb, options.preserveSymlinks)
-        : resolvePackageEntry(id, pkg, options, targetWeb, options.preserveSymlinks);
+    let resolved = nestedPath !== pkgId
+        ? resolveDeepImport('.' + nestedPath.slice(pkgId.length), pkg, options, targetWeb, options.preserveSymlinks)
+        : resolvePackageEntry(nestedPath, pkg, options, targetWeb, options.preserveSymlinks);
     if (!resolved) {
         return;
     }
@@ -30235,7 +30256,7 @@ function tryNodeResolve(id, importer, options, targetWeb, server, ssr) {
         if (!isJsType ||
             (importer === null || importer === void 0 ? void 0 : importer.includes('node_modules')) ||
             (exclude === null || exclude === void 0 ? void 0 : exclude.includes(pkgId)) ||
-            (exclude === null || exclude === void 0 ? void 0 : exclude.includes(id)) ||
+            (exclude === null || exclude === void 0 ? void 0 : exclude.includes(nestedPath)) ||
             SPECIAL_QUERY_RE.test(resolved) ||
             ssr) {
             // excluded from optimization
@@ -42783,7 +42804,7 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
             }));
             build.onResolve({ filter: virtualModuleRE }, async ({ path, importer }) => {
                 return {
-                    path,
+                    path: await resolve(path.substring('virtual-module:'.length), importer),
                     namespace: 'html'
                 };
             });
@@ -49325,7 +49346,7 @@ function readFileIfExists(value) {
  * https://github.com/webpack/webpack-dev-server/blob/master/LICENSE
  */
 async function createCertificate() {
-    const { generate } = await Promise.resolve().then(function () { return require('./dep-90234190.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-732fded6.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -67053,18 +67074,27 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     urlStack = urlStack.concat(url);
     const isCircular = (url) => urlStack.includes(url);
     const { isProduction, resolve: { dedupe }, root } = server.config;
+    // The `extensions` and `mainFields` options are used to ensure that
+    // CommonJS modules are preferred. We want to avoid ESM->ESM imports
+    // whenever possible, because `hookNodeResolve` can't intercept them.
     const resolveOptions = {
-        conditions: ['node'],
+        // By adding "require" to the `conditions` array, resolution of the
+        // pkg.exports field will use "require" condition whenever it comes
+        // before "import" condition.
+        conditions: ['node', 'require'],
         dedupe,
-        // Prefer CommonJS modules.
-        extensions: ['.js', '.mjs', '.ts', '.jsx', '.tsx', '.json'],
+        extensions: ['.js', '.cjs', '.mjs', '.jsx', '.json'],
         isBuild: true,
         isProduction,
-        // Disable "module" condition.
-        isRequire: true,
-        mainFields: ['main'],
+        mainFields: ['main', ...DEFAULT_MAIN_FIELDS],
         root
     };
+    // Prevent ESM modules from being resolved during test runs, since Jest
+    // cannot `require` them. Note: This prevents testing of ESM-only packages.
+    if (typeof jest !== 'undefined') {
+        resolveOptions.isRequire = true;
+        resolveOptions.mainFields = ['main'];
+    }
     // Since dynamic imports can happen in parallel, we need to
     // account for multiple pending deps and duplicate imports.
     const pendingDeps = [];
@@ -67144,9 +67174,15 @@ async function nodeImport(id, importer, resolveOptions) {
         return resolved.id;
     };
     // When an ESM module imports an ESM dependency, this hook is *not* used.
-    const unhookNodeResolve = hookNodeResolve((nodeResolve) => (id, parent, isMain, options) => id[0] === '.' || isBuiltin(id)
-        ? nodeResolve(id, parent, isMain, options)
-        : viteResolve(id, parent.id));
+    const unhookNodeResolve = hookNodeResolve((nodeResolve) => (id, parent, isMain, options) => {
+        if (id[0] === '.' || isBuiltin(id)) {
+            return nodeResolve(id, parent, isMain, options);
+        }
+        if (!parent) {
+            return id;
+        }
+        return viteResolve(id, parent.id);
+    });
     let url;
     // `resolve` doesn't handle `node:` builtins, so handle them directly
     if (id.startsWith('node:') || isBuiltin(id)) {
@@ -82168,4 +82204,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-6cab8e8a.js.map
+//# sourceMappingURL=dep-6920cd01.js.map