vite 4.2.0-beta.2 → 4.2.1

package/dist/node/chunks/{dep-84d7cc5e.js → dep-79892de8.js}

@@ -11565,7 +11565,8 @@ function unwrapId(id) {
 const flattenId = (id) => id
     .replace(/[/:]/g, '_')
     .replace(/\./g, '__')
-    .replace(/(\s*>\s*)/g, '___');
+    .replace(/(\s*>\s*)/g, '___')
+    .replace(/#/g, '____');
 const normalizeId = (id) => id.replace(/(\s*>\s*)/g, ' > ');
 //TODO: revisit later to see if the edge case that "compiling using node v12 code to be run in node v16 in the server" is what we intend to support.
 const builtins = new Set([
@@ -11617,11 +11618,11 @@ function resolveFrom(id, basedir, preserveSymlinks = false, ssr = false) {
  * like `resolveFrom` but supports resolving `>` path in `id`,
  * for example: `foo > bar > baz`
  */
-function nestedResolveFrom(id, basedir, preserveSymlinks = false) {
+function nestedResolveFrom(id, basedir, preserveSymlinks = false, ssr = false) {
     const pkgs = id.split('>').map((pkg) => pkg.trim());
     try {
         for (const pkg of pkgs) {
-            basedir = resolveFrom(pkg, basedir, preserveSymlinks);
+            basedir = resolveFrom(pkg, basedir, preserveSymlinks, ssr);
         }
     }
     catch { }
@@ -16023,7 +16024,7 @@ const debug$e = createDebugger('vite:sourcemap', {
 // Virtual modules should be prefixed with a null byte to avoid a
 // false positive "missing source" warning. We also check for certain
 // prefixes used for special handling in esbuildDepPlugin.
-const virtualSourceRE = /^(?:\0|dep:|browser-external:)/;
+const virtualSourceRE = /^(?:dep:|browser-external:|virtual:)|\0/;
 async function injectSourcesContent(map, file, logger) {
     let sourceRoot;
     try {
@@ -22465,18 +22466,31 @@ function webWorkerPlugin(config) {
                 getDepsOptimizer(config, ssr)?.registerWorkersSource(id);
                 if (query.inline != null) {
                     const chunk = await bundleWorkerEntry(config, id, query);
-                    // inline as blob data url
+                    const encodedJs = `const encodedJs = "${Buffer.from(chunk.code).toString('base64')}";`;
+                    const code = 
+                    // Using blob URL for SharedWorker results in multiple instances of a same worker
+                    workerConstructor === 'Worker'
+                        ? `${encodedJs}
+          const blob = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs)], { type: "text/javascript;charset=utf-8" });
+          export default function WorkerWrapper() {
+            let objURL;
+            try {
+              objURL = blob && (window.URL || window.webkitURL).createObjectURL(blob);
+              if (!objURL) throw ''
+              return new ${workerConstructor}(objURL)
+            } catch(e) {
+              return new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
+            } finally {
+              objURL && (window.URL || window.webkitURL).revokeObjectURL(objURL);
+            }
+          }`
+                        : `${encodedJs}
+          export default function WorkerWrapper() {
+            return new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
+          }
+          `;
                     return {
-                        code: `const encodedJs = "${Buffer.from(chunk.code).toString('base64')}";
-            const blob = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs)], { type: "text/javascript;charset=utf-8" });
-            export default function WorkerWrapper() {
-              const objURL = blob && (window.URL || window.webkitURL).createObjectURL(blob);
-              try {
-                return objURL ? new ${workerConstructor}(objURL) : new ${workerConstructor}("data:application/javascript;base64," + encodedJs${workerOptions});
-              } finally {
-                objURL && (window.URL || window.webkitURL).revokeObjectURL(objURL);
-              }
-            }`,
+                        code,
                         // Empty sourcemap to suppress Rollup warning
                         map: { mappings: '' },
                     };
@@ -22589,7 +22603,14 @@ function resolvePlugin(resolveOptions) {
                 if (!pkgJsonPath)
                     return;
                 const pkgData = loadPackageData(pkgJsonPath, options.preserveSymlinks);
-                return resolveExportsOrImports(pkgData.data, id, options, targetWeb, 'imports');
+                let importsPath = resolveExportsOrImports(pkgData.data, id, options, targetWeb, 'imports');
+                if (importsPath?.startsWith('.')) {
+                    importsPath = path$o.relative(basedir, path$o.join(path$o.dirname(pkgJsonPath), importsPath));
+                    if (!importsPath.startsWith('.')) {
+                        importsPath = `./${importsPath}`;
+                    }
+                }
+                return importsPath;
             };
             const resolvedImports = resolveSubpathImports(id, importer);
             if (resolvedImports) {
@@ -22892,22 +22913,15 @@ function tryResolveFile(file, postfix, options, tryIndex, targetWeb, tryPrefix,
     }
 }
 const idToPkgMap = new Map();
-function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, externalize, allowLinkedExternal = true) {
+function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = false, externalize, allowLinkedExternal = true) {
     const { root, dedupe, isBuild, preserveSymlinks, packageCache } = options;
-    ssr ?? (ssr = false);
-    // split id by last '>' for nested selected packages, for example:
-    // 'foo > bar > baz' => 'foo > bar' & 'baz'
-    // 'foo'             => ''          & 'foo'
-    const lastArrowIndex = id.lastIndexOf('>');
-    const nestedRoot = id.substring(0, lastArrowIndex).trim();
-    const nestedPath = id.substring(lastArrowIndex + 1).trim();
     const possiblePkgIds = [];
     for (let prevSlashIndex = -1;;) {
-        let slashIndex = nestedPath.indexOf('/', prevSlashIndex + 1);
+        let slashIndex = id.indexOf('/', prevSlashIndex + 1);
         if (slashIndex < 0) {
-            slashIndex = nestedPath.length;
+            slashIndex = id.length;
         }
-        const part = nestedPath.slice(prevSlashIndex + 1, (prevSlashIndex = slashIndex));
+        const part = id.slice(prevSlashIndex + 1, (prevSlashIndex = slashIndex));
         if (!part) {
             break;
         }
@@ -22918,7 +22932,7 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         if (possiblePkgIds.length ? path$o.extname(part) : part[0] === '@') {
             continue;
         }
-        const possiblePkgId = nestedPath.slice(0, slashIndex);
+        const possiblePkgId = id.slice(0, slashIndex);
         possiblePkgIds.push(possiblePkgId);
     }
     let basedir;
@@ -22933,10 +22947,6 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
     else {
         basedir = root;
     }
-    // nested node module, step-by-step resolve to the basedir of the nestedPath
-    if (nestedRoot) {
-        basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks);
-    }
     let pkg;
     let pkgId;
     // nearest package.json
@@ -22959,19 +22969,19 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
         // if import can't be found, check if it's an optional peer dep.
         // if so, we can resolve to a special id that errors only when imported.
         if (basedir !== root && // root has no peer dep
-            !isBuiltin(nestedPath) &&
-            !nestedPath.includes('\0') &&
-            bareImportRE.test(nestedPath)) {
+            !isBuiltin(id) &&
+            !id.includes('\0') &&
+            bareImportRE.test(id)) {
             // find package.json with `name` as main
             const mainPackageJson = lookupFile(basedir, ['package.json'], {
                 predicate: (content) => !!JSON.parse(content).name,
             });
             if (mainPackageJson) {
                 const mainPkg = JSON.parse(mainPackageJson);
-                if (mainPkg.peerDependencies?.[nestedPath] &&
-                    mainPkg.peerDependenciesMeta?.[nestedPath]?.optional) {
+                if (mainPkg.peerDependencies?.[id] &&
+                    mainPkg.peerDependenciesMeta?.[id]?.optional) {
                     return {
-                        id: `${optionalPeerDepId}:${nestedPath}:${mainPkg.name}`,
+                        id: `${optionalPeerDepId}:${id}:${mainPkg.name}`,
                     };
                 }
             }
@@ -22980,10 +22990,10 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
     }
     let resolveId = resolvePackageEntry;
     let unresolvedId = pkgId;
-    const isDeepImport = unresolvedId !== nestedPath;
+    const isDeepImport = unresolvedId !== id;
     if (isDeepImport) {
         resolveId = resolveDeepImport;
-        unresolvedId = '.' + nestedPath.slice(pkgId.length);
+        unresolvedId = '.' + id.slice(pkgId.length);
     }
     let resolved;
     try {
@@ -23064,16 +23074,14 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr, ex
     const skipOptimization = !isJsType ||
         importer?.includes('node_modules') ||
         exclude?.includes(pkgId) ||
-        exclude?.includes(nestedPath) ||
+        exclude?.includes(id) ||
         SPECIAL_QUERY_RE.test(resolved) ||
         // During dev SSR, we don't have a way to reload the module graph if
         // a non-optimized dep is found. So we need to skip optimization here.
         // The only optimized deps are the ones explicitly listed in the config.
         (!options.ssrOptimizeCheck && !isBuild && ssr) ||
         // Only optimize non-external CJS deps during SSR by default
-        (ssr &&
-            !isCJS &&
-            !(include?.includes(pkgId) || include?.includes(nestedPath)));
+        (ssr && !isCJS && !(include?.includes(pkgId) || include?.includes(id)));
     if (options.ssrOptimizeCheck) {
         return {
             id: skipOptimization
@@ -37079,7 +37087,7 @@ function handleParseError(parserError, html, filePath) {
 function buildHtmlPlugin(config) {
     const [preHooks, normalHooks, postHooks] = resolveHtmlTransforms(config.plugins);
     preHooks.unshift(preImportMapHook(config));
-    normalHooks.unshift(htmlEnvHook(config));
+    preHooks.push(htmlEnvHook(config));
     postHooks.push(postImportMapHook());
     const processedHtml = new Map();
     const isExcludedUrl = (url) => url.startsWith('#') ||
@@ -37904,7 +37912,9 @@ function cssPostPlugin(config) {
                 const getContentWithSourcemap = async (content) => {
                     if (config.css?.devSourcemap) {
                         const sourcemap = this.getCombinedSourcemap();
-                        await injectSourcesContent(sourcemap, cleanUrl(id), config.logger);
+                        if (sourcemap.mappings && !sourcemap.sourcesContent) {
+                            await injectSourcesContent(sourcemap, cleanUrl(id), config.logger);
+                        }
                         return getCodeWithSourcemap('css', content, sourcemap);
                     }
                     return content;
@@ -38311,7 +38321,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-80b98891.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-f63b56ae.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -44877,18 +44887,13 @@ async function addManuallyIncludedOptimizeDeps(deps, config, ssr, extra = [], fi
                 logger.warn(`${msg}: ${picocolorsExports.cyan(id)}, present in '${ssr ? 'ssr.' : ''}optimizeDeps.include'`);
             }
         };
-        const resolve = config.createResolver({
-            asSrc: false,
-            scan: true,
-            ssrOptimizeCheck: ssr,
-            ssrConfig: config.ssr,
-        });
+        const resolve = createOptimizeDepsIncludeResolver(config, ssr);
         for (const id of [...optimizeDepsInclude, ...extra]) {
             // normalize 'foo   >bar` as 'foo > bar' to prevent same id being added
             // and for pretty printing
             const normalizedId = normalizeId(id);
             if (!deps[normalizedId] && filter?.(normalizedId) !== false) {
-                const entry = await resolve(id, undefined, undefined, ssr);
+                const entry = await resolve(id);
                 if (entry) {
                     if (isOptimizable(entry, optimizeDeps)) {
                         if (!entry.endsWith('?__vite_skip_optimization')) {
@@ -44906,6 +44911,26 @@ async function addManuallyIncludedOptimizeDeps(deps, config, ssr, extra = [], fi
         }
     }
 }
+function createOptimizeDepsIncludeResolver(config, ssr) {
+    const resolve = config.createResolver({
+        asSrc: false,
+        scan: true,
+        ssrOptimizeCheck: ssr,
+        ssrConfig: config.ssr,
+    });
+    return async (id) => {
+        const lastArrowIndex = id.lastIndexOf('>');
+        if (lastArrowIndex === -1) {
+            return await resolve(id, undefined, undefined, ssr);
+        }
+        // split nested selected id by last '>', for example:
+        // 'foo > bar > baz' => 'foo > bar' & 'baz'
+        const nestedRoot = id.substring(0, lastArrowIndex).trim();
+        const nestedPath = id.substring(lastArrowIndex + 1).trim();
+        const basedir = nestedResolveFrom(nestedRoot, config.root, config.resolve.preserveSymlinks, ssr);
+        return await resolve(nestedPath, basedir, undefined, ssr);
+    };
+}
 function newDepOptimizationProcessing() {
     let resolve;
     const promise = new Promise((_resolve) => {
@@ -45212,8 +45237,9 @@ async function cleanupDepsCacheStaleDirs(config) {
             for (const dirent of dirents) {
                 if (dirent.isDirectory() && dirent.name.includes('_temp_')) {
                     const tempDirPath = path$o.resolve(config.cacheDir, dirent.name);
-                    const { mtime } = await fsp.stat(tempDirPath);
-                    if (Date.now() - mtime.getTime() > MAX_TEMP_DIR_AGE_MS) {
+                    const stats = await fsp.stat(tempDirPath).catch((_) => null);
+                    if (stats?.mtime &&
+                        Date.now() - stats.mtime.getTime() > MAX_TEMP_DIR_AGE_MS) {
                         await removeDir(tempDirPath);
                     }
                 }
@@ -61136,6 +61162,7 @@ function transformMiddleware(server) {
                 // Skip if response has already been sent
                 if (!res.writableEnded) {
                     res.statusCode = 504; // status code request timeout
+                    res.statusMessage = 'Optimize Deps Processing Error';
                     res.end();
                 }
                 // This timeout is unexpected
@@ -61146,6 +61173,7 @@ function transformMiddleware(server) {
                 // Skip if response has already been sent
                 if (!res.writableEnded) {
                     res.statusCode = 504; // status code request timeout
+                    res.statusMessage = 'Outdated Optimize Dep';
                     res.end();
                 }
                 // We don't need to log an error in this case, the request
@@ -63100,7 +63128,6 @@ async function restartServer(server) {
     const { port: prevPort, host: prevHost } = server.config.server;
     const shortcutsOptions = server._shortcutsOptions;
     const oldUrls = server.resolvedUrls;
-    await server.close();
     let inlineConfig = server.config.inlineConfig;
     if (server._forceOptimizeOnRestart) {
         inlineConfig = mergeConfig(inlineConfig, {
@@ -63117,8 +63144,10 @@ async function restartServer(server) {
         server.config.logger.error(err.message, {
             timestamp: true,
         });
+        server.config.logger.error('server restart failed', { timestamp: true });
         return;
     }
+    await server.close();
     // prevent new server `restart` function from calling
     newServer._restartPromise = server._restartPromise;
     Object.assign(server, newServer);

package/dist/node/chunks/{dep-80b98891.js → dep-f63b56ae.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { C as commonjsGlobal } from './dep-84d7cc5e.js';
+import { C as commonjsGlobal } from './dep-79892de8.js';
 import require$$0$1 from 'path';
 import require$$5 from 'crypto';
 import require$$0$2 from 'util';

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 { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-84d7cc5e.js';
+import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-79892de8.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -729,7 +729,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-84d7cc5e.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-79892de8.js').then(function (n) { return n.F; });
     try {
         const server = await createServer({
             root,
@@ -807,7 +807,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-84d7cc5e.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-79892de8.js').then(function (n) { return n.E; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -835,7 +835,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-84d7cc5e.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-79892de8.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -860,7 +860,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-84d7cc5e.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-79892de8.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -2502,7 +2502,7 @@ export declare interface UserConfig {
     clearScreen?: boolean;
     /**
      * Environment files directory. Can be an absolute path, or a path relative from
-     * the location of the config file itself.
+     * root.
      * @default root
      */
     envDir?: string;

package/dist/node/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.2.0-beta.2",
+  "version": "4.2.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",