vite 4.4.8 → 4.4.9

package/dist/node/chunks/{dep-def3b363.js → dep-73522cdf.js}

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

package/dist/node/chunks/{dep-75f53616.js → dep-df561101.js}

@@ -12984,21 +12984,23 @@ function buildReporterPlugin(config) {
             chunkCount = 0;
             compressedCount = 0;
         },
-        renderChunk(code, chunk) {
-            for (const id of chunk.moduleIds) {
-                const module = this.getModuleInfo(id);
-                if (!module)
-                    continue;
-                // When a dynamic importer shares a chunk with the imported module,
-                // warn that the dynamic imported module will not be moved to another chunk (#12850).
-                if (module.importers.length && module.dynamicImporters.length) {
-                    // Filter out the intersection of dynamic importers and sibling modules in
-                    // the same chunk. The intersecting dynamic importers' dynamic import is not
-                    // expected to work. Note we're only detecting the direct ineffective
-                    // dynamic import here.
-                    const detectedIneffectiveDynamicImport = module.dynamicImporters.some((id) => !isInNodeModules(id) && chunk.moduleIds.includes(id));
-                    if (detectedIneffectiveDynamicImport) {
-                        this.warn(`\n(!) ${module.id} is dynamically imported by ${module.dynamicImporters.join(', ')} but also statically imported by ${module.importers.join(', ')}, dynamic import will not move module into another chunk.\n`);
+        renderChunk(code, chunk, options) {
+            if (!options.inlineDynamicImports) {
+                for (const id of chunk.moduleIds) {
+                    const module = this.getModuleInfo(id);
+                    if (!module)
+                        continue;
+                    // When a dynamic importer shares a chunk with the imported module,
+                    // warn that the dynamic imported module will not be moved to another chunk (#12850).
+                    if (module.importers.length && module.dynamicImporters.length) {
+                        // Filter out the intersection of dynamic importers and sibling modules in
+                        // the same chunk. The intersecting dynamic importers' dynamic import is not
+                        // expected to work. Note we're only detecting the direct ineffective
+                        // dynamic import here.
+                        const detectedIneffectiveDynamicImport = module.dynamicImporters.some((id) => !isInNodeModules(id) && chunk.moduleIds.includes(id));
+                        if (detectedIneffectiveDynamicImport) {
+                            this.warn(`\n(!) ${module.id} is dynamically imported by ${module.dynamicImporters.join(', ')} but also statically imported by ${module.importers.join(', ')}, dynamic import will not move module into another chunk.\n`);
+                        }
                     }
                 }
             }
@@ -21300,6 +21302,8 @@ var settings = {};
 	        if (this.stats) {
 	            this.objectMode = true;
 	        }
+	        // Remove the cast to the array in the next major (#404).
+	        this.ignore = [].concat(this.ignore);
 	    }
 	    _getValue(option, value) {
 	        return option === undefined ? value : option;
@@ -27431,7 +27435,7 @@ function encodeQueryItem(key, value) {
   return `${encodeQueryKey(key)}=${encodeQueryValue(value)}`;
 }
 function stringifyQuery(query) {
-  return Object.keys(query).filter((k) => query[k] !== void 0).map((k) => encodeQueryItem(k, query[k])).join("&");
+  return Object.keys(query).filter((k) => query[k] !== void 0).map((k) => encodeQueryItem(k, query[k])).filter(Boolean).join("&");
 }
 
 new Set(builtinModules);
@@ -36627,47 +36631,77 @@ var src$1 = rc;
 
 var postcssrc = /*@__PURE__*/getDefaultExportFromCjs(src$1);
 
-function stripLiteralAcorn(code) {
-  const FILL = " ";
+function _stripLiteralAcorn(code, options) {
+  const FILL = options?.fillChar ?? " ";
+  const FILL_COMMENT = " ";
   let result = "";
-  function fulfill(index) {
+  const filter = options?.filter ?? (() => true);
+  function fillupTo(index) {
     if (index > result.length)
-      result += code.slice(result.length, index).replace(/[^\n]/g, FILL);
+      result += code.slice(result.length, index).replace(/[^\n]/g, FILL_COMMENT);
   }
-  const tokens = tokenizer(code, {
+  const tokens = [];
+  const pasers = tokenizer(code, {
     ecmaVersion: "latest",
     sourceType: "module",
     allowHashBang: true,
     allowAwaitOutsideFunction: true,
     allowImportExportEverywhere: true
   });
-  const inter = tokens[Symbol.iterator]();
-  while (true) {
-    const { done, value: token } = inter.next();
-    if (done)
-      break;
-    fulfill(token.start);
-    if (token.type.label === "string")
-      result += code[token.start] + FILL.repeat(token.end - token.start - 2) + code[token.end - 1];
-    else if (token.type.label === "template")
-      result += FILL.repeat(token.end - token.start);
-    else
+  const iter = pasers[Symbol.iterator]();
+  let error;
+  try {
+    while (true) {
+      const { done, value: token } = iter.next();
+      if (done)
+        break;
+      tokens.push(token);
+      fillupTo(token.start);
+      if (token.type.label === "string") {
+        const body = code.slice(token.start + 1, token.end - 1);
+        if (filter(body)) {
+          result += code[token.start] + FILL.repeat(token.end - token.start - 2) + code[token.end - 1];
+          continue;
+        }
+      } else if (token.type.label === "template") {
+        const body = code.slice(token.start, token.end);
+        if (filter(body)) {
+          result += FILL.repeat(token.end - token.start);
+          continue;
+        }
+      } else if (token.type.label === "regexp") {
+        const body = code.slice(token.start, token.end);
+        if (filter(body)) {
+          result += body.replace(/\/(.*)\/(\w?)$/g, (_, $1, $2) => `/${FILL.repeat($1.length)}/${$2}`);
+          continue;
+        }
+      }
       result += code.slice(token.start, token.end);
+    }
+    fillupTo(code.length);
+  } catch (e) {
+    error = e;
   }
-  fulfill(code.length);
-  return result;
+  return {
+    error,
+    result,
+    tokens
+  };
 }
 
 const multilineCommentsRE = /\/\*([^*\/])*?\*\//gms;
 const singlelineCommentsRE = /(?:^|\n|\r)\s*\/\/.*(?:\r|\n|$)/gm;
-const templateLiteralRE = /\$\{(\s*(?:(?!\$\{).|\n|\r)*?\s*)\}/g;
+const templateLiteralRE = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
 const quotesRE = [
   /(["'`])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
   /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
   // multi-line strings (i.e. template literals only)
 ];
-function stripLiteralRegex(code) {
-  code = code.replace(multilineCommentsRE, (s) => " ".repeat(s.length)).replace(singlelineCommentsRE, (s) => " ".repeat(s.length));
+function stripLiteralRegex(code, options) {
+  const FILL_COMMENT = " ";
+  const FILL = options?.fillChar ?? " ";
+  const filter = options?.filter ?? (() => true);
+  code = code.replace(multilineCommentsRE, (s) => filter(s) ? FILL_COMMENT.repeat(s.length) : s).replace(singlelineCommentsRE, (s) => filter(s) ? FILL_COMMENT.repeat(s.length) : s);
   let expanded = code;
   for (let i = 0; i < 16; i++) {
     const before = expanded;
@@ -36677,19 +36711,32 @@ function stripLiteralRegex(code) {
   }
   quotesRE.forEach((re) => {
     expanded = expanded.replace(re, (s, quote, body, index) => {
-      code = code.slice(0, index + 1) + " ".repeat(s.length - 2) + code.slice(index + s.length - 1);
-      return quote + " ".repeat(s.length - 2) + quote;
+      if (!filter(s.slice(1, -1)))
+        return s;
+      code = code.slice(0, index + 1) + FILL.repeat(s.length - 2) + code.slice(index + s.length - 1);
+      return quote + FILL.repeat(s.length - 2) + quote;
     });
   });
   return code;
 }
 
-function stripLiteral(code) {
-  try {
-    return stripLiteralAcorn(code);
-  } catch (e) {
-    return stripLiteralRegex(code);
+function stripLiteral(code, options) {
+  return stripLiteralDetailed(code, options).result;
+}
+function stripLiteralDetailed(code, options) {
+  const acorn = _stripLiteralAcorn(code, options);
+  if (!acorn.error) {
+    return {
+      mode: "acorn",
+      result: acorn.result,
+      acorn
+    };
   }
+  return {
+    mode: "regex",
+    result: stripLiteralRegex(acorn.result + code.slice(acorn.result.length), options),
+    acorn
+  };
 }
 
 var main$1 = {exports: {}};
@@ -38912,8 +38959,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-d502c17d.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-def3b363.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-e0331088.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-73522cdf.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -42912,7 +42959,6 @@ function definePlugin(config) {
     };
 }
 
-const ignoreFlagRE = /\/\*\s*@vite-ignore\s*\*\//;
 function err(e, pos) {
     const error = new Error(e);
     error.pos = pos;
@@ -42949,7 +42995,7 @@ function getWorkerType(raw, clean, i) {
     const workerOptString = raw
         .substring(commaIndex + 1, endIndex)
         .replace(/\}[\s\S]*,/g, '}'); // strip trailing comma for parsing
-    const hasViteIgnore = ignoreFlagRE.test(workerOptString);
+    const hasViteIgnore = hasViteIgnoreRE.test(workerOptString);
     if (hasViteIgnore) {
         return 'ignore';
     }
@@ -43468,6 +43514,9 @@ function dynamicImportVarsPlugin(config) {
                 if (dynamicIndex === -1 || source[start] !== '`') {
                     continue;
                 }
+                if (hasViteIgnoreRE.test(source.slice(expStart, expEnd))) {
+                    continue;
+                }
                 s || (s = new MagicString(source));
                 let result;
                 try {
@@ -46498,7 +46547,7 @@ function buildImportAnalysisPlugin(config) {
         ? // If `experimental.renderBuiltUrl` or `build.modulePreload.resolveDependencies` are used
             // the dependencies are already resolved. To avoid the need for `new URL(dep, import.meta.url)`
             // a helper `__vitePreloadRelativeDep` is used to resolve from relative paths which can be minimized.
-            `function(dep, importerUrl) { return dep.startsWith('.') ? new URL(dep, importerUrl).href : dep }`
+            `function(dep, importerUrl) { return dep[0] === '.' ? new URL(dep, importerUrl).href : dep }`
         : optimizeModulePreloadRelativePaths
             ? // If there isn't custom resolvers affecting the deps list, deps in the list are relative
                 // to the current chunk and are resolved to absolute URL by the __vitePreload helper itself.

package/dist/node/chunks/{dep-d502c17d.js → dep-e0331088.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-75f53616.js';
+import { E as getDefaultExportFromCjs } from './dep-df561101.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-75f53616.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-df561101.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -738,7 +738,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-75f53616.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-df561101.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -816,7 +816,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-75f53616.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-df561101.js').then(function (n) { return n.H; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -844,7 +844,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-75f53616.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-df561101.js').then(function (n) { return n.G; });
     try {
         const config = await resolveConfig({
             root,
@@ -871,7 +871,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-75f53616.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-df561101.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-75f53616.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-75f53616.js';
+import { i as isInNodeModules } from './chunks/dep-df561101.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-df561101.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.8",
+  "version": "4.4.9",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -68,8 +68,8 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.18.10",
-    "postcss": "^8.4.26",
-    "rollup": "^3.25.2"
+    "postcss": "^8.4.27",
+    "rollup": "^3.27.1"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -105,7 +105,7 @@
     "escape-html": "^1.0.3",
     "estree-walker": "^3.0.3",
     "etag": "^1.8.1",
-    "fast-glob": "^3.3.0",
+    "fast-glob": "^3.3.1",
     "http-proxy": "^1.18.1",
     "json-stable-stringify": "^1.0.2",
     "launch-editor-middleware": "^2.6.0",
@@ -128,11 +128,11 @@
     "sirv": "^2.0.3",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
-    "strip-literal": "^1.0.1",
+    "strip-literal": "^1.3.0",
     "tsconfck": "^2.1.2",
-    "tslib": "^2.6.0",
+    "tslib": "^2.6.1",
     "types": "link:./types",
-    "ufo": "^1.1.2",
+    "ufo": "^1.2.0",
     "ws": "^8.13.0"
   },
   "peerDependencies": {

package/types/importMeta.d.ts

@@ -2,8 +2,6 @@
 // Thus cannot contain any top-level imports
 // <https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation>
 
-/* eslint-disable @typescript-eslint/consistent-type-imports */
-
 interface ImportMetaEnv {
   [key: string]: any
   BASE_URL: string