vite 4.2.0 → 4.2.2

package/dist/node/chunks/{dep-26451072.js → dep-26438f31.js}

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

package/dist/node/chunks/{dep-c167897e.js → dep-d305c21f.js}

@@ -16024,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 {
@@ -22466,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: '' },
                     };
@@ -37899,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;
@@ -38306,7 +38321,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-26451072.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-26438f31.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -40755,6 +40770,83 @@ function sirv (dir, opts={}) {
 	};
 }
 
+/*!
+ * escape-html
+ * Copyright(c) 2012-2013 TJ Holowaychuk
+ * Copyright(c) 2015 Andreas Lubbe
+ * Copyright(c) 2015 Tiancheng "Timothy" Gu
+ * MIT Licensed
+ */
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var matchHtmlRegExp = /["'&<>]/;
+
+/**
+ * Module exports.
+ * @public
+ */
+
+var escapeHtml_1 = escapeHtml$1;
+
+/**
+ * Escape special characters in the given string of html.
+ *
+ * @param  {string} string The string to escape for inserting into HTML
+ * @return {string}
+ * @public
+ */
+
+function escapeHtml$1(string) {
+  var str = '' + string;
+  var match = matchHtmlRegExp.exec(str);
+
+  if (!match) {
+    return str;
+  }
+
+  var escape;
+  var html = '';
+  var index = 0;
+  var lastIndex = 0;
+
+  for (index = match.index; index < str.length; index++) {
+    switch (str.charCodeAt(index)) {
+      case 34: // "
+        escape = '&quot;';
+        break;
+      case 38: // &
+        escape = '&amp;';
+        break;
+      case 39: // '
+        escape = '&#39;';
+        break;
+      case 60: // <
+        escape = '&lt;';
+        break;
+      case 62: // >
+        escape = '&gt;';
+        break;
+      default:
+        continue;
+    }
+
+    if (lastIndex !== index) {
+      html += str.substring(lastIndex, index);
+    }
+
+    lastIndex = index + 1;
+    html += escape;
+  }
+
+  return lastIndex !== index
+    ? html + str.substring(lastIndex, index)
+    : html;
+}
+
 const sirvOptions = ({ headers, shouldServe, }) => {
     return {
         dev: true,
@@ -40910,7 +41002,7 @@ function renderRestrictedErrorHTML(msg) {
     return html `
     <body>
       <h1>403 Restricted</h1>
-      <p>${msg.replace(/\n/g, '<br/>')}</p>
+      <p>${escapeHtml_1(msg).replace(/\n/g, '<br/>')}</p>
       <style>
         body {
           padding: 1em 2em;
@@ -47508,83 +47600,6 @@ function encodeUrl$1 (url) {
     .replace(ENCODE_CHARS_REGEXP, encodeURI)
 }
 
-/*!
- * escape-html
- * Copyright(c) 2012-2013 TJ Holowaychuk
- * Copyright(c) 2015 Andreas Lubbe
- * Copyright(c) 2015 Tiancheng "Timothy" Gu
- * MIT Licensed
- */
-
-/**
- * Module variables.
- * @private
- */
-
-var matchHtmlRegExp = /["'&<>]/;
-
-/**
- * Module exports.
- * @public
- */
-
-var escapeHtml_1 = escapeHtml$1;
-
-/**
- * Escape special characters in the given string of html.
- *
- * @param  {string} string The string to escape for inserting into HTML
- * @return {string}
- * @public
- */
-
-function escapeHtml$1(string) {
-  var str = '' + string;
-  var match = matchHtmlRegExp.exec(str);
-
-  if (!match) {
-    return str;
-  }
-
-  var escape;
-  var html = '';
-  var index = 0;
-  var lastIndex = 0;
-
-  for (index = match.index; index < str.length; index++) {
-    switch (str.charCodeAt(index)) {
-      case 34: // "
-        escape = '&quot;';
-        break;
-      case 38: // &
-        escape = '&amp;';
-        break;
-      case 39: // '
-        escape = '&#39;';
-        break;
-      case 60: // <
-        escape = '&lt;';
-        break;
-      case 62: // >
-        escape = '&gt;';
-        break;
-      default:
-        continue;
-    }
-
-    if (lastIndex !== index) {
-      html += str.substring(lastIndex, index);
-    }
-
-    lastIndex = index + 1;
-    html += escape;
-  }
-
-  return lastIndex !== index
-    ? html + str.substring(lastIndex, index)
-    : html;
-}
-
 var onFinishedExports = {};
 var onFinished$2 = {
   get exports(){ return onFinishedExports; },

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-c167897e.js';
+import { A as picocolorsExports, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-d305c21f.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-c167897e.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-d305c21f.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-c167897e.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-d305c21f.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-c167897e.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-d305c21f.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-c167897e.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-d305c21f.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

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-c167897e.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-d305c21f.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",
+  "version": "4.2.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -86,6 +86,7 @@
     "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-typescript": "^11.0.0",
     "@rollup/pluginutils": "^5.0.2",
+    "@types/escape-html": "^1.0.0",
     "acorn": "^8.8.2",
     "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
@@ -100,6 +101,7 @@
     "dotenv": "^16.0.3",
     "dotenv-expand": "^9.0.0",
     "es-module-lexer": "^1.2.0",
+    "escape-html": "^1.0.3",
     "estree-walker": "^3.0.3",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.12",