vite 5.0.0-beta.19 → 5.0.0-beta.20

package/dist/node/chunks/{dep-ZzZNTu4r.js → dep-M-BNPx05.js}

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-uqAlfqPp.js';
+import { y as getDefaultExportFromCjs } from './dep-T98iZFpD.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-8a-6Quh6.js';

package/dist/node/chunks/{dep-uqAlfqPp.js → dep-T98iZFpD.js}

@@ -12,7 +12,8 @@ import * as require$$0$2 from 'fs';
 import require$$0__default, { existsSync, readFileSync, statSync as statSync$1, readdirSync } from 'fs';
 import require$$0$5 from 'events';
 import require$$5 from 'assert';
-import { createServer as createServer$3, STATUS_CODES, get as get$1 } from 'node:http';
+import { createServer as createServer$3, STATUS_CODES, get as get$2 } from 'node:http';
+import { createServer as createServer$2, get as get$1 } from 'node:https';
 import require$$0$6 from 'util';
 import require$$4$1 from 'net';
 import require$$0$9 from 'url';
@@ -36,7 +37,6 @@ import { parseAstAsync, parseAst } from 'rollup/parseAst';
 import * as qs from 'querystring';
 import readline from 'node:readline';
 import { EventEmitter as EventEmitter$4 } from 'node:events';
-import { createServer as createServer$2 } from 'node:https';
 import require$$0$b from 'zlib';
 import require$$0$c from 'buffer';
 import require$$1$2 from 'https';
@@ -12277,12 +12277,12 @@ function numberToPos(source, offset) {
 }
 function generateCodeFrame(source, start = 0, end) {
     start = posToNumber(source, start);
-    end = end || start;
+    end = end !== undefined ? posToNumber(source, end) : start;
     const lines = source.split(splitRE);
     let count = 0;
     const res = [];
     for (let i = 0; i < lines.length; i++) {
-        count += lines[i].length + 1;
+        count += lines[i].length;
         if (count >= start) {
             for (let j = i - range; j <= i + range || end > count; j++) {
                 if (j < 0 || j >= lines.length)
@@ -12292,7 +12292,7 @@ function generateCodeFrame(source, start = 0, end) {
                 const lineLength = lines[j].length;
                 if (j === i) {
                     // push underline
-                    const pad = Math.max(start - (count - lineLength) + 1, 0);
+                    const pad = Math.max(start - (count - lineLength), 0);
                     const length = Math.max(1, end > count ? lineLength - pad : end - start);
                     res.push(`   |  ` + ' '.repeat(pad) + '^'.repeat(length));
                 }
@@ -12306,6 +12306,7 @@ function generateCodeFrame(source, start = 0, end) {
             }
             break;
         }
+        count++;
     }
     return res.join('\n');
 }
@@ -14692,14 +14693,7 @@ function resolveEsbuildTranspileOptions(config, format) {
 function prettifyMessage(m, code) {
     let res = colors$1.yellow(m.text);
     if (m.location) {
-        const lines = code.split(/\r?\n/g);
-        const line = Number(m.location.line);
-        const column = Number(m.location.column);
-        const offset = lines
-            .slice(0, line - 1)
-            .map((l) => l.length)
-            .reduce((total, l) => total + l + 1, 0) + column;
-        res += `\n` + generateCodeFrame(code, offset, offset + 1);
+        res += `\n` + generateCodeFrame(code, m.location);
     }
     return res + `\n`;
 }
@@ -27638,7 +27632,7 @@ function resolvePlugin(resolveOptions) {
                         }
                         else if (isProduction) {
                             this.warn(`Module "${id}" has been externalized for browser compatibility, imported by "${importer}". ` +
-                                `See http://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.`);
+                                `See https://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.`);
                         }
                         return isProduction
                             ? browserExternalId
@@ -27658,7 +27652,7 @@ function resolvePlugin(resolveOptions) {
                     return `\
 export default new Proxy({}, {
   get(_, key) {
-    throw new Error(\`Module "${id}" has been externalized for browser compatibility. Cannot access "${id}.\${key}" in client code.  See http://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.\`)
+    throw new Error(\`Module "${id}" has been externalized for browser compatibility. Cannot access "${id}.\${key}" in client code.  See https://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.\`)
   }
 })`;
                 }
@@ -36921,7 +36915,7 @@ function formatParseError(parserError, id, html) {
     const formattedError = {
         code: parserError.code,
         message: `parse5 error code ${parserError.code}`,
-        frame: generateCodeFrame(html, parserError.startOffset),
+        frame: generateCodeFrame(html, parserError.startOffset, parserError.endOffset),
         loc: {
             file: id,
             line: parserError.startLine,
@@ -38443,13 +38437,17 @@ async function compileCSS(id, code, config, urlReplacer) {
                 }
             }
             else if (message.type === 'warning') {
-                let msg = `[vite:css] ${message.text}`;
-                if (message.line && message.column) {
-                    msg += `\n${generateCodeFrame(code, {
-                        line: message.line,
-                        column: message.column,
-                    })}`;
-                }
+                const warning = message;
+                let msg = `[vite:css] ${warning.text}`;
+                msg += `\n${generateCodeFrame(code, {
+                    line: warning.line,
+                    column: warning.column - 1, // 1-based
+                }, warning.endLine !== undefined && warning.endColumn !== undefined
+                    ? {
+                        line: warning.endLine,
+                        column: warning.endColumn - 1, // 1-based
+                    }
+                    : undefined)}`;
                 config.logger.warn(colors$1.yellow(msg));
             }
         }
@@ -38458,8 +38456,9 @@ async function compileCSS(id, code, config, urlReplacer) {
         e.message = `[postcss] ${e.message}`;
         e.code = code;
         e.loc = {
-            column: e.column,
+            file: e.file,
             line: e.line,
+            column: e.column - 1, // 1-based
         };
         throw e;
     }
@@ -38497,8 +38496,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-ZzZNTu4r.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-dkmuXKZ9.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-M-BNPx05.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-_v8GkZ9b.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -39532,7 +39531,7 @@ module.exports = Object.create(new Proxy({}, {
       key !== 'constructor' &&
       key !== 'splice'
     ) {
-      console.warn(\`Module "${path}" has been externalized for browser compatibility. Cannot access "${path}.\${key}" in client code. See http://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.\`)
+      console.warn(\`Module "${path}" has been externalized for browser compatibility. Cannot access "${path}.\${key}" in client code. See https://vitejs.dev/guide/troubleshooting.html#module-externalized-for-browser-compatibility for more details.\`)
     }
   }
 }))`,
@@ -48258,8 +48257,7 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
         const importId = `__vite_ssr_import_${uid++}__`;
         // Reduce metadata to undefined if it's all default values
         if (metadata &&
-            (metadata.namedImportSpecifiers == null ||
-                metadata.namedImportSpecifiers.length === 0)) {
+            (metadata.importedNames == null || metadata.importedNames.length === 0)) {
             metadata = undefined;
         }
         const metadataStr = metadata ? `, ${JSON.stringify(metadata)}` : '';
@@ -48279,9 +48277,14 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
         // import * as ok from 'foo' --> ok -> __import_foo__
         if (node.type === 'ImportDeclaration') {
             const importId = defineImport(node.source.value, {
-                namedImportSpecifiers: node.specifiers
-                    .map((s) => s.type === 'ImportSpecifier' && s.imported.name)
-                    .filter(Boolean),
+                importedNames: node.specifiers
+                    .map((s) => {
+                    if (s.type === 'ImportSpecifier')
+                        return s.imported.name;
+                    else if (s.type === 'ImportDefaultSpecifier')
+                        return 'default';
+                })
+                    .filter(isDefined),
             });
             s.remove(node.start, node.end);
             for (const spec of node.specifiers) {
@@ -48324,7 +48327,7 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
                 if (node.source) {
                     // export { foo, bar } from './foo'
                     const importId = defineImport(node.source.value, {
-                        namedImportSpecifiers: node.specifiers.map((s) => s.local.name),
+                        importedNames: node.specifiers.map((s) => s.local.name),
                     });
                     // hoist re-exports near the defined import so they are immediately exported
                     for (const spec of node.specifiers) {
@@ -48980,13 +48983,13 @@ function analyzeImportedModDifference(mod, filePath, rawId, metadata, packageCac
         return;
     // For non-ESM, named imports is done via static analysis with cjs-module-lexer in Node.js.
     // If the user named imports a specifier that can't be analyzed, error.
-    if (metadata?.namedImportSpecifiers?.length) {
-        const missingBindings = metadata.namedImportSpecifiers.filter((s) => !(s in mod));
+    if (metadata?.importedNames?.length) {
+        const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
         if (missingBindings.length) {
             const lastBinding = missingBindings[missingBindings.length - 1];
             // Copied from Node.js
             throw new SyntaxError(`\
-Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
 CommonJS modules can always be imported via the default export, for example using:
 
 import pkg from '${rawId}';
@@ -48999,11 +49002,15 @@ const {${missingBindings.join(', ')}} = pkg;
  * Guard invalid named exports only, similar to how Node.js errors for top-level imports.
  * But since we transform as dynamic imports, we need to emulate the error manually.
  */
-function proxyGuardOnlyEsm(mod, rawId) {
+function proxyGuardOnlyEsm(mod, rawId, metadata) {
+    // If the module doesn't import anything explicitly, e.g. `import 'foo'` or
+    // `import * as foo from 'foo'`, we can skip the proxy guard.
+    if (!metadata?.importedNames?.length)
+        return mod;
     return new Proxy(mod, {
         get(mod, prop) {
             if (prop !== 'then' && !(prop in mod)) {
-                throw new SyntaxError(`The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
+                throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
             }
             return mod[prop];
         },
@@ -58414,7 +58421,8 @@ async function _createServer(inlineConfig = {}, options) {
                 // preTransformRequests needs to be enabled for this optimization.
                 if (server.config.server.preTransformRequests) {
                     setTimeout(() => {
-                        get$1(path, {
+                        const getMethod = path.startsWith('https:') ? get$1 : get$2;
+                        getMethod(path, {
                             headers: {
                                 // Allow the history middleware to redirect to /index.html
                                 Accept: 'text/html',
@@ -58575,7 +58583,10 @@ async function _createServer(inlineConfig = {}, options) {
     // proxy
     const { proxy } = serverConfig;
     if (proxy) {
-        middlewares.use(proxyMiddleware(httpServer, proxy, config));
+        const middlewareServer = (isObject$1(serverConfig.middlewareMode)
+            ? serverConfig.middlewareMode.server
+            : null) || httpServer;
+        middlewares.use(proxyMiddleware(middlewareServer, proxy, config));
     }
     // base
     if (config.base !== '/') {
@@ -59988,7 +59999,8 @@ function importAnalysisPlugin(config) {
                     url = resolved.id.slice(root.length);
                 }
                 else if (depsOptimizer?.isOptimizedDepFile(resolved.id) ||
-                    fs$l.existsSync(cleanUrl(resolved.id))) {
+                    (path$o.isAbsolute(cleanUrl(resolved.id)) &&
+                        fs$l.existsSync(cleanUrl(resolved.id)))) {
                     // an optimized deps may not yet exists in the filesystem, or
                     // a regular file exists but is out of root: rewrite to absolute /@fs/ paths
                     url = path$o.posix.join(FS_PREFIX, resolved.id);
@@ -60199,7 +60211,7 @@ function importAnalysisPlugin(config) {
                             this.warn(`\n` +
                                 colors$1.cyan(importerModule.file) +
                                 `\n` +
-                                colors$1.reset(generateCodeFrame(source, start)) +
+                                colors$1.reset(generateCodeFrame(source, start, end)) +
                                 colors$1.yellow(`\nThe above dynamic import cannot be analyzed by Vite.\n` +
                                     `See ${colors$1.blue(`https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations`)} ` +
                                     `for supported dynamic import formats. ` +
@@ -61690,9 +61702,6 @@ async function createPluginContainer(config, moduleGraph, watcher) {
         if (err.pluginCode) {
             return err; // The plugin likely called `this.error`
         }
-        if (err.file && err.name === 'CssSyntaxError') {
-            err.id = normalizePath$3(err.file);
-        }
         if (ctx._activePlugin)
             err.plugin = ctx._activePlugin.name;
         if (ctx._activeId && !err.id)
@@ -61738,7 +61747,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                     line: err.line,
                     column: err.column,
                 };
-                err.frame = err.frame || generateCodeFrame(err.id, err.loc);
+                err.frame = err.frame || generateCodeFrame(ctx._activeCode, err.loc);
             }
             if (ctx instanceof TransformContext &&
                 typeof err.loc?.line === 'number' &&
@@ -66206,7 +66215,7 @@ async function bundleConfigFile(fileName, isESM) {
                                 }
                                 catch { }
                                 if (canResolveWithImport) {
-                                    throw new Error(`Failed to resolve ${JSON.stringify(id)}. This package is ESM only but it was tried to load by \`require\`. See http://vitejs.dev/guide/troubleshooting.html#this-package-is-esm-only for more details.`);
+                                    throw new Error(`Failed to resolve ${JSON.stringify(id)}. This package is ESM only but it was tried to load by \`require\`. See https://vitejs.dev/guide/troubleshooting.html#this-package-is-esm-only for more details.`);
                                 }
                             }
                             throw e;
@@ -66217,7 +66226,7 @@ async function bundleConfigFile(fileName, isESM) {
                         if (idFsPath &&
                             !isImport &&
                             isFilePathESM(idFsPath, packageCache)) {
-                            throw new Error(`${JSON.stringify(id)} resolved to an ESM file. ESM file cannot be loaded by \`require\`. See http://vitejs.dev/guide/troubleshooting.html#this-package-is-esm-only for more details.`);
+                            throw new Error(`${JSON.stringify(id)} resolved to an ESM file. ESM file cannot be loaded by \`require\`. See https://vitejs.dev/guide/troubleshooting.html#this-package-is-esm-only for more details.`);
                         }
                         return {
                             path: idFsPath,

package/dist/node/chunks/{dep-dkmuXKZ9.js → dep-_v8GkZ9b.js}

@@ -1,4 +1,4 @@
-import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-uqAlfqPp.js';
+import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-T98iZFpD.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-uqAlfqPp.js';
+import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-T98iZFpD.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -14,6 +14,7 @@ import 'path';
 import 'fs';
 import 'assert';
 import 'node:http';
+import 'node:https';
 import 'util';
 import 'net';
 import 'url';
@@ -36,7 +37,6 @@ import 'rollup/parseAst';
 import 'querystring';
 import 'node:readline';
 import 'node:events';
-import 'node:https';
 import 'zlib';
 import 'buffer';
 import 'https';
@@ -759,7 +759,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-uqAlfqPp.js').then(function (n) { return n.A; });
+    const { createServer } = await import('./chunks/dep-T98iZFpD.js').then(function (n) { return n.A; });
     try {
         const server = await createServer({
             root,
@@ -839,7 +839,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-uqAlfqPp.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-T98iZFpD.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -867,7 +867,7 @@ cli
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-uqAlfqPp.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-T98iZFpD.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -893,7 +893,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-uqAlfqPp.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-T98iZFpD.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -1508,7 +1508,14 @@ interface ServerOptions extends CommonServerOptions {
      * Create Vite dev server to be used as a middleware in an existing server
      * @default false
      */
-    middlewareMode?: boolean;
+    middlewareMode?: boolean | {
+        /**
+         * Parent server instance to attach to
+         *
+         * This is needed to proxy WebSocket connections to the parent server.
+         */
+        server: http.Server;
+    };
     /**
      * Options for files served via '/\@fs/'.
      */

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules } from './chunks/dep-uqAlfqPp.js';
-export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-uqAlfqPp.js';
+import { i as isInNodeModules } from './chunks/dep-T98iZFpD.js';
+export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-T98iZFpD.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -17,6 +17,7 @@ import 'fs';
 import 'events';
 import 'assert';
 import 'node:http';
+import 'node:https';
 import 'util';
 import 'net';
 import 'url';
@@ -37,7 +38,6 @@ import 'node:v8';
 import 'querystring';
 import 'node:readline';
 import 'node:events';
-import 'node:https';
 import 'zlib';
 import 'buffer';
 import 'https';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.19",
+  "version": "5.0.0-beta.20",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",