vite 4.4.0-beta.2 → 4.4.0-beta.3

package/dist/node/chunks/{dep-e5580ac6.js → dep-1e80dfe0.js}

@@ -1,4 +1,4 @@
-import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-13ba4d1c.js';
+import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-64acfab2.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-13ba4d1c.js → dep-64acfab2.js}

@@ -16327,6 +16327,8 @@ function manifestPlugin(config) {
 }
 
 // This is based on @rollup/plugin-data-uri
+// MIT Licensed https://github.com/rollup/plugins/blob/master/LICENSE
+// ref https://github.com/vitejs/vite/issues/1428#issuecomment-757033808
 const dataUriRE = /^([^/]+\/[^;,]+)(;base64)?,([\s\S]*)$/;
 const base64RE = /base64/i;
 const dataUriPrefix = `\0/@data-uri/`;
@@ -19916,8 +19918,8 @@ function fastqueue (context, worker, concurrency) {
 
   var self = {
     push: push,
-    drain: noop$3,
-    saturated: noop$3,
+    drain: noop$4,
+    saturated: noop$4,
     pause: pause,
     paused: false,
     concurrency: concurrency,
@@ -19927,7 +19929,7 @@ function fastqueue (context, worker, concurrency) {
     length: length,
     getQueue: getQueue,
     unshift: unshift,
-    empty: noop$3,
+    empty: noop$4,
     kill: kill,
     killAndDrain: killAndDrain,
     error: error
@@ -19986,7 +19988,7 @@ function fastqueue (context, worker, concurrency) {
     current.context = context;
     current.release = release;
     current.value = value;
-    current.callback = done || noop$3;
+    current.callback = done || noop$4;
     current.errorHandler = errorHandler;
 
     if (_running === self.concurrency || self.paused) {
@@ -20010,7 +20012,7 @@ function fastqueue (context, worker, concurrency) {
     current.context = context;
     current.release = release;
     current.value = value;
-    current.callback = done || noop$3;
+    current.callback = done || noop$4;
 
     if (_running === self.concurrency || self.paused) {
       if (queueHead) {
@@ -20054,14 +20056,14 @@ function fastqueue (context, worker, concurrency) {
   function kill () {
     queueHead = null;
     queueTail = null;
-    self.drain = noop$3;
+    self.drain = noop$4;
   }
 
   function killAndDrain () {
     queueHead = null;
     queueTail = null;
     self.drain();
-    self.drain = noop$3;
+    self.drain = noop$4;
   }
 
   function error (handler) {
@@ -20069,13 +20071,13 @@ function fastqueue (context, worker, concurrency) {
   }
 }
 
-function noop$3 () {}
+function noop$4 () {}
 
 function Task () {
   this.value = null;
-  this.callback = noop$3;
+  this.callback = noop$4;
   this.next = null;
-  this.release = noop$3;
+  this.release = noop$4;
   this.context = null;
   this.errorHandler = null;
 
@@ -20086,7 +20088,7 @@ function Task () {
     var errorHandler = self.errorHandler;
     var val = self.value;
     self.value = null;
-    self.callback = noop$3;
+    self.callback = noop$4;
     if (self.errorHandler) {
       errorHandler(err, val);
     }
@@ -20134,7 +20136,7 @@ function queueAsPromised (context, worker, concurrency) {
     // Let's fork the promise chain to
     // make the error bubble up to the user but
     // not lead to a unhandledRejection
-    p.catch(noop$3);
+    p.catch(noop$4);
 
     return p
   }
@@ -20153,7 +20155,7 @@ function queueAsPromised (context, worker, concurrency) {
     // Let's fork the promise chain to
     // make the error bubble up to the user but
     // not lead to a unhandledRejection
-    p.catch(noop$3);
+    p.catch(noop$4);
 
     return p
   }
@@ -27240,6 +27242,7 @@ function stringifyQuery(query) {
   return Object.keys(query).filter((k) => query[k] !== void 0).map((k) => encodeQueryItem(k, query[k])).join("&");
 }
 
+new Set(builtinModules);
 function matchAll(regex, string, addition) {
   const matches = [];
   for (const match of string.matchAll(regex)) {
@@ -36059,6 +36062,7 @@ var YAML = {
 };
 
 // `export * as default from ...` fails on Webpack v4
+// https://github.com/eemeli/yaml/issues/228
 
 var browser$2 = {
 	__proto__: null,
@@ -37475,6 +37479,7 @@ function buildHtmlPlugin(config) {
         },
         async generateBundle(options, bundle) {
             const analyzedChunk = new Map();
+            const inlineEntryChunk = new Set();
             const getImportedChunks = (chunk, seen = new Set()) => {
                 const chunks = [];
                 chunk.imports.forEach((file) => {
@@ -37629,8 +37634,7 @@ function buildHtmlPlugin(config) {
                         : normalizePath$3(publicAssetPath);
                 });
                 if (chunk && canInlineEntry) {
-                    // all imports from entry have been inlined to html, prevent rollup from outputting it
-                    delete bundle[chunk.fileName];
+                    inlineEntryChunk.add(chunk.fileName);
                 }
                 const shortEmitName = normalizePath$3(path$o.relative(config.root, id));
                 this.emitFile({
@@ -37639,6 +37643,10 @@ function buildHtmlPlugin(config) {
                     source: result,
                 });
             }
+            for (const fileName of inlineEntryChunk) {
+                // all imports from entry have been inlined to html, prevent rollup from outputting it
+                delete bundle[fileName];
+            }
         },
     };
 }
@@ -38663,8 +38671,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-ba2914dc.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-e5580ac6.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-b7b4ad40.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-1e80dfe0.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40171,6 +40179,7 @@ function throwOutdatedRequest(id) {
 
 // AST walker module for Mozilla Parser API compatible trees
 
+
 function makeTest(test) {
   if (typeof test === "string")
     { return function (type) { return type === test; } }
@@ -43371,7 +43380,7 @@ function prepareError(err) {
         id: err.id,
         frame: stripAnsi(err.frame || ''),
         plugin: err.plugin,
-        pluginCode: err.pluginCode,
+        pluginCode: err.pluginCode?.toString(),
         loc: err.loc,
     };
 }
@@ -43440,6 +43449,32 @@ function errorMiddleware(server, allowNext = false) {
  * This file is refactored into TypeScript based on
  * https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/rollup-plugin-container.js
  */
+/**
+https://github.com/preactjs/wmr/blob/master/LICENSE
+
+MIT License
+
+Copyright (c) 2020 The Preact Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+const noop$3 = () => { };
 const ERR_CLOSED_SERVER = 'ERR_CLOSED_SERVER';
 function throwClosedServerError() {
     const err = new Error('The server is being restarted or closed. Request is outdated');
@@ -43471,6 +43506,11 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             rollupVersion: VERSION,
             watchMode: true,
         },
+        debug: noop$3,
+        info: noop$3,
+        warn: noop$3,
+        // @ts-expect-error noop
+        error: noop$3,
     };
     function warnIncompatibleMethod(method, plugin) {
         logger.warn(colors$1.cyan(`[plugin:${plugin}] `) +
@@ -43543,6 +43583,8 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             this._activeId = null;
             this._activeCode = null;
             this._addedImports = null;
+            this.debug = noop$3;
+            this.info = noop$3;
             this._activePlugin = initialPlugin || null;
         }
         parse(code, opts = {}) {
@@ -43615,7 +43657,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             return '';
         }
         warn(e, position) {
-            const err = formatError(e, position, this);
+            const err = formatError(typeof e === 'function' ? e() : e, position, this);
             const msg = buildErrorMessage(err, [colors$1.yellow(`warning: ${err.message}`)], false);
             logger.warn(msg, {
                 clear: true,
@@ -43712,7 +43754,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                     }
                 }
                 if (code) {
-                    err.frame = generateCodeFrame(code, err.loc);
+                    err.frame = generateCodeFrame(`${code}`, err.loc);
                 }
             }
         }
@@ -46205,7 +46247,7 @@ function buildImportAnalysisPlugin(config) {
                 imports = parse$e(source)[0];
             }
             catch (e) {
-                this.error(e, e.idx);
+                this.error(e);
             }
             if (!imports.length) {
                 return null;
@@ -46378,7 +46420,7 @@ function buildImportAnalysisPlugin(config) {
                         imports = parse$e(code)[0].filter((i) => i.d > -1);
                     }
                     catch (e) {
-                        this.error(e, e.idx);
+                        this.error(e);
                     }
                     const s = new MagicString(code);
                     const rewroteMarkerStartPos = new Set(); // position of the leading double quote
@@ -46560,7 +46602,7 @@ function ssrManifestPlugin(config) {
                             imports = parse$e(code)[0].filter((i) => i.n && i.d > -1);
                         }
                         catch (e) {
-                            this.error(e, e.idx);
+                            this.error(e);
                         }
                         if (imports.length) {
                             for (let index = 0; index < imports.length; index++) {
@@ -47722,31 +47764,42 @@ const dynamicImportWarningIgnoreList = [
     `statically analyzed`,
 ];
 function onRollupWarning(warning, warn, config) {
-    function viteWarn(warning) {
-        if (warning.code === 'UNRESOLVED_IMPORT') {
-            const id = warning.id;
-            const exporter = warning.exporter;
-            // throw unless it's commonjs external...
-            if (!id || !/\?commonjs-external$/.test(id)) {
-                throw new Error(`[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
-                    `This is most likely unintended because it can break your application at runtime.\n` +
-                    `If you do want to externalize this module explicitly add it to\n` +
-                    `\`build.rollupOptions.external\``);
-            }
-        }
-        if (warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
-            dynamicImportWarningIgnoreList.some((msg) => warning.message.includes(msg))) {
-            return;
-        }
-        if (warningIgnoreList.includes(warning.code)) {
-            return;
+    const viteWarn = (warnLog) => {
+        let warning;
+        if (typeof warnLog === 'function') {
+            warning = warnLog();
         }
-        if (warning.code === 'PLUGIN_WARNING') {
-            config.logger.warn(`${colors$1.bold(colors$1.yellow(`[plugin:${warning.plugin}]`))} ${colors$1.yellow(warning.message)}`);
-            return;
+        else {
+            warning = warnLog;
+        }
+        if (typeof warning === 'object') {
+            if (warning.code === 'UNRESOLVED_IMPORT') {
+                const id = warning.id;
+                const exporter = warning.exporter;
+                // throw unless it's commonjs external...
+                if (!id || !/\?commonjs-external$/.test(id)) {
+                    throw new Error(`[vite]: Rollup failed to resolve import "${exporter}" from "${id}".\n` +
+                        `This is most likely unintended because it can break your application at runtime.\n` +
+                        `If you do want to externalize this module explicitly add it to\n` +
+                        `\`build.rollupOptions.external\``);
+                }
+            }
+            if (warning.plugin === 'rollup-plugin-dynamic-import-variables' &&
+                dynamicImportWarningIgnoreList.some((msg) => 
+                // @ts-expect-error warning is RollupLog
+                warning.message.includes(msg))) {
+                return;
+            }
+            if (warningIgnoreList.includes(warning.code)) {
+                return;
+            }
+            if (warning.code === 'PLUGIN_WARNING') {
+                config.logger.warn(`${colors$1.bold(colors$1.yellow(`[plugin:${warning.plugin}]`))} ${colors$1.yellow(warning.message)}`);
+                return;
+            }
         }
-        warn(warning);
-    }
+        warn(warnLog);
+    };
     const tty = process.stdout.isTTY && !process.env.CI;
     if (tty) {
         process.stdout.clearLine(0);
@@ -64943,6 +64996,10 @@ var index = {
 };
 
 /* eslint-disable */
+//@ts-nocheck
+//TODO: replace this code with https://github.com/lukeed/polka/pull/148 once it's released
+// This is based on https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/polkompress.js
+// MIT Licensed https://github.com/preactjs/wmr/blob/main/LICENSE
 /* global Buffer */
 const noop = () => { };
 const mimes = /text|javascript|\/json|xml/i;

package/dist/node/chunks/{dep-ba2914dc.js → dep-b7b4ad40.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-13ba4d1c.js';
+import { E as getDefaultExportFromCjs } from './dep-64acfab2.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';

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 { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-13ba4d1c.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-64acfab2.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -728,7 +728,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-13ba4d1c.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-64acfab2.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -806,7 +806,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-13ba4d1c.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-64acfab2.js').then(function (n) { return n.H; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -834,7 +834,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-13ba4d1c.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-64acfab2.js').then(function (n) { return n.G; });
     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-13ba4d1c.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-64acfab2.js').then(function (n) { return n.J; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-13ba4d1c.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-13ba4d1c.js';
+import { i as isInNodeModules } from './chunks/dep-64acfab2.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-64acfab2.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.4.0-beta.2",
+  "version": "4.4.0-beta.3",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -69,7 +69,7 @@
   "dependencies": {
     "esbuild": "^0.18.6",
     "postcss": "^8.4.24",
-    "rollup": "^3.21.0"
+    "rollup": "^3.25.2"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"