vite 3.1.2 → 3.1.3

package/dist/node/chunks/{dep-b9b42dbd.js → dep-0fc42251.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { z as commonjsGlobal } from './dep-cff57044.js';
+import { z as commonjsGlobal } from './dep-557f29e6.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/chunks/{dep-cff57044.js → dep-557f29e6.js}

@@ -22,7 +22,7 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promisify as promisify$4 } from 'node:util';
 import { promises } from 'node:dns';
 import resolve$5 from 'resolve';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, NULL_BYTE_PLACEHOLDER, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, SPECIAL_QUERY_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5 from 'crypto';
 import require$$0$a from 'buffer';
 import { Buffer as Buffer$1 } from 'node:buffer';
@@ -7569,7 +7569,7 @@ function normalize (path) {
 }
 
 const isWrappedId = (id, suffix) => id.endsWith(suffix);
-const wrapId = (id, suffix) => `\0${id}${suffix}`;
+const wrapId$1 = (id, suffix) => `\0${id}${suffix}`;
 const unwrapId$1 = (wrappedId, suffix) => wrappedId.slice(1, -suffix.length);
 
 const PROXY_SUFFIX = '?commonjs-proxy';
@@ -7848,7 +7848,7 @@ function getResolveId(extensions, isPossibleCjsId) {
             return resolved.id + ENTRY_SUFFIX;
           }
           if (isCommonJS === IS_WRAPPED_COMMONJS) {
-            return { id: wrapId(resolved.id, ES_IMPORT_SUFFIX), meta: { commonjs: { resolved } } };
+            return { id: wrapId$1(resolved.id, ES_IMPORT_SUFFIX), meta: { commonjs: { resolved } } };
           }
         }
       }
@@ -8024,11 +8024,11 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
             })) || resolveExtensions(source, parentId, extensions);
           currentlyResolvingForParent.delete(source);
           if (!resolved) {
-            return { id: wrapId(source, EXTERNAL_SUFFIX), allowProxy: false };
+            return { id: wrapId$1(source, EXTERNAL_SUFFIX), allowProxy: false };
           }
           const childId = resolved.id;
           if (resolved.external) {
-            return { id: wrapId(childId, EXTERNAL_SUFFIX), allowProxy: false };
+            return { id: wrapId$1(childId, EXTERNAL_SUFFIX), allowProxy: false };
           }
           parentMeta.requires.push({ resolved, isConditional });
           await analyzeRequiredModule(parentId, resolved, isConditional, rollupContext.load);
@@ -8047,8 +8047,8 @@ function getRequireResolver(extensions, detectCyclesAndConditional, currentlyRes
           source: sources[index].source,
           id: allowProxy
             ? isCommonJS === IS_WRAPPED_COMMONJS
-              ? wrapId(dependencyId, WRAPPED_SUFFIX)
-              : wrapId(dependencyId, PROXY_SUFFIX)
+              ? wrapId$1(dependencyId, WRAPPED_SUFFIX)
+              : wrapId$1(dependencyId, PROXY_SUFFIX)
             : dependencyId,
           isCommonJS
         };
@@ -8549,12 +8549,12 @@ function getRequireHandlers() {
     if (exportMode === 'module') {
       imports.push(
         `import { __module as ${moduleName}, exports as ${exportsName} } from ${JSON.stringify(
-          wrapId(id, MODULE_SUFFIX)
+          wrapId$1(id, MODULE_SUFFIX)
         )}`
       );
     } else if (exportMode === 'exports') {
       imports.push(
-        `import { __exports as ${exportsName} } from ${JSON.stringify(wrapId(id, EXPORTS_SUFFIX))}`
+        `import { __exports as ${exportsName} } from ${JSON.stringify(wrapId$1(id, EXPORTS_SUFFIX))}`
       );
     }
     const requiresBySource = collectSources(requireExpressions);
@@ -11623,10 +11623,23 @@ const createFilter = createFilter$1;
 function slash$1(p) {
     return p.replace(/\\/g, '/');
 }
-// Strip valid id prefix. This is prepended to resolved Ids that are
-// not valid browser import specifiers by the importAnalysis plugin.
+/**
+ * Prepend `/@id/` and replace null byte so the id is URL-safe.
+ * This is prepended to resolved ids that are not valid browser
+ * import specifiers by the importAnalysis plugin.
+ */
+function wrapId(id) {
+    return id.startsWith(VALID_ID_PREFIX)
+        ? id
+        : VALID_ID_PREFIX + id.replace('\0', NULL_BYTE_PLACEHOLDER);
+}
+/**
+ * Undo {@link wrapId}'s `/@id/` and null byte replacements.
+ */
 function unwrapId(id) {
-    return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length) : id;
+    return id.startsWith(VALID_ID_PREFIX)
+        ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, '\0')
+        : id;
 }
 const flattenId = (id) => id
     .replace(/[\/:]/g, '_')
@@ -37596,8 +37609,7 @@ function importAnalysisPlugin(config) {
                 // prefix it to make it valid. We will strip this before feeding it
                 // back into the transform pipeline
                 if (!url.startsWith('.') && !url.startsWith('/')) {
-                    url =
-                        VALID_ID_PREFIX + resolved.id.replace('\0', NULL_BYTE_PLACEHOLDER);
+                    url = wrapId(resolved.id);
                 }
                 // make the URL browser-valid if not SSR
                 if (!ssr) {
@@ -37621,7 +37633,7 @@ function importAnalysisPlugin(config) {
                     // up-to-date version of this module.
                     try {
                         // delay setting `isSelfAccepting` until the file is actually used (#7870)
-                        const depModule = await moduleGraph.ensureEntryFromUrl(url, ssr, canSkipImportAnalysis(url));
+                        const depModule = await moduleGraph.ensureEntryFromUrl(unwrapId(url), ssr, canSkipImportAnalysis(url));
                         if (depModule.lastHMRTimestamp > 0) {
                             url = injectQuery(url, `t=${depModule.lastHMRTimestamp}`);
                         }
@@ -37749,15 +37761,15 @@ function importAnalysisPlugin(config) {
                         }
                     }
                     // record for HMR import chain analysis
-                    // make sure to normalize away base
-                    const urlWithoutBase = url.replace(base, '/');
-                    importedUrls.add(urlWithoutBase);
+                    // make sure to unwrap and normalize away base
+                    const hmrUrl = unwrapId(url.replace(base, '/'));
+                    importedUrls.add(hmrUrl);
                     if (enablePartialAccept && importedBindings) {
                         extractImportedBindings(resolvedId, source, imports[index], importedBindings);
                     }
                     if (!isDynamicImport) {
                         // for pre-transforming
-                        staticImportedUrls.add({ url: urlWithoutBase, id: resolvedId });
+                        staticImportedUrls.add({ url: hmrUrl, id: resolvedId });
                     }
                 }
                 else if (!importer.startsWith(clientDir)) {
@@ -37864,7 +37876,7 @@ function importAnalysisPlugin(config) {
             // by the deps optimizer
             if (config.server.preTransformRequests && staticImportedUrls.size) {
                 staticImportedUrls.forEach(({ url, id }) => {
-                    url = unwrapId(removeImportQuery(url)).replace(NULL_BYTE_PLACEHOLDER, '\0');
+                    url = removeImportQuery(url);
                     transformRequest(url, server, { ssr }).catch((e) => {
                         if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP) {
                             // This are expected errors
@@ -42582,8 +42594,20 @@ function stringifyDepsOptimizerMetadata(metadata, depsCacheDir) {
     }, 2);
 }
 function esbuildOutputFromId(outputs, id, cacheDirOutputPath) {
+    const cwd = process.cwd();
     const flatId = flattenId(id) + '.js';
-    return outputs[normalizePath$3(path$n.relative(process.cwd(), path$n.join(cacheDirOutputPath, flatId)))];
+    const normalizedOutputPath = normalizePath$3(path$n.relative(cwd, path$n.join(cacheDirOutputPath, flatId)));
+    const output = outputs[normalizedOutputPath];
+    if (output) {
+        return output;
+    }
+    // If the root dir was symlinked, esbuild could return output keys as `../cwd/`
+    // Normalize keys to support this case too
+    for (const [key, value] of Object.entries(outputs)) {
+        if (normalizePath$3(path$n.relative(cwd, key)) === normalizedOutputPath) {
+            return value;
+        }
+    }
 }
 async function extractExportsData(filePath, config, ssr) {
     await init;
@@ -44487,7 +44511,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-b9b42dbd.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-0fc42251.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -45644,7 +45668,7 @@ async function doBuild(inlineConfig = {}) {
     config.logger.info(picocolors.exports.cyan(`vite v${VERSION} ${picocolors.exports.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
     const resolve = (p) => path$n.resolve(config.root, p);
     const input = libOptions
-        ? resolve(libOptions.entry)
+        ? options.rollupOptions?.input || resolve(libOptions.entry)
         : typeof options.ssr === 'string'
             ? resolve(options.ssr)
             : options.rollupOptions?.input || resolve('index.html');
@@ -53276,7 +53300,7 @@ function rebindErrorStacktrace(e, stacktrace) {
 const pendingModules = new Map();
 const pendingImports = new Map();
 async function ssrLoadModule(url, server, context = { global }, urlStack = [], fixStacktrace) {
-    url = unwrapId(url).replace(NULL_BYTE_PLACEHOLDER, '\0');
+    url = unwrapId(url);
     // when we instantiate multiple dependency modules in parallel, they may
     // point to shared modules. We need to avoid duplicate instantiation attempts
     // by register every module as pending synchronously so that all subsequent
@@ -53346,7 +53370,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
             return nodeImport(dep, mod.file, resolveOptions);
         }
         // convert to rollup URL because `pendingImports`, `moduleGraph.urlToModuleMap` requires that
-        dep = unwrapId(dep).replace(NULL_BYTE_PLACEHOLDER, '\0');
+        dep = unwrapId(dep);
         if (!isCircular(dep) && !pendingImports.get(dep)?.some(isCircular)) {
             pendingDeps.push(dep);
             if (pendingDeps.length === 1) {
@@ -60557,7 +60581,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         // and ids are properly handled
         const validPath = `${htmlPath}${trailingSlash ? 'index.html' : ''}`;
         proxyModulePath = `\0${validPath}`;
-        proxyModuleUrl = `${VALID_ID_PREFIX}${NULL_BYTE_PLACEHOLDER}${validPath}`;
+        proxyModuleUrl = wrapId(proxyModulePath);
     }
     const s = new MagicString(html);
     let inlineModuleIndex = -1;

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-cff57044.js';
+import { y as picocolors, u as createLogger, e as resolveConfig } from './chunks/dep-557f29e6.js';
 import { VERSION } from './constants.js';
 import 'node:fs';
 import 'node:path';
@@ -695,7 +695,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-cff57044.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-557f29e6.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -742,7 +742,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-cff57044.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-557f29e6.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -766,7 +766,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-cff57044.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-557f29e6.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -789,7 +789,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-cff57044.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-557f29e6.js').then(function (n) { return n.D; });
     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.1.2";
+var version = "3.1.3";
 
 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-cff57044.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-557f29e6.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.1.2";
+var version = "3.1.3";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",