vite 3.0.1 → 3.0.2

package/dist/node/chunks/{dep-10d8d214.js → dep-1513d487.js}

@@ -36137,7 +36137,7 @@ function getDepsOptimizer(config, ssr) {
 }
 async function initDepsOptimizer(config, server) {
     // Non Dev SSR Optimizer
-    const ssr = !!config.build.ssr;
+    const ssr = config.command === 'build' && !!config.build.ssr;
     if (!getDepsOptimizer(config, ssr)) {
         await createDepsOptimizer(config, server);
     }
@@ -36168,7 +36168,7 @@ async function initDevSsrDepsOptimizer(config, server) {
 async function createDepsOptimizer(config, server) {
     const { logger } = config;
     const isBuild = config.command === 'build';
-    const ssr = !!config.build.ssr; // safe as Dev SSR don't use this optimizer
+    const ssr = isBuild && !!config.build.ssr; // safe as Dev SSR don't use this optimizer
     const sessionTimestamp = Date.now().toString();
     const cachedMetadata = loadCachedDepOptimizationMetadata(config, ssr);
     let handle;
@@ -36684,7 +36684,7 @@ const jsMapExtensionRE = /\.js\.map$/i;
  */
 async function optimizeDeps(config, force = config.optimizeDeps.force, asCommand = false) {
     const log = asCommand ? config.logger.info : debug$a;
-    const ssr = !!config.build.ssr;
+    const ssr = config.command === 'build' && !!config.build.ssr;
     const cachedMetadata = loadCachedDepOptimizationMetadata(config, ssr, force, asCommand);
     if (cachedMetadata) {
         return cachedMetadata;
@@ -36819,7 +36819,8 @@ function depsLogString(qualifiedIds) {
  * Internally, Vite uses this function to prepare a optimizeDeps run. When Vite starts, we can get
  * the metadata and start the server without waiting for the optimizeDeps processing to be completed
  */
-async function runOptimizeDeps(resolvedConfig, depsInfo, ssr = !!resolvedConfig.build.ssr) {
+async function runOptimizeDeps(resolvedConfig, depsInfo, ssr = resolvedConfig.command === 'build' &&
+    !!resolvedConfig.build.ssr) {
     const isBuild = resolvedConfig.command === 'build';
     const config = {
         ...resolvedConfig,
@@ -37045,7 +37046,7 @@ function newDepOptimizationProcessing() {
 function depsFromOptimizedDepInfo(depsInfo) {
     return Object.fromEntries(Object.entries(depsInfo).map((d) => [d[0], d[1].src]));
 }
-function getOptimizedDepPath(id, config, ssr = !!config.build.ssr) {
+function getOptimizedDepPath(id, config, ssr) {
     return normalizePath$3(path$n.resolve(getDepsCacheDir(config, ssr), flattenId(id) + '.js'));
 }
 function getDepsCacheSuffix(config, ssr) {
@@ -39500,32 +39501,36 @@ function serveStaticMiddleware(dir, server) {
             isInternalRequest(req.url)) {
             return next();
         }
-        const url = decodeURIComponent(req.url);
+        const url = new URL(req.url, 'http://example.com');
+        const pathname = decodeURIComponent(url.pathname);
         // apply aliases to static requests as well
-        let redirected;
+        let redirectedPathname;
         for (const { find, replacement } of server.config.resolve.alias) {
-            const matches = typeof find === 'string' ? url.startsWith(find) : find.test(url);
+            const matches = typeof find === 'string'
+                ? pathname.startsWith(find)
+                : find.test(pathname);
             if (matches) {
-                redirected = url.replace(find, replacement);
+                redirectedPathname = pathname.replace(find, replacement);
                 break;
             }
         }
-        if (redirected) {
+        if (redirectedPathname) {
             // dir is pre-normalized to posix style
-            if (redirected.startsWith(dir)) {
-                redirected = redirected.slice(dir.length);
+            if (redirectedPathname.startsWith(dir)) {
+                redirectedPathname = redirectedPathname.slice(dir.length);
             }
         }
-        const resolvedUrl = redirected || url;
-        let fileUrl = path$n.resolve(dir, resolvedUrl.replace(/^\//, ''));
-        if (resolvedUrl.endsWith('/') && !fileUrl.endsWith('/')) {
+        const resolvedPathname = redirectedPathname || pathname;
+        let fileUrl = path$n.resolve(dir, resolvedPathname.replace(/^\//, ''));
+        if (resolvedPathname.endsWith('/') && !fileUrl.endsWith('/')) {
             fileUrl = fileUrl + '/';
         }
         if (!ensureServingAccess(fileUrl, server, res, next)) {
             return;
         }
-        if (redirected) {
-            req.url = encodeURIComponent(redirected);
+        if (redirectedPathname) {
+            url.pathname = encodeURIComponent(redirectedPathname);
+            req.url = url.href.slice(url.origin.length);
         }
         serve(req, res, next);
     };
@@ -39534,20 +39539,22 @@ function serveRawFsMiddleware(server) {
     const serveFromRoot = sirv('/', sirvOptions(server.config.server.headers));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServeRawFsMiddleware(req, res, next) {
-        let url = decodeURIComponent(req.url);
+        const url = new URL(req.url, 'http://example.com');
         // In some cases (e.g. linked monorepos) files outside of root will
         // reference assets that are also out of served root. In such cases
         // the paths are rewritten to `/@fs/` prefixed paths and must be served by
         // searching based from fs root.
-        if (url.startsWith(FS_PREFIX)) {
+        if (url.pathname.startsWith(FS_PREFIX)) {
+            const pathname = decodeURIComponent(url.pathname);
             // restrict files outside of `fs.allow`
-            if (!ensureServingAccess(slash$1(path$n.resolve(fsPathFromId(url))), server, res, next)) {
+            if (!ensureServingAccess(slash$1(path$n.resolve(fsPathFromId(pathname))), server, res, next)) {
                 return;
             }
-            url = url.slice(FS_PREFIX.length);
+            let newPathname = pathname.slice(FS_PREFIX.length);
             if (isWindows$4)
-                url = url.replace(/^[A-Z]:/i, '');
-            req.url = encodeURIComponent(url);
+                newPathname = newPathname.replace(/^[A-Z]:/i, '');
+            url.pathname = encodeURIComponent(newPathname);
+            req.url = url.href.slice(url.origin.length);
             serveFromRoot(req, res, next);
         }
         else {
@@ -41056,7 +41063,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await import('./dep-7d66befd.js').then(function (n) { return n.c; });
+    const { parse, transform } = await import('./dep-3f457808.js').then(function (n) { return n.c; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -42186,7 +42193,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-adbb28b2.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-f07a4e2f.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -50276,7 +50283,8 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
         if (dep[0] !== '.' && dep[0] !== '/') {
             return nodeImport(dep, mod.file, resolveOptions);
         }
-        dep = unwrapId(dep);
+        // convert to rollup URL because `pendingImports`, `moduleGraph.urlToModuleMap` requires that
+        dep = unwrapId(dep).replace(NULL_BYTE_PLACEHOLDER, '\0');
         if (!isCircular(dep) && !pendingImports.get(dep)?.some(isCircular)) {
             pendingDeps.push(dep);
             if (pendingDeps.length === 1) {
@@ -53520,11 +53528,11 @@ function initAsClient(websocket, address, protocols, options) {
     ? parsedUrl.hostname.slice(1, -1)
     : parsedUrl.hostname;
   opts.headers = {
+    ...opts.headers,
     'Sec-WebSocket-Version': opts.protocolVersion,
     'Sec-WebSocket-Key': key,
     Connection: 'Upgrade',
-    Upgrade: 'websocket',
-    ...opts.headers
+    Upgrade: 'websocket'
   };
   opts.path = parsedUrl.pathname + parsedUrl.search;
   opts.timeout = opts.handshakeTimeout;
@@ -53578,8 +53586,11 @@ function initAsClient(websocket, address, protocols, options) {
 
   if (opts.followRedirects) {
     if (websocket._redirects === 0) {
+      websocket._originalUnixSocket = isUnixSocket;
       websocket._originalSecure = isSecure;
-      websocket._originalHost = parsedUrl.host;
+      websocket._originalHostOrSocketPath = isUnixSocket
+        ? opts.socketPath
+        : parsedUrl.host;
 
       const headers = options && options.headers;
 
@@ -53595,7 +53606,13 @@ function initAsClient(websocket, address, protocols, options) {
         }
       }
     } else if (websocket.listenerCount('redirect') === 0) {
-      const isSameHost = parsedUrl.host === websocket._originalHost;
+      const isSameHost = isUnixSocket
+        ? websocket._originalUnixSocket
+          ? opts.socketPath === websocket._originalHostOrSocketPath
+          : false
+        : websocket._originalUnixSocket
+        ? false
+        : parsedUrl.host === websocket._originalHostOrSocketPath;
 
       if (!isSameHost || (websocket._originalSecure && !isSecure)) {
         //
@@ -56970,7 +56987,7 @@ function proxyMiddleware(httpServer, options, config) {
                     timestamp: true,
                     error: err
                 });
-                if (!res.writableEnded) {
+                if (!res.headersSent && !res.writableEnded) {
                     res
                         .writeHead(500, {
                         'Content-Type': 'text/plain'
@@ -57766,10 +57783,14 @@ class ModuleGraph {
         url = removeImportQuery(removeTimestampQuery(url));
         const resolved = await this.resolveId(url, !!ssr);
         const resolvedId = resolved?.id || url;
-        const ext = extname$1(cleanUrl(resolvedId));
-        const { pathname, search, hash } = parse$k(url);
-        if (ext && !pathname.endsWith(ext)) {
-            url = pathname + ext + (search || '') + (hash || '');
+        if (url !== resolvedId &&
+            !url.includes('\0') &&
+            !url.startsWith(`virtual:`)) {
+            const ext = extname$1(cleanUrl(resolvedId));
+            const { pathname, search, hash } = new URL(url, 'relative://');
+            if (ext && !pathname.endsWith(ext)) {
+                url = pathname + ext + search + hash;
+            }
         }
         return [url, resolvedId, resolved?.meta];
     }
@@ -61998,7 +62019,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
         wasmFallbackPlugin(),
         definePlugin(config),
         cssPostPlugin(config),
-        config.build.ssr ? ssrRequireHookPlugin(config) : null,
+        isBuild && config.build.ssr ? ssrRequireHookPlugin(config) : null,
         isBuild && buildHtmlPlugin(config),
         workerImportMetaUrlPlugin(config),
         ...buildPlugins.pre,

package/dist/node/chunks/{dep-7d66befd.js → dep-3f457808.js}

@@ -1,4 +1,4 @@
-import { A as getAugmentedNamespace, B as getDefaultExportFromCjs } from './dep-10d8d214.js';
+import { A as getAugmentedNamespace, B as getDefaultExportFromCjs } from './dep-1513d487.js';
 
 import { fileURLToPath as __cjs_fileURLToPath } from 'node:url';
 import { dirname as __cjs_dirname } from 'node:path';

package/dist/node/chunks/{dep-adbb28b2.js → dep-f07a4e2f.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { z as commonjsGlobal } from './dep-10d8d214.js';
+import { z as commonjsGlobal } from './dep-1513d487.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-10d8d214.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-1513d487.js';
 import { VERSION } from './constants.js';
 import 'node:fs';
 import 'node:path';
@@ -694,7 +694,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-10d8d214.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-1513d487.js').then(function (n) { return n.E; });
     try {
         const server = await createServer({
             root,
@@ -741,7 +741,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 import('./chunks/dep-10d8d214.js').then(function (n) { return n.D; });
+    const { build } = await import('./chunks/dep-1513d487.js').then(function (n) { return n.D; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -765,7 +765,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 import('./chunks/dep-10d8d214.js').then(function (n) { return n.C; });
+    const { optimizeDeps } = await import('./chunks/dep-1513d487.js').then(function (n) { return n.C; });
     try {
         const config = await resolveConfig({
             root,
@@ -788,7 +788,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 import('./chunks/dep-10d8d214.js').then(function (n) { return n.F; });
+    const { preview } = await import('./chunks/dep-1513d487.js').then(function (n) { return n.F; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-var version = "3.0.1";
+var version = "3.0.2";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-10d8d214.js';
+export { b as build, k as createFilter, u as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, h as getDepOptimizationConfig, i as isDepsOptimizerEnabled, l as loadConfigFromFile, w as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, g as resolveBaseUrl, e as resolveConfig, x as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, v as searchForWorkspaceRoot, q as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-1513d487.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/dist/node-cjs/publicUtils.cjs

@@ -31,7 +31,7 @@ var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 
-var version = "3.0.1";
+var version = "3.0.2";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -68,8 +68,8 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.18.8",
-    "@babel/types": "^7.18.8",
+    "@babel/parser": "^7.18.9",
+    "@babel/types": "^7.18.9",
     "@jridgewell/trace-mapping": "^0.3.14",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^22.0.1",
@@ -119,7 +119,7 @@
     "tslib": "^2.4.0",
     "types": "link:./types",
     "ufo": "^0.8.5",
-    "ws": "^8.8.0"
+    "ws": "^8.8.1"
   },
   "peerDependencies": {
     "less": "*",