vite 2.7.0-beta.2 → 2.7.0-beta.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# [2.7.0-beta.3](https://github.com/vitejs/vite/compare/v2.7.0-beta.2...v2.7.0-beta.3) (2021-11-08)
+
+
+
 # [2.7.0-beta.2](https://github.com/vitejs/vite/compare/v2.7.0-beta.1...v2.7.0-beta.2) (2021-11-08)
 
 

package/dist/node/chunks/{dep-caa1572d.js → dep-5243d0d3.js}

@@ -4058,9 +4058,6 @@ function prettifyUrl(url, root) {
 function isObject$3(value) {
     return Object.prototype.toString.call(value) === '[object Object]';
 }
-function isDefined(value) {
-    return value != null;
-}
 function lookupFile(dir, formats, pathOnly = false) {
     for (const format of formats) {
         const fullPath = path__default.join(dir, format);
@@ -4276,9 +4273,6 @@ function combineSourcemaps(filename, sourcemapList) {
     }
     return map;
 }
-function unique(arr) {
-    return Array.from(new Set(arr));
-}
 function resolveHostname(optionsHost) {
     let host;
     if (optionsHost === undefined ||
@@ -20383,7 +20377,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-e85c9ca9.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-c1084913.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21348,7 +21342,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-b89007db.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-59a3bcf9.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -30553,97 +30547,115 @@ const debug$c = createDebugger('vite:ssr-external');
  * Heuristics for determining whether a dependency should be externalized for
  * server-side rendering.
  */
-function resolveSSRExternal(config, knownImports, ssrExternals = new Set(), seen = new Set()) {
-    var _a, _b, _c, _d;
-    if (((_a = config.ssr) === null || _a === void 0 ? void 0 : _a.noExternal) === true) {
+function resolveSSRExternal(config, knownImports) {
+    var _a;
+    const ssrConfig = config.ssr;
+    if ((ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.noExternal) === true) {
         return [];
     }
-    const { root } = config;
+    const ssrExternals = new Set();
+    const seen = new Set();
+    (_a = ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.external) === null || _a === void 0 ? void 0 : _a.forEach((id) => {
+        ssrExternals.add(id);
+        seen.add(id);
+    });
+    collectExternals(config.root, ssrExternals, seen);
+    for (const dep of knownImports) {
+        // Assume external if not yet seen
+        // At this point, the project root and any linked packages have had their dependencies checked,
+        // so we can safely mark any knownImports not yet seen as external. They are guaranteed to be
+        // dependencies of packages in node_modules.
+        if (!seen.has(dep)) {
+            ssrExternals.add(dep);
+        }
+    }
+    // ensure `vite/dynamic-import-polyfill` is bundled (issue #1865)
+    ssrExternals.delete('vite');
+    let externals = [...ssrExternals];
+    if (ssrConfig === null || ssrConfig === void 0 ? void 0 : ssrConfig.noExternal) {
+        externals = externals.filter(createFilter$1(undefined, ssrConfig.noExternal, { resolve: false }));
+    }
+    return externals;
+}
+// do we need to do this ahead of time or could we do it lazily?
+function collectExternals(root, ssrExternals, seen) {
+    var _a;
     const pkgContent = lookupFile(root, ['package.json']);
     if (!pkgContent) {
-        return [];
+        return;
     }
     const pkg = JSON.parse(pkgContent);
-    const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined);
-    const deps = unique([
-        ...importedDeps,
-        ...Object.keys(pkg.devDependencies || {}),
-        ...Object.keys(pkg.dependencies || {})
-    ]);
+    const deps = {
+        ...pkg.devDependencies,
+        ...pkg.dependencies
+    };
     const resolveOptions = {
         root,
         isProduction: false,
         isBuild: true
     };
     const depsToTrace = new Set();
-    for (const id of deps) {
-        if (seen.has(id)) {
+    for (const id in deps) {
+        if (seen.has(id))
             continue;
-        }
         seen.add(id);
-        let entry;
+        let esmEntry;
         let requireEntry;
         try {
-            entry = (_b = tryNodeResolve(id, undefined, resolveOptions, true, undefined, true)) === null || _b === void 0 ? void 0 : _b.id;
+            esmEntry = (_a = tryNodeResolve(id, undefined, resolveOptions, true, // we set `targetWeb` to `true` to get the ESM entry
+            undefined, true)) === null || _a === void 0 ? void 0 : _a.id;
             // normalizePath required for windows. tryNodeResolve uses normalizePath
             // which returns with '/', require.resolve returns with '\\'
             requireEntry = normalizePath$4(require.resolve(id, { paths: [root] }));
         }
         catch (e) {
+            try {
+                // no main entry, but deep imports may be allowed
+                const pkgPath = resolveFrom$3(`${id}/package.json`, root);
+                if (pkgPath.includes('node_modules')) {
+                    ssrExternals.add(id);
+                }
+                else {
+                    depsToTrace.add(path__default.dirname(pkgPath));
+                }
+                continue;
+            }
+            catch { }
             // resolve failed, assume include
             debug$c(`Failed to resolve entries for package "${id}"\n`, e);
             continue;
         }
-        if (!entry) {
-            // no esm entry but has require entry (is this even possible?)
+        // no esm entry but has require entry
+        if (!esmEntry) {
             ssrExternals.add(id);
-            continue;
         }
-        if (!entry.includes('node_modules')) {
-            // entry is not a node dep, possibly linked - don't externalize
-            // instead, trace its dependencies.
-            depsToTrace.add(id);
-            continue;
+        // trace the dependencies of linked packages
+        else if (!esmEntry.includes('node_modules')) {
+            const pkgPath = resolveFrom$3(`${id}/package.json`, root);
+            depsToTrace.add(path__default.dirname(pkgPath));
         }
-        if (entry !== requireEntry) {
-            // has separate esm/require entry, assume require entry is cjs
+        // has separate esm/require entry, assume require entry is cjs
+        else if (esmEntry !== requireEntry) {
             ssrExternals.add(id);
         }
-        else {
-            // node resolve and esm resolve resolves to the same file.
-            if (!/\.m?js$/.test(entry)) {
-                // entry is not js, cannot externalize
-                continue;
-            }
-            if (pkg.type === 'module' || entry.endsWith('.mjs')) {
+        // if we're externalizing ESM and CJS should basically just always do it?
+        // or are there others like SystemJS / AMD that we'd need to handle?
+        // for now, we'll just leave this as is
+        else if (/\.m?js$/.test(esmEntry)) {
+            if (pkg.type === "module" || esmEntry.endsWith('.mjs')) {
                 ssrExternals.add(id);
                 continue;
             }
             // check if the entry is cjs
-            const content = fs__default.readFileSync(entry, 'utf-8');
+            const content = fs__default.readFileSync(esmEntry, 'utf-8');
             if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
                 ssrExternals.add(id);
             }
         }
     }
-    for (const id of depsToTrace) {
-        const depRoot = path__default.dirname(resolveFrom$3(`${id}/package.json`, root, !!config.resolve.preserveSymlinks));
-        resolveSSRExternal({
-            ...config,
-            root: depRoot
-        }, knownImports, ssrExternals, seen);
-    }
-    if ((_c = config.ssr) === null || _c === void 0 ? void 0 : _c.external) {
-        config.ssr.external.forEach((id) => ssrExternals.add(id));
+    for (const depRoot of depsToTrace) {
+        collectExternals(depRoot, ssrExternals, seen);
     }
-    let externals = [...ssrExternals];
-    if ((_d = config.ssr) === null || _d === void 0 ? void 0 : _d.noExternal) {
-        const filter = createFilter$1(undefined, config.ssr.noExternal, {
-            resolve: false
-        });
-        externals = externals.filter((id) => filter(id));
-    }
-    return externals.filter((id) => id !== 'vite');
 }
 function shouldExternalizeForSSR(id, externals) {
     const should = externals.some((e) => {
@@ -30658,17 +30670,6 @@ function shouldExternalizeForSSR(id, externals) {
     });
     return should;
 }
-function getNpmPackageName(importPath) {
-    const parts = importPath.split('/');
-    if (parts[0].startsWith('@')) {
-        if (!parts[1])
-            return null;
-        return `${parts[0]}/${parts[1]}`;
-    }
-    else {
-        return parts[0];
-    }
-}
 
 function ssrManifestPlugin(config) {
     // module id => preload assets mapping
@@ -49230,7 +49231,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-39172335.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-777faa4b.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -67181,11 +67182,9 @@ async function createServer(inlineConfig = {}) {
         },
         transformIndexHtml: null,
         ssrLoadModule(url) {
-            if (!server._ssrExternals) {
-                server._ssrExternals = resolveSSRExternal(config, server._optimizeDepsMetadata
-                    ? Object.keys(server._optimizeDepsMetadata.optimized)
-                    : []);
-            }
+            server._ssrExternals || (server._ssrExternals = resolveSSRExternal(config, server._optimizeDepsMetadata
+                ? Object.keys(server._optimizeDepsMetadata.optimized)
+                : []));
             return ssrLoadModule(url, server);
         },
         ssrFixStacktrace(e) {
@@ -81994,4 +81993,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-caa1572d.js.map
+//# sourceMappingURL=dep-5243d0d3.js.map