vite 2.9.0-beta.7 → 2.9.0-beta.8

package/dist/node/chunks/{dep-b2e77f82.js → dep-35d2a41c.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-0e100549.js');
+var index = require('./dep-a7fb482c.js');
 var require$$1 = require('crypto');
 require('fs');
 require('path');
@@ -19,9 +19,9 @@ require('https');
 require('zlib');
 require('tls');
 require('assert');
+require('esbuild');
 require('buffer');
 require('querystring');
-require('esbuild');
 require('child_process');
 require('worker_threads');
 require('readline');

package/dist/node/chunks/{dep-ee121766.js → dep-57c89c81.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-0e100549.js');
+var index = require('./dep-a7fb482c.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {

package/dist/node/chunks/{dep-0e100549.js → dep-a7fb482c.js}

@@ -18,9 +18,9 @@ var zlib$1 = require('zlib');
 var require$$1$1 = require('crypto');
 var require$$4 = require('tls');
 var require$$5 = require('assert');
+var esbuild = require('esbuild');
 var require$$0$8 = require('buffer');
 var qs = require('querystring');
-var esbuild = require('esbuild');
 var require$$1$5 = require('child_process');
 var require$$1$2 = require('worker_threads');
 var readline = require('readline');
@@ -2514,11 +2514,14 @@ function combineSourcemaps(filename, sourcemapList) {
     }
     // hack for parse broken with normalized absolute paths on windows (C:/path/to/something).
     // escape them to linux like paths
-    sourcemapList.forEach((sourcemap) => {
-        sourcemap.sources = sourcemap.sources.map((source) => source ? escapeToLinuxLikePath(source) : null);
+    // also avoid mutation here to prevent breaking plugin's using cache to generate sourcemaps like vue (see #7442)
+    sourcemapList = sourcemapList.map((sourcemap) => {
+        const newSourcemaps = { ...sourcemap };
+        newSourcemaps.sources = sourcemap.sources.map((source) => source ? escapeToLinuxLikePath(source) : null);
         if (sourcemap.sourceRoot) {
-            sourcemap.sourceRoot = escapeToLinuxLikePath(sourcemap.sourceRoot);
+            newSourcemaps.sourceRoot = escapeToLinuxLikePath(sourcemap.sourceRoot);
         }
+        return newSourcemaps;
     });
     const escapedFilename = escapeToLinuxLikePath(filename);
     // We don't declare type here so we can convert/fake/map as RawSourceMap
@@ -18601,6 +18604,8 @@ async function injectSourcesContent(map, file, logger) {
                 sourcePath = path__default.resolve(sourceRoot, sourcePath);
             }
             return fs$n.promises.readFile(sourcePath, 'utf-8').catch(() => {
+                if (maybeVirtualHtmlSet.has(normalizePath$4(sourcePath)))
+                    return null;
                 missingSources.push(sourcePath);
                 return null;
             });
@@ -19086,7 +19091,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-d52558aa.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-c9843b31.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -19514,8 +19519,10 @@ const less = async (source, root, options, resolvers) => {
         };
         return { code: '', errors: [normalizedError], deps: [] };
     }
-    const map = JSON.parse(result.map);
-    delete map.sourcesContent;
+    const map = result.map && JSON.parse(result.map);
+    if (map) {
+        delete map.sourcesContent;
+    }
     return {
         code: result.css.toString(),
         map,
@@ -21598,7 +21605,7 @@ function htmlInlineProxyPlugin(config) {
                 const file = cleanUrl(id);
                 const url = file.replace(normalizePath$4(config.root), '');
                 const result = htmlProxyMap.get(config).get(url)[index];
-                if (typeof result === 'string') {
+                if (result) {
                     return result;
                 }
                 else {
@@ -21608,14 +21615,14 @@ function htmlInlineProxyPlugin(config) {
         }
     };
 }
-function addToHTMLProxyCache(config, filePath, index, code) {
+function addToHTMLProxyCache(config, filePath, index, result) {
     if (!htmlProxyMap.get(config)) {
         htmlProxyMap.set(config, new Map());
     }
     if (!htmlProxyMap.get(config).get(filePath)) {
         htmlProxyMap.get(config).set(filePath, []);
     }
-    htmlProxyMap.get(config).get(filePath)[index] = code;
+    htmlProxyMap.get(config).get(filePath)[index] = result;
 }
 function addToHTMLProxyTransformResult(hash, code) {
     htmlProxyResult.set(hash, code);
@@ -21632,7 +21639,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-ee121766.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-57c89c81.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -21747,7 +21754,9 @@ function buildHtmlPlugin(config) {
                                     .join('');
                                 // <script type="module">...</script>
                                 const filePath = id.replace(normalizePath$4(config.root), '');
-                                addToHTMLProxyCache(config, filePath, inlineModuleIndex, contents);
+                                addToHTMLProxyCache(config, filePath, inlineModuleIndex, {
+                                    code: contents
+                                });
                                 js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.js"`;
                                 shouldRemove = true;
                             }
@@ -21813,7 +21822,7 @@ function buildHtmlPlugin(config) {
                         const styleNode = inlineStyle.value;
                         const code = styleNode.content;
                         const filePath = id.replace(normalizePath$4(config.root), '');
-                        addToHTMLProxyCache(config, filePath, inlineModuleIndex, code);
+                        addToHTMLProxyCache(config, filePath, inlineModuleIndex, { code });
                         // will transform with css plugin and cache result with css-post plugin
                         js += `\nimport "${id}?html-proxy&inline-css&index=${inlineModuleIndex}.css"`;
                         // will transfrom in `applyHtmlTransforms`
@@ -21824,7 +21833,9 @@ function buildHtmlPlugin(config) {
                         const styleNode = node.children.pop();
                         const filePath = id.replace(normalizePath$4(config.root), '');
                         inlineModuleIndex++;
-                        addToHTMLProxyCache(config, filePath, inlineModuleIndex, styleNode.content);
+                        addToHTMLProxyCache(config, filePath, inlineModuleIndex, {
+                            code: styleNode.content
+                        });
                         js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.css"`;
                         shouldRemove = true;
                     }
@@ -22034,11 +22045,13 @@ function resolveHtmlTransforms(plugins) {
     }
     return [preHooks, postHooks];
 }
+const maybeVirtualHtmlSet = new Set();
 async function applyHtmlTransforms(html, hooks, ctx) {
     const headTags = [];
     const headPrependTags = [];
     const bodyTags = [];
     const bodyPrependTags = [];
+    maybeVirtualHtmlSet.add(ctx.filename);
     for (const hook of hooks) {
         const res = await hook(html, ctx);
         if (!res) {
@@ -22604,11 +22617,21 @@ async function parseExtends(result, cache) {
   }
 }
 function resolveExtends(extended, from) {
+  let error;
   try {
     return require$$0$5.createRequire(from).resolve(extended);
   } catch (e) {
-    throw new TSConfckParseError(`failed to resolve "extends":"${extended}" in ${from}`, "EXTENDS_RESOLVE", from, e);
+    error = e;
+  }
+  if (!path__default.isAbsolute(extended) && !extended.startsWith("./") && !extended.startsWith("../")) {
+    try {
+      const fallbackExtended = path__default.join(extended, "tsconfig.json");
+      return require$$0$5.createRequire(from).resolve(fallbackExtended);
+    } catch (e) {
+      error = e;
+    }
   }
+  throw new TSConfckParseError(`failed to resolve "extends":"${extended}" in ${from}`, "EXTENDS_RESOLVE", from, error);
 }
 var EXTENDABLE_KEYS = [
   "compilerOptions",
@@ -36326,7 +36349,7 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
                     ? new MagicString$1(this.originalCode).generateMap({
                         includeContent: true,
                         hires: true,
-                        source: this.filename
+                        source: cleanUrl(this.filename)
                     })
                     : null;
             }
@@ -36966,6 +36989,9 @@ function loadCachedDepOptimizationMetadata(config, force = config.server.force,
             return cachedMetadata;
         }
     }
+    else {
+        config.logger.info('Forced re-optimization of dependencies');
+    }
     // Start with a fresh cache
     removeDirSync(depsCacheDir);
 }
@@ -38129,7 +38155,9 @@ function resolvePackageEntry(id, { dir, data, setResolvedCache, getResolvedCache
                 : isObject$4(data.browser) && data.browser['.'];
             if (browserEntry) {
                 // check if the package also has a "module" field.
-                if (typeof data.module === 'string' && data.module !== browserEntry) {
+                if (!options.isRequire &&
+                    typeof data.module === 'string' &&
+                    data.module !== browserEntry) {
                     // if both are present, we may have a problem: some package points both
                     // to ESM, with "module" targeting Node.js, while some packages points
                     // "module" to browser ESM and "browser" to UMD.
@@ -44813,7 +44841,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await Promise.resolve().then(function () { return require('./dep-b2e77f82.js'); })).createCertificate();
+        const content = (await Promise.resolve().then(function () { return require('./dep-35d2a41c.js'); })).createCertificate();
         fs$n.promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => fs$n.promises.writeFile(cachePath, content))
@@ -49045,8 +49073,11 @@ function createWebSocketServer(server, config, httpsOptions) {
     let wss;
     let httpsServer = undefined;
     const hmr = isObject$4(config.server.hmr) && config.server.hmr;
-    const wsServer = (hmr && hmr.server) ||
-        ((!(hmr && hmr.port) || hmr.port !== config.server.port) && server);
+    const hmrServer = hmr && hmr.server;
+    const hmrPort = hmr && hmr.port;
+    // TODO: the main server port may not have been chosen yet as it may use the next available
+    const portsAreCompatible = !hmrPort || hmrPort === config.server.port;
+    const wsServer = hmrServer || (portsAreCompatible && server);
     if (wsServer) {
         wss = new websocketServer({ noServer: true });
         wsServer.on('upgrade', (req, socket, head) => {
@@ -49059,7 +49090,7 @@ function createWebSocketServer(server, config, httpsOptions) {
     }
     else {
         const websocketServerOptions = {};
-        const port = (hmr && hmr.port) || 24678;
+        const port = hmrPort || 24678;
         const host = (hmr && hmr.host) || undefined;
         if (httpsOptions) {
             // if we're serving the middlewares over https, the ws library doesn't support automatically creating an https server, so we need to do it ourselves
@@ -53071,7 +53102,7 @@ function getHtmlFilename(url, server) {
         return decodeURIComponent(fsPathFromId(url));
     }
     else {
-        return decodeURIComponent(path__default.join(server.config.root, url.slice(1)));
+        return decodeURIComponent(normalizePath$4(path__default.join(server.config.root, url.slice(1))));
     }
 }
 const startsWithSingleSlashRE = /^\/(?!\/)/;
@@ -53099,7 +53130,7 @@ const processNodeUrl = (node, s, config, htmlPath, originalUrl, moduleGraph) =>
         s.overwrite(node.value.loc.start.offset, node.value.loc.end.offset, `"${path__default.posix.join(path__default.posix.relative(originalUrl, '/'), url.slice(1))}"`, { contentOnly: true });
     }
 };
-const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
+const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl }) => {
     const { config, moduleGraph } = server;
     const base = config.base || '/';
     const s = new MagicString$1(html);
@@ -53108,11 +53139,15 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
     const addInlineModule = (node, ext) => {
         inlineModuleIndex++;
         const url = filePath.replace(normalizePath$4(config.root), '');
-        const contents = node.children
-            .map((child) => child.content || '')
-            .join('');
+        const contentNode = node.children[0];
+        const code = contentNode.content;
+        const map = new MagicString$1(html)
+            .snip(contentNode.loc.start.offset, contentNode.loc.end.offset)
+            .generateMap({ hires: true });
+        map.sources = [filename];
+        map.file = filename;
         // add HTML Proxy to Map
-        addToHTMLProxyCache(config, url, inlineModuleIndex, contents);
+        addToHTMLProxyCache(config, url, inlineModuleIndex, { code, map });
         // inline js module. convert to src="proxy"
         const modulePath = `${config.base + htmlPath.slice(1)}?html-proxy&index=${inlineModuleIndex}.${ext}`;
         // invalidate the module so the newly cached contents will be served
@@ -53132,7 +53167,7 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
             if (src) {
                 processNodeUrl(src, s, config, htmlPath, originalUrl, moduleGraph);
             }
-            else if (isModule) {
+            else if (isModule && node.children.length) {
                 addInlineModule(node, 'js');
             }
         }
@@ -55760,11 +55795,13 @@ function createOptimizedDeps(server) {
     let newDepsDiscovered = false;
     let newDepsToLog = [];
     let newDepsToLogHandle;
-    const logNewDeps = () => {
-        config.logger.info(colors$1.green(`✨ dependencies optimized: ${depsLogString(newDepsToLog)}`), {
-            timestamp: true
-        });
-        newDepsToLog = [];
+    const logNewlyDiscoveredDeps = () => {
+        if (newDepsToLog.length) {
+            config.logger.info(colors$1.green(`✨ new dependencies optimized: ${depsLogString(newDepsToLog)}`), {
+                timestamp: true
+            });
+            newDepsToLog = [];
+        }
     };
     let depOptimizationProcessing = newDepOptimizationProcessing();
     let depOptimizationProcessingQueue = [];
@@ -55814,7 +55851,7 @@ function createOptimizedDeps(server) {
         };
         setTimeout(warmUp, 0);
     }
-    async function runOptimizer() {
+    async function runOptimizer(isRerun = false) {
         // Ensure that rerun is called sequentially
         enqueuedRerun = undefined;
         currentlyProcessing = true;
@@ -55891,26 +55928,27 @@ function createOptimizedDeps(server) {
                         discovered.processing = undefined;
                     }
                 }
-                newDepsToLog.push(...Object.keys(newData.optimized).filter((dep) => !metadata.optimized[dep]));
+                if (isRerun) {
+                    newDepsToLog.push(...Object.keys(newData.optimized).filter((dep) => !metadata.optimized[dep]));
+                }
                 metadata = optimizedDeps.metadata = newData;
                 resolveEnqueuedProcessingPromises();
             };
             if (!needsReload) {
                 commitProcessing();
-                if (isDebugEnabled) {
-                    logNewDeps();
-                    debuggerViteDeps(colors$1.green(`✨ previous optimized dependencies unchanged`), {
-                        timestamp: true
-                    });
-                }
-                else {
+                if (!isDebugEnabled) {
                     if (newDepsToLogHandle)
                         clearTimeout(newDepsToLogHandle);
                     newDepsToLogHandle = setTimeout(() => {
                         newDepsToLogHandle = undefined;
-                        logNewDeps();
+                        logNewlyDiscoveredDeps();
                     }, 2 * debounceMs);
                 }
+                else {
+                    debuggerViteDeps(colors$1.green(`✨ optimized dependencies unchanged`), {
+                        timestamp: true
+                    });
+                }
             }
             else {
                 if (newDepsDiscovered) {
@@ -55925,11 +55963,13 @@ function createOptimizedDeps(server) {
                 }
                 else {
                     commitProcessing();
-                    if (newDepsToLogHandle)
-                        clearTimeout(newDepsToLogHandle);
-                    newDepsToLogHandle = undefined;
-                    logNewDeps();
-                    logger.info(colors$1.green(`✨ previous optimized dependencies have changed, reloading page`), {
+                    if (!isDebugEnabled) {
+                        if (newDepsToLogHandle)
+                            clearTimeout(newDepsToLogHandle);
+                        newDepsToLogHandle = undefined;
+                        logNewlyDiscoveredDeps();
+                    }
+                    logger.info(colors$1.green(`✨ optimized dependencies changed. reloading`), {
                         timestamp: true
                     });
                     fullReload();
@@ -55966,7 +56006,7 @@ function createOptimizedDeps(server) {
         debuggerViteDeps(colors$1.green(`new dependencies found: ${depsString}`), {
             timestamp: true
         });
-        runOptimizer();
+        runOptimizer(true);
     }
     function getDiscoveredBrowserHash(hash, deps, missing) {
         return getHash(hash + JSON.stringify(deps) + JSON.stringify(missing) + sessionTimestamp);

package/dist/node/chunks/{dep-d52558aa.js → dep-c9843b31.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('postcss');
-var index$1 = require('./dep-0e100549.js');
+var index$1 = require('./dep-a7fb482c.js');
 var path$2 = require('path');
 var require$$1 = require('crypto');
 var fs = require('fs');

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('events');
-var index = require('./chunks/dep-0e100549.js');
+var index = require('./chunks/dep-a7fb482c.js');
 var perf_hooks = require('perf_hooks');
 require('fs');
 require('path');
@@ -19,9 +19,9 @@ require('zlib');
 require('crypto');
 require('tls');
 require('assert');
+require('esbuild');
 require('buffer');
 require('querystring');
-require('esbuild');
 require('child_process');
 require('worker_threads');
 require('readline');
@@ -683,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-0e100549.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-a7fb482c.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -732,7 +732,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-0e100549.js'); }).then(function (n) { return n.build$1; });
+    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-a7fb482c.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -755,7 +755,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-0e100549.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-a7fb482c.js'); }).then(function (n) { return n.index; });
     try {
         const config = await index.resolveConfig({
             root,
@@ -778,7 +778,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-0e100549.js'); }).then(function (n) { return n.preview$1; });
+    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-a7fb482c.js'); }).then(function (n) { return n.preview$1; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./chunks/dep-0e100549.js');
+var index = require('./chunks/dep-a7fb482c.js');
 require('fs');
 require('path');
 require('tty');
@@ -21,9 +21,9 @@ require('zlib');
 require('crypto');
 require('tls');
 require('assert');
+require('esbuild');
 require('buffer');
 require('querystring');
-require('esbuild');
 require('child_process');
 require('worker_threads');
 require('readline');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.9.0-beta.7",
+  "version": "2.9.0-beta.8",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -113,7 +113,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
     "terser": "^5.12.1",
-    "tsconfck": "^1.2.0",
+    "tsconfck": "^1.2.1",
     "tslib": "^2.3.1",
     "types": "link:./types",
     "ws": "^8.5.0"