vite 2.7.0-beta.9 → 2.7.3

package/dist/node/chunks/{dep-9aea22f6.js → dep-5496817b.js}

@@ -4316,8 +4316,8 @@ function arraify(target) {
 function toUpperCaseDriveLetter(pathName) {
     return pathName.replace(/^\w:/, (letter) => letter.toUpperCase());
 }
-const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
-const singlelineCommentsRE = /\/\/.*/g;
+const multilineCommentsRE$1 = /\/\*(.|[\r\n])*?\*\//gm;
+const singlelineCommentsRE$1 = /\/\/.*/g;
 const usingDynamicImport = typeof jest === 'undefined';
 /**
  * Dynamically import files. It will make sure it's not being compiled away by TS/Rollup.
@@ -5981,7 +5981,7 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
     // placeholders for `assetFileNames`
     // `hash` is slightly different from the rollup's one
     const extname = path__default.extname(basename);
-    const ext = extname.substr(1);
+    const ext = extname.substring(1);
     const name = basename.slice(0, -extname.length);
     const hash = contentHash;
     if (typeof assetFileNames === 'function') {
@@ -20396,7 +20396,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-f90ad7ac.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-cf2decec.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -20976,7 +20976,34 @@ function lexGlobPattern(code, pos) {
                 throw new Error('unknown import.meta.glob lexer state');
         }
     }
-    return [pattern, code.indexOf(`)`, i) + 1];
+    const endIndex = getEndIndex(code, i);
+    return [pattern, endIndex + 1];
+}
+// reg without the 'g' option, only matches the first match
+const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//m;
+const singlelineCommentsRE = /\/\/.*/;
+function getEndIndex(code, i) {
+    var _a;
+    const findStart = i;
+    const endIndex = code.indexOf(`)`, findStart);
+    const subCode = code.substring(findStart);
+    const matched = (_a = subCode.match(singlelineCommentsRE)) !== null && _a !== void 0 ? _a : subCode.match(multilineCommentsRE);
+    if (!matched) {
+        return endIndex;
+    }
+    const str = matched[0];
+    const index = matched.index;
+    if (!index) {
+        return endIndex;
+    }
+    const commentStart = findStart + index;
+    const commentEnd = commentStart + str.length;
+    if (endIndex > commentStart && endIndex < commentEnd) {
+        return getEndIndex(code, commentEnd);
+    }
+    else {
+        return endIndex;
+    }
 }
 function error$3(pos) {
     const err = new Error(`import.meta.glob() can only accept string literals.`);
@@ -21342,7 +21369,7 @@ function htmlInlineScriptProxyPlugin(config) {
                 const file = cleanUrl(id);
                 const url = file.replace(normalizePath$4(config.root), '');
                 const result = htmlProxyMap.get(config).get(url)[index];
-                if (result) {
+                if (typeof result === 'string') {
                     return result;
                 }
                 else {
@@ -21374,7 +21401,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-ff5fc8ed.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-66abeb03.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -21440,6 +21467,7 @@ function buildHtmlPlugin(config) {
             isAsyncScriptMap.set(config, new Map());
         },
         async transform(html, id) {
+            var _a, _b;
             if (id.endsWith('.html')) {
                 const publicPath = `/${slash$3(path__default.relative(config.root, id))}`;
                 // pre-transform
@@ -21530,20 +21558,26 @@ function buildHtmlPlugin(config) {
                     config.logger.warn(`\nMixed async and defer script modules in ${id}, output script will fallback to defer. Every script, including inline ones, need to be marked as async for your output script to be async.`);
                 }
                 // for each encountered asset url, rewrite original html so that it
-                // references the post-build location.
+                // references the post-build location, ignoring empty attributes and
+                // attributes that directly reference named output.
+                const namedOutput = Object.keys(((_b = (_a = config === null || config === void 0 ? void 0 : config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions) === null || _b === void 0 ? void 0 : _b.input) || {});
                 for (const attr of assetUrls) {
                     const value = attr.value;
-                    try {
-                        const url = attr.name === 'srcset'
-                            ? await processSrcSet(value.content, ({ url }) => urlToBuiltUrl(url, id, config, this))
-                            : await urlToBuiltUrl(value.content, id, config, this);
-                        s.overwrite(value.loc.start.offset, value.loc.end.offset, `"${url}"`);
-                    }
-                    catch (e) {
-                        // #1885 preload may be pointing to urls that do not exist
-                        // locally on disk
-                        if (e.code !== 'ENOENT') {
-                            throw e;
+                    const content = value.content;
+                    if (content !== '' && // Empty attribute
+                        !namedOutput.includes(content) && // Direct reference to named output
+                        !namedOutput.includes(content.replace(/^\//, '')) // Allow for absolute references as named output can't be an absolute path
+                    ) {
+                        try {
+                            const url = attr.name === 'srcset'
+                                ? await processSrcSet(content, ({ url }) => urlToBuiltUrl(url, id, config, this))
+                                : await urlToBuiltUrl(content, id, config, this);
+                            s.overwrite(value.loc.start.offset, value.loc.end.offset, `"${url}"`);
+                        }
+                        catch (e) {
+                            if (e.code !== 'ENOENT') {
+                                throw e;
+                            }
                         }
                     }
                 }
@@ -30126,8 +30160,8 @@ function resolvePlugin(baseOptions) {
             // this is passed by @rollup/plugin-commonjs
             const isRequire = (_c = (_b = (_a = resolveOpts === null || resolveOpts === void 0 ? void 0 : resolveOpts.custom) === null || _a === void 0 ? void 0 : _a['node-resolve']) === null || _b === void 0 ? void 0 : _b.isRequire) !== null && _c !== void 0 ? _c : false;
             const options = {
-                ...baseOptions,
                 isRequire,
+                ...baseOptions,
                 isFromTsImporter: isTsRequest(importer !== null && importer !== void 0 ? importer : '')
             };
             let res;
@@ -30712,7 +30746,7 @@ function resolveSSRExternal(config, knownImports) {
         ssrExternals.add(id);
         seen.add(id);
     });
-    collectExternals(config.root, config.resolve.preserveSymlinks, ssrExternals, seen);
+    collectExternals(config.root, config.resolve.preserveSymlinks, ssrExternals, seen, config.logger);
     const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined);
     for (const dep of importedDeps) {
         // Assume external if not yet seen
@@ -30731,17 +30765,18 @@ function resolveSSRExternal(config, knownImports) {
     }
     return externals;
 }
+const CJS_CONTENT_RE = /\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(|\bObject\.(defineProperty|defineProperties|assign)\s*\(\s*exports\b/;
 // do we need to do this ahead of time or could we do it lazily?
-function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
+function collectExternals(root, preserveSymlinks, ssrExternals, seen, logger) {
     var _a;
-    const pkgContent = lookupFile(root, ['package.json']);
-    if (!pkgContent) {
+    const rootPkgContent = lookupFile(root, ['package.json']);
+    if (!rootPkgContent) {
         return;
     }
-    const pkg = JSON.parse(pkgContent);
+    const rootPkg = JSON.parse(rootPkgContent);
     const deps = {
-        ...pkg.devDependencies,
-        ...pkg.dependencies
+        ...rootPkg.devDependencies,
+        ...rootPkg.dependencies
     };
     const resolveOptions = {
         root,
@@ -30797,19 +30832,27 @@ function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
         // 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)) {
+            const pkgPath = resolveFrom$3(`${id}/package.json`, root);
+            const pkgContent = fs__default.readFileSync(pkgPath, 'utf-8');
+            if (!pkgContent) {
+                continue;
+            }
+            const pkg = JSON.parse(pkgContent);
             if (pkg.type === 'module' || esmEntry.endsWith('.mjs')) {
                 ssrExternals.add(id);
                 continue;
             }
             // check if the entry is cjs
             const content = fs__default.readFileSync(esmEntry, 'utf-8');
-            if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
+            if (CJS_CONTENT_RE.test(content)) {
                 ssrExternals.add(id);
+                continue;
             }
+            logger.warn(`${id} doesn't appear to be written in CJS, but also doesn't appear to be a valid ES module (i.e. it doesn't have "type": "module" or an .mjs extension for the entry point). Please contact the package author to fix.`);
         }
     }
     for (const depRoot of depsToTrace) {
-        collectExternals(depRoot, preserveSymlinks, ssrExternals, seen);
+        collectExternals(depRoot, preserveSymlinks, ssrExternals, seen, logger);
     }
 }
 function shouldExternalizeForSSR(id, externals) {
@@ -43018,11 +43061,15 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         const contextMatch = openTag.match(contextRE);
                         const context = contextMatch &&
                             (contextMatch[1] || contextMatch[2] || contextMatch[3]);
-                        if ((path.endsWith('.vue') && setupRE.test(raw)) ||
+                        if ((path.endsWith('.vue') && setupRE.test(openTag)) ||
                             (path.endsWith('.svelte') && context !== 'module')) {
+                            // append imports in TS to prevent esbuild from removing them
+                            // since they may be used in the template
+                            const localContent = content +
+                                (loader.startsWith('ts') ? extractImportPaths(content) : '');
                             localScripts[path] = {
                                 loader,
-                                contents: content
+                                contents: localContent
                             };
                             js += `import '${virtualModulePrefix}${path}';\n`;
                         }
@@ -43031,26 +43078,10 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         }
                     }
                 }
-                // empty singleline & multiline comments to avoid matching comments
-                const code = js
-                    .replace(multilineCommentsRE, '/* */')
-                    .replace(singlelineCommentsRE, '');
-                if (loader.startsWith('ts') &&
-                    (path.endsWith('.svelte') ||
-                        (path.endsWith('.vue') && setupRE.test(raw)))) {
-                    // when using TS + (Vue + <script setup>) or Svelte, imports may seem
-                    // unused to esbuild and dropped in the build output, which prevents
-                    // esbuild from crawling further.
-                    // the solution is to add `import 'x'` for every source to force
-                    // esbuild to keep crawling due to potential side effects.
-                    let m;
-                    while ((m = importsRE.exec(code)) != null) {
-                        // This is necessary to avoid infinite loops with zero-width matches
-                        if (m.index === importsRE.lastIndex) {
-                            importsRE.lastIndex++;
-                        }
-                        js += `\nimport ${m[1]}`;
-                    }
+                // `<script>` in Svelte has imports that can be used in the template
+                // so we handle them here too
+                if (loader.startsWith('ts') && path.endsWith('.svelte')) {
+                    js += extractImportPaths(js);
                 }
                 // This will trigger incorrectly if `export default` is contained
                 // anywhere in a string. Svelte and Astro files can't have
@@ -43192,6 +43223,29 @@ async function transformGlob(source, importer, root, loader) {
     }
     return s.toString();
 }
+/**
+ * when using TS + (Vue + `<script setup>`) or Svelte, imports may seem
+ * unused to esbuild and dropped in the build output, which prevents
+ * esbuild from crawling further.
+ * the solution is to add `import 'x'` for every source to force
+ * esbuild to keep crawling due to potential side effects.
+ */
+function extractImportPaths(code) {
+    // empty singleline & multiline comments to avoid matching comments
+    code = code
+        .replace(multilineCommentsRE$1, '/* */')
+        .replace(singlelineCommentsRE$1, '');
+    let js = '';
+    let m;
+    while ((m = importsRE.exec(code)) != null) {
+        // This is necessary to avoid infinite loops with zero-width matches
+        if (m.index === importsRE.lastIndex) {
+            importsRE.lastIndex++;
+        }
+        js += `\nimport ${m[1]}`;
+    }
+    return js;
+}
 function shouldExternalizeDep(resolvedId, rawId) {
     // not a valid file path
     if (!path__default.isAbsolute(resolvedId)) {
@@ -43225,8 +43279,8 @@ function assetImportMetaUrlPlugin(config) {
             if (code.includes('new URL') && code.includes(`import.meta.url`)) {
                 const importMetaUrlRE = /\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\)/g;
                 const noCommentsCode = code
-                    .replace(multilineCommentsRE, (m) => ' '.repeat(m.length))
-                    .replace(singlelineCommentsRE, (m) => ' '.repeat(m.length));
+                    .replace(multilineCommentsRE$1, (m) => ' '.repeat(m.length))
+                    .replace(singlelineCommentsRE$1, (m) => ' '.repeat(m.length));
                 let s = null;
                 let match;
                 while ((match = importMetaUrlRE.exec(noCommentsCode))) {
@@ -43303,7 +43357,7 @@ function loadFallbackPlugin() {
     };
 }
 
-function resolveBuildOptions(root, raw) {
+function resolveBuildOptions(root, raw, isBuild) {
     var _a;
     const resolved = {
         target: 'modules',
@@ -43352,18 +43406,22 @@ function resolveBuildOptions(root, raw) {
                 ]))
                 : resolve(raw.rollupOptions.input);
     }
-    else {
-        input = resolve((raw === null || raw === void 0 ? void 0 : raw.lib)
-            ? raw.lib.entry
-            : typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string'
-                ? raw.ssr
-                : 'index.html');
+    else if ((raw === null || raw === void 0 ? void 0 : raw.lib) && isBuild) {
+        input = resolve(raw.lib.entry);
+    }
+    else if (typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string') {
+        input = resolve(raw.ssr);
+    }
+    else if (isBuild) {
+        input = resolve('index.html');
     }
     if (!!(raw === null || raw === void 0 ? void 0 : raw.ssr) && typeof input === 'string' && input.endsWith('.html')) {
         throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
             `Please specify a dedicated SSR entry.`);
     }
-    resolved.rollupOptions.input = input;
+    if (input) {
+        resolved.rollupOptions.input = input;
+    }
     // handle special build targets
     if (resolved.target === 'modules') {
         // Support browserslist
@@ -43403,7 +43461,7 @@ function resolveBuildPlugins(config) {
             dynamicImportVariables(options.dynamicImportVarsOptions),
             assetImportMetaUrlPlugin(config),
             ...(options.rollupOptions.plugins
-                ? options.rollupOptions.plugins.filter((p) => !!p)
+                ? options.rollupOptions.plugins.filter(Boolean)
                 : [])
         ],
         post: [
@@ -43500,6 +43558,12 @@ async function doBuild(inlineConfig = {}) {
     };
     try {
         const buildOutputOptions = (output = {}) => {
+            // @ts-ignore
+            if (output.output) {
+                config.logger.warn(`You've set "rollupOptions.output.output" in your config. ` +
+                    `This is deprecated and will override all Vite.js default output options. ` +
+                    `Please use "rollupOptions.output" instead.`);
+            }
             return {
                 dir: outDir,
                 format: ssr ? 'cjs' : 'es',
@@ -49508,7 +49572,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-a2051654.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-df937e9b.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -51132,8 +51196,8 @@ class Sender$1 {
     if (payloadLength === 126) {
       target.writeUInt16BE(data.length, 2);
     } else if (payloadLength === 127) {
-      target.writeUInt32BE(0, 2);
-      target.writeUInt32BE(data.length, 6);
+      target[2] = target[3] = 0;
+      target.writeUIntBE(data.length, 4, 6);
     }
 
     if (!options.mask) return [target, data];
@@ -52002,6 +52066,7 @@ class WebSocket$1 extends EventEmitter$1 {
     this._closeMessage = EMPTY_BUFFER;
     this._closeTimer = null;
     this._extensions = {};
+    this._paused = false;
     this._protocol = '';
     this._readyState = WebSocket$1.CONNECTING;
     this._receiver = null;
@@ -52068,6 +52133,13 @@ class WebSocket$1 extends EventEmitter$1 {
     return Object.keys(this._extensions).join();
   }
 
+  /**
+   * @type {Boolean}
+   */
+  get isPaused() {
+    return this._paused;
+  }
+
   /**
    * @type {Function}
    */
@@ -52256,6 +52328,23 @@ class WebSocket$1 extends EventEmitter$1 {
     );
   }
 
+  /**
+   * Pause the socket.
+   *
+   * @public
+   */
+  pause() {
+    if (
+      this.readyState === WebSocket$1.CONNECTING ||
+      this.readyState === WebSocket$1.CLOSED
+    ) {
+      return;
+    }
+
+    this._paused = true;
+    this._socket.pause();
+  }
+
   /**
    * Send a ping.
    *
@@ -52320,6 +52409,23 @@ class WebSocket$1 extends EventEmitter$1 {
     this._sender.pong(data || EMPTY_BUFFER, mask, cb);
   }
 
+  /**
+   * Resume the socket.
+   *
+   * @public
+   */
+  resume() {
+    if (
+      this.readyState === WebSocket$1.CONNECTING ||
+      this.readyState === WebSocket$1.CLOSED
+    ) {
+      return;
+    }
+
+    this._paused = false;
+    if (!this._receiver._writableState.needDrain) this._socket.resume();
+  }
+
   /**
    * Send a data message.
    *
@@ -52462,6 +52568,7 @@ Object.defineProperty(WebSocket$1.prototype, 'CLOSED', {
   'binaryType',
   'bufferedAmount',
   'extensions',
+  'isPaused',
   'protocol',
   'readyState',
   'url'
@@ -52574,19 +52681,26 @@ function initAsClient(websocket, address, protocols, options) {
 
   const isSecure = parsedUrl.protocol === 'wss:';
   const isUnixSocket = parsedUrl.protocol === 'ws+unix:';
+  let invalidURLMessage;
 
   if (parsedUrl.protocol !== 'ws:' && !isSecure && !isUnixSocket) {
-    throw new SyntaxError(
-      'The URL\'s protocol must be one of "ws:", "wss:", or "ws+unix:"'
-    );
+    invalidURLMessage =
+      'The URL\'s protocol must be one of "ws:", "wss:", or "ws+unix:"';
+  } else if (isUnixSocket && !parsedUrl.pathname) {
+    invalidURLMessage = "The URL's pathname is empty";
+  } else if (parsedUrl.hash) {
+    invalidURLMessage = 'The URL contains a fragment identifier';
   }
 
-  if (isUnixSocket && !parsedUrl.pathname) {
-    throw new SyntaxError("The URL's pathname is empty");
-  }
+  if (invalidURLMessage) {
+    const err = new SyntaxError(invalidURLMessage);
 
-  if (parsedUrl.hash) {
-    throw new SyntaxError('The URL contains a fragment identifier');
+    if (websocket._redirects === 0) {
+      throw err;
+    } else {
+      emitErrorAndClose(websocket, err);
+      return;
+    }
   }
 
   const defaultPort = isSecure ? 443 : 80;
@@ -52668,9 +52782,7 @@ function initAsClient(websocket, address, protocols, options) {
     if (req === null || req.aborted) return;
 
     req = websocket._req = null;
-    websocket._readyState = WebSocket$1.CLOSING;
-    websocket.emit('error', err);
-    websocket.emitClose();
+    emitErrorAndClose(websocket, err);
   });
 
   req.on('response', (res) => {
@@ -52690,7 +52802,15 @@ function initAsClient(websocket, address, protocols, options) {
 
       req.abort();
 
-      const addr = new URL$2(location, address);
+      let addr;
+
+      try {
+        addr = new URL$2(location, address);
+      } catch (e) {
+        const err = new SyntaxError(`Invalid URL: ${location}`);
+        emitErrorAndClose(websocket, err);
+        return;
+      }
 
       initAsClient(websocket, addr, protocols, options);
     } else if (!websocket.emit('unexpected-response', req, res)) {
@@ -52793,6 +52913,19 @@ function initAsClient(websocket, address, protocols, options) {
   });
 }
 
+/**
+ * Emit the `'error'` and `'close'` event.
+ *
+ * @param {WebSocket} websocket The WebSocket instance
+ * @param {Error} The error to emit
+ * @private
+ */
+function emitErrorAndClose(websocket, err) {
+  websocket._readyState = WebSocket$1.CLOSING;
+  websocket.emit('error', err);
+  websocket.emitClose();
+}
+
 /**
  * Create a `net.Socket` and initiate a connection.
  *
@@ -52919,7 +53052,9 @@ function receiverOnConclude(code, reason) {
  * @private
  */
 function receiverOnDrain() {
-  this[kWebSocket$1]._socket.resume();
+  const websocket = this[kWebSocket$1];
+
+  if (!websocket.isPaused) websocket._socket.resume();
 }
 
 /**
@@ -53712,6 +53847,9 @@ function createWebSocketServer(server, config, httpsOptions) {
         },
         close() {
             return new Promise((resolve, reject) => {
+                wss.clients.forEach((client) => {
+                    client.terminate();
+                });
                 wss.close((err) => {
                     if (err) {
                         reject(err);
@@ -56723,7 +56861,7 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                         });
                     }
                     else if (node.id.type === 'ArrayPattern') {
-                        node.id.elements.forEach((element) => {
+                        node.id.elements.filter(Boolean).forEach((element) => {
                             setScope(parentFunction, element.name);
                         });
                     }
@@ -57518,21 +57656,26 @@ function transformMiddleware(server) {
             // always allow vite client requests so that it can trigger page reload
             !((_a = req.url) === null || _a === void 0 ? void 0 : _a.startsWith(CLIENT_PUBLIC_PATH)) &&
             !((_b = req.url) === null || _b === void 0 ? void 0 : _b.includes('vite/dist/client'))) {
-            // missing dep pending reload, hold request until reload happens
-            server._pendingReload.then(() => 
-            // If the refresh has not happened after timeout, Vite considers
-            // something unexpected has happened. In this case, Vite
-            // returns an empty response that will error.
-            setTimeout(() => {
+            try {
+                // missing dep pending reload, hold request until reload happens
+                await Promise.race([
+                    server._pendingReload,
+                    // If the refresh has not happened after timeout, Vite considers
+                    // something unexpected has happened. In this case, Vite
+                    // returns an empty response that will error.
+                    new Promise((_, reject) => setTimeout(reject, NEW_DEPENDENCY_BUILD_TIMEOUT))
+                ]);
+            }
+            catch {
                 // Don't do anything if response has already been sent
-                if (res.writableEnded)
-                    return;
-                // status code request timeout
-                res.statusCode = 408;
-                res.end(`<h1>[vite] Something unexpected happened while optimizing "${req.url}"<h1>` +
-                    `<p>The current page should have reloaded by now</p>`);
-            }, NEW_DEPENDENCY_BUILD_TIMEOUT));
-            return;
+                if (!res.writableEnded) {
+                    // status code request timeout
+                    res.statusCode = 408;
+                    res.end(`<h1>[vite] Something unexpected happened while optimizing "${req.url}"<h1>` +
+                        `<p>The current page should have reloaded by now</p>`);
+                }
+                return;
+            }
         }
         let url = decodeURI(removeTimestampQuery(req.url)).replace(NULL_BYTE_PLACEHOLDER, '\0');
         const withoutQuery = cleanUrl(url);
@@ -57677,7 +57820,13 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
                 // add HTML Proxy to Map
                 addToHTMLProxyCache(config, url, scriptModuleIndex, contents);
                 // inline js module. convert to src="proxy"
-                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + url.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
+                const modulePath = `${config.base + htmlPath.slice(1)}?html-proxy&index=${scriptModuleIndex}.js`;
+                // invalidate the module so the newly cached contents will be served
+                const module = server === null || server === void 0 ? void 0 : server.moduleGraph.getModuleById(modulePath);
+                if (module) {
+                    server === null || server === void 0 ? void 0 : server.moduleGraph.invalidateModule(module);
+                }
+                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${modulePath}"></script>`);
             }
         }
         // elements with [href/src] attrs
@@ -57926,7 +58075,12 @@ async function handleHMRUpdate(file, server) {
         // auto restart server
         debugHmr(`[config change] ${source.dim(shortFile)}`);
         config.logger.info(source.green(`${path__default.relative(process.cwd(), file)} changed, restarting server...`), { clear: true, timestamp: true });
-        await server.restart();
+        try {
+            await server.restart();
+        }
+        catch (e) {
+            config.logger.error(source.red(e));
+        }
         return;
     }
     debugHmr(`[file change] ${source.dim(shortFile)}`);
@@ -63712,7 +63866,7 @@ ssr) {
     data.browserHash = require$$1$1.createHash('sha256')
         .update(data.hash + JSON.stringify(deps))
         .digest('hex')
-        .substr(0, 8);
+        .substring(0, 8);
     const missingIds = Object.keys(missing);
     if (missingIds.length) {
         throw new Error(`The following dependencies are imported but could not be resolved:\n\n  ${missingIds
@@ -63900,7 +64054,7 @@ function getDepHash(root, config) {
         }
         return value;
     });
-    return require$$1$1.createHash('sha256').update(content).digest('hex').substr(0, 8);
+    return require$$1$1.createHash('sha256').update(content).digest('hex').substring(0, 8);
 }
 
 var index$1 = {
@@ -67125,9 +67279,10 @@ function rebindErrorStacktrace(e, stacktrace) {
  * in development.
  */
 function ssrRequireHookPlugin(config) {
-    var _a;
+    var _a, _b;
     if (config.command !== 'build' ||
         !((_a = config.resolve.dedupe) === null || _a === void 0 ? void 0 : _a.length) ||
+        ((_b = config.ssr) === null || _b === void 0 ? void 0 : _b.noExternal) === true ||
         isBuildOutputEsm(config)) {
         return null;
     }
@@ -67350,19 +67505,24 @@ async function nodeImport(id, importer, resolveOptions) {
     }
     try {
         const mod = await dynamicImport(url);
-        return proxyESM(id, mod);
+        return proxyESM(mod);
     }
     finally {
         unhookNodeResolve();
     }
 }
 // rollup-style default import interop for cjs
-function proxyESM(id, mod) {
-    const defaultExport = mod.__esModule
-        ? mod.default
-        : mod.default
-            ? mod.default
-            : mod;
+function proxyESM(mod) {
+    // This is the only sensible option when the exports object is a primitve
+    if (isPrimitive(mod))
+        return { default: mod };
+    let defaultExport = 'default' in mod ? mod.default : mod;
+    if (!isPrimitive(defaultExport) && '__esModule' in defaultExport) {
+        mod = defaultExport;
+        if ('default' in defaultExport) {
+            defaultExport = defaultExport.default;
+        }
+    }
     return new Proxy(mod, {
         get(mod, prop) {
             var _a;
@@ -67372,6 +67532,9 @@ function proxyESM(id, mod) {
         }
     });
 }
+function isPrimitive(value) {
+    return !value || (typeof value !== 'object' && typeof value !== 'function');
+}
 
 /**
  * The amount to wait for requests to register newly found dependencies before triggering
@@ -67540,6 +67703,7 @@ async function createServer(inlineConfig = {}) {
         pluginContainer: container,
         ws,
         moduleGraph,
+        ssrTransform,
         transformWithEsbuild,
         transformRequest(url, options) {
             return transformRequest(url, server, options);
@@ -67852,7 +68016,7 @@ function resolveServerOptions(root, raw) {
 async function restartServer(server) {
     // @ts-ignore
     global.__vite_start_time = perf_hooks.performance.now();
-    const { port } = server.config.server;
+    const { port: prevPort, host: prevHost } = server.config.server;
     await server.close();
     let newServer = null;
     try {
@@ -67870,11 +68034,17 @@ async function restartServer(server) {
             server[key] = newServer[key];
         }
     }
-    if (!server.config.server.middlewareMode) {
+    const { logger, server: { port, host, middlewareMode } } = server.config;
+    if (!middlewareMode) {
         await server.listen(port, true);
+        logger.info('server restarted.', { timestamp: true });
+        if (port !== prevPort || host !== prevHost) {
+            logger.info('\n');
+            server.printUrls();
+        }
     }
     else {
-        server.config.logger.info('server restarted.', { timestamp: true });
+        logger.info('server restarted.', { timestamp: true });
     }
 }
 
@@ -81891,7 +82061,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     }
     // resolve public base url
     const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger);
-    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build);
+    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build, command === 'build');
     // resolve cache directory
     const pkgPath = lookupFile(resolvedRoot, [`package.json`], true /* pathOnly */);
     const cacheDir = config.cacheDir
@@ -82416,4 +82586,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-9aea22f6.js.map
+//# sourceMappingURL=dep-5496817b.js.map