vite 4.0.1 → 4.0.2

package/LICENSE.md

@@ -3163,7 +3163,7 @@ Repository: unjs/ufo
 
 > MIT License
 > 
-> Copyright (c) 2020 Nuxt Contrib
+> Copyright (c) Pooya Parsa <pooya@pi0.io>
 > 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

package/dist/node/chunks/{dep-2285ba4f.js → dep-6305614c.js}

@@ -21612,6 +21612,43 @@ var acorn = {
 	version: version$2
 };
 
+const HASH_RE = /#/g;
+const AMPERSAND_RE = /&/g;
+const EQUAL_RE = /=/g;
+const PLUS_RE = /\+/g;
+const ENC_BRACKET_OPEN_RE = /%5b/gi;
+const ENC_BRACKET_CLOSE_RE = /%5d/gi;
+const ENC_CARET_RE = /%5e/gi;
+const ENC_BACKTICK_RE = /%60/gi;
+const ENC_CURLY_OPEN_RE = /%7b/gi;
+const ENC_PIPE_RE = /%7c/gi;
+const ENC_CURLY_CLOSE_RE = /%7d/gi;
+const ENC_SPACE_RE = /%20/gi;
+function encode(text) {
+  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
+}
+function encodeQueryValue(text) {
+  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
+}
+function encodeQueryKey(text) {
+  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
+}
+function encodeQueryItem(key, value) {
+  if (typeof value === "number" || typeof value === "boolean") {
+    value = String(value);
+  }
+  if (!value) {
+    return encodeQueryKey(key);
+  }
+  if (Array.isArray(value)) {
+    return value.map((_value) => `${encodeQueryKey(key)}=${encodeQueryValue(_value)}`).join("&");
+  }
+  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("&");
+}
+
 function matchAll(regex, string, addition) {
   const matches = [];
   for (const match of string.matchAll(regex)) {
@@ -22800,14 +22837,12 @@ async function tryOptimizedResolve(depsOptimizer, id, importer) {
     // We should be able to remove this in the future
     await depsOptimizer.scanProcessing;
     const metadata = depsOptimizer.metadata;
-    if (!importer) {
-        // no importer. try our best to find an optimized dep
-        const depInfo = optimizedDepInfoFromId(metadata, id);
-        if (depInfo) {
-            return depsOptimizer.getOptimizedDepId(depInfo);
-        }
-        return;
+    const depInfo = optimizedDepInfoFromId(metadata, id);
+    if (depInfo) {
+        return depsOptimizer.getOptimizedDepId(depInfo);
     }
+    if (!importer)
+        return;
     // further check if id is imported by nested dependency
     let resolvedSrc;
     for (const optimizedData of metadata.depInfoList) {
@@ -37612,7 +37647,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-ec9f7a0d.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-e4585742.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -38644,43 +38679,6 @@ base.MethodDefinition = base.PropertyDefinition = base.Property = function (node
   if (node.value) { c(node.value, st, "Expression"); }
 };
 
-const HASH_RE = /#/g;
-const AMPERSAND_RE = /&/g;
-const EQUAL_RE = /=/g;
-const PLUS_RE = /\+/g;
-const ENC_BRACKET_OPEN_RE = /%5B/gi;
-const ENC_BRACKET_CLOSE_RE = /%5D/gi;
-const ENC_CARET_RE = /%5E/gi;
-const ENC_BACKTICK_RE = /%60/gi;
-const ENC_CURLY_OPEN_RE = /%7B/gi;
-const ENC_PIPE_RE = /%7C/gi;
-const ENC_CURLY_CLOSE_RE = /%7D/gi;
-const ENC_SPACE_RE = /%20/gi;
-function encode(text) {
-  return encodeURI("" + text).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]");
-}
-function encodeQueryValue(text) {
-  return encode(text).replace(PLUS_RE, "%2B").replace(ENC_SPACE_RE, "+").replace(HASH_RE, "%23").replace(AMPERSAND_RE, "%26").replace(ENC_BACKTICK_RE, "`").replace(ENC_CURLY_OPEN_RE, "{").replace(ENC_CURLY_CLOSE_RE, "}").replace(ENC_CARET_RE, "^");
-}
-function encodeQueryKey(text) {
-  return encodeQueryValue(text).replace(EQUAL_RE, "%3D");
-}
-function encodeQueryItem(key, val) {
-  if (typeof val === "number" || typeof val === "boolean") {
-    val = String(val);
-  }
-  if (!val) {
-    return encodeQueryKey(key);
-  }
-  if (Array.isArray(val)) {
-    return val.map((_val) => `${encodeQueryKey(key)}=${encodeQueryValue(_val)}`).join("&");
-  }
-  return `${encodeQueryKey(key)}=${encodeQueryValue(val)}`;
-}
-function stringifyQuery(query) {
-  return Object.keys(query).map((k) => encodeQueryItem(k, query[k])).join("&");
-}
-
 const { isMatch: isMatch$1, scan } = micromatch_1;
 function getAffectedGlobModules(file, server) {
     const modules = [];
@@ -39634,19 +39632,19 @@ function stattag (stat) {
 var convertSourceMap = {};
 
 (function (exports) {
-	var fs = require$$0__default;
-	var path = require$$0$4;
 
 	Object.defineProperty(exports, 'commentRegex', {
 	  get: function getCommentRegex () {
-	    return /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/mg;
+	    // Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+	    return /^\s*?\/[\/\*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/mg;
 	  }
 	});
 
+
 	Object.defineProperty(exports, 'mapFileCommentRegex', {
 	  get: function getMapFileCommentRegex () {
 	    // Matches sourceMappingURL in either // or /* comment styles.
-	    return /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"`]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg;
+	    return /(?:\/\/[@#][ \t]+?sourceMappingURL=([^\s'"`]+?)[ \t]*?$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^*]+?)[ \t]*?(?:\*\/){1}[ \t]*?$)/mg;
 	  }
 	});
 
@@ -39680,29 +39678,43 @@ var convertSourceMap = {};
 	  return sm.split(',').pop();
 	}
 
-	function readFromFileMap(sm, dir) {
-	  // NOTE: this will only work on the server since it attempts to read the map file
-
+	function readFromFileMap(sm, read) {
 	  var r = exports.mapFileCommentRegex.exec(sm);
-
 	  // for some odd reason //# .. captures in 1 and /* .. */ in 2
 	  var filename = r[1] || r[2];
-	  var filepath = path.resolve(dir, filename);
 
 	  try {
-	    return fs.readFileSync(filepath, 'utf8');
+	    var sm = read(filename);
+	    if (sm != null && typeof sm.catch === 'function') {
+	      return sm.catch(throwError);
+	    } else {
+	      return sm;
+	    }
 	  } catch (e) {
-	    throw new Error('An error occurred while trying to read the map file at ' + filepath + '\n' + e);
+	    throwError(e);
+	  }
+
+	  function throwError(e) {
+	    throw new Error('An error occurred while trying to read the map file at ' + filename + '\n' + e.stack);
 	  }
 	}
 
 	function Converter (sm, opts) {
 	  opts = opts || {};
 
-	  if (opts.isFileComment) sm = readFromFileMap(sm, opts.commentFileDir);
-	  if (opts.hasComment) sm = stripComment(sm);
-	  if (opts.isEncoded) sm = decodeBase64(sm);
-	  if (opts.isJSON || opts.isEncoded) sm = JSON.parse(sm);
+	  if (opts.hasComment) {
+	    sm = stripComment(sm);
+	  }
+
+	  if (opts.encoding === 'base64') {
+	    sm = decodeBase64(sm);
+	  } else if (opts.encoding === 'uri') {
+	    sm = decodeURIComponent(sm);
+	  }
+
+	  if (opts.isJSON || opts.encoding) {
+	    sm = JSON.parse(sm);
+	  }
 
 	  this.sourcemap = sm;
 	}
@@ -39739,10 +39751,22 @@ var convertSourceMap = {};
 	  return btoa(unescape(encodeURIComponent(json)));
 	}
 
+	Converter.prototype.toURI = function () {
+	  var json = this.toJSON();
+	  return encodeURIComponent(json);
+	};
+
 	Converter.prototype.toComment = function (options) {
-	  var base64 = this.toBase64();
-	  var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
-	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	  var encoding, content, data;
+	  if (options != null && options.encoding === 'uri') {
+	    encoding = '';
+	    content = this.toURI();
+	  } else {
+	    encoding = ';base64';
+	    content = this.toBase64();
+	  }
+	  data = 'sourceMappingURL=data:application/json;charset=utf-8' + encoding + ',' + content;
+	  return options != null && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
 	};
 
 	// returns copy instead of original
@@ -39772,20 +39796,42 @@ var convertSourceMap = {};
 	  return new Converter(json, { isJSON: true });
 	};
 
+	exports.fromURI = function (uri) {
+	  return new Converter(uri, { encoding: 'uri' });
+	};
+
 	exports.fromBase64 = function (base64) {
-	  return new Converter(base64, { isEncoded: true });
+	  return new Converter(base64, { encoding: 'base64' });
 	};
 
 	exports.fromComment = function (comment) {
+	  var m, encoding;
 	  comment = comment
 	    .replace(/^\/\*/g, '//')
 	    .replace(/\*\/$/g, '');
-
-	  return new Converter(comment, { isEncoded: true, hasComment: true });
+	  m = exports.commentRegex.exec(comment);
+	  encoding = m && m[4] || 'uri';
+	  return new Converter(comment, { encoding: encoding, hasComment: true });
 	};
 
-	exports.fromMapFileComment = function (comment, dir) {
-	  return new Converter(comment, { commentFileDir: dir, isFileComment: true, isJSON: true });
+	function makeConverter(sm) {
+	  return new Converter(sm, { isJSON: true });
+	}
+
+	exports.fromMapFileComment = function (comment, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileComment`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+
+	  var sm = readFromFileMap(comment, read);
+	  if (sm != null && typeof sm.then === 'function') {
+	    return sm.then(makeConverter);
+	  } else {
+	    return makeConverter(sm);
+	  }
 	};
 
 	// Finds last sourcemap comment in file or returns null if none was found
@@ -39795,9 +39841,15 @@ var convertSourceMap = {};
 	};
 
 	// Finds last sourcemap comment in file or returns null if none was found
-	exports.fromMapFileSource = function (content, dir) {
+	exports.fromMapFileSource = function (content, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileSource`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
 	  var m = content.match(exports.mapFileCommentRegex);
-	  return m ? exports.fromMapFileComment(m.pop(), dir) : null;
+	  return m ? exports.fromMapFileComment(m.pop(), read) : null;
 	};
 
 	exports.removeComments = function (src) {
@@ -40343,7 +40395,7 @@ async function loadAndTransform(id, url, server, options, timestamp) {
         if (code) {
             try {
                 map = (convertSourceMap.fromSource(code) ||
-                    convertSourceMap.fromMapFileSource(code, path$o.dirname(file)))?.toObject();
+                    (await convertSourceMap.fromMapFileSource(code, createConvertSourceMapReadMap(file))))?.toObject();
                 code = code.replace(convertSourceMap.mapFileCommentRegex, blankReplacer);
             }
             catch (e) {
@@ -40418,6 +40470,11 @@ async function loadAndTransform(id, url, server, options, timestamp) {
     }
     return result;
 }
+function createConvertSourceMapReadMap(originalFileName) {
+    return (filename) => {
+        return promises$2.readFile(path$o.resolve(path$o.dirname(originalFileName), filename), 'utf-8');
+    };
+}
 
 const isDebug$1 = !!process.env.DEBUG;
 const debug$9 = createDebugger('vite:import-analysis');
@@ -45894,7 +45951,7 @@ function toOutputFilePathWithoutRuntime(filename, type, hostId, hostType, config
         });
         if (typeof result === 'object') {
             if (result.runtime) {
-                throw new Error(`{ runtime: "${result.runtime} }" is not supported for assets in ${hostType} files: ${filename}`);
+                throw new Error(`{ runtime: "${result.runtime}" } is not supported for assets in ${hostType} files: ${filename}`);
             }
             if (typeof result.relative === 'boolean') {
                 relative = result.relative;
@@ -54389,12 +54446,14 @@ function startBrowserProcess(browser, url) {
             const openedBrowser = preferredOSXBrowser && ps.includes(preferredOSXBrowser)
                 ? preferredOSXBrowser
                 : supportedChromiumBrowsers.find((b) => ps.includes(b));
-            // Try our best to reuse existing tab with AppleScript
-            execSync(`osascript openChrome.applescript "${encodeURI(url)}" "${openedBrowser}"`, {
-                cwd: join$2(VITE_PACKAGE_DIR, 'bin'),
-                stdio: 'ignore',
-            });
-            return true;
+            if (openedBrowser) {
+                // Try our best to reuse existing tab with AppleScript
+                execSync(`osascript openChrome.applescript "${encodeURI(url)}" "${openedBrowser}"`, {
+                    cwd: join$2(VITE_PACKAGE_DIR, 'bin'),
+                    stdio: 'ignore',
+                });
+                return true;
+            }
         }
         catch (err) {
             // Ignore errors
@@ -59834,7 +59893,7 @@ var debug_1 = function () {
   if (!debug$3) {
     try {
       /* eslint global-require: off */
-      debug$3 = src$2.exports("follow-redirects");
+      debug$3 = require("debug")("follow-redirects");
     }
     catch (error) { /* */ }
     if (typeof debug$3 !== "function") {
@@ -62162,7 +62221,7 @@ async function startServer(server, inlinePort, isRestart = false) {
         const path = typeof options.open === 'string' ? options.open : server.config.base;
         openBrowser(path.startsWith('http')
             ? path
-            : `${protocol}://${hostname.name}:${serverPort}${path}`, true, server.config.logger);
+            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, server.config.logger);
     }
 }
 function createServerCloseFn(server) {
@@ -62481,7 +62540,7 @@ async function preview(inlineConfig = {}) {
         const path = typeof options.open === 'string' ? options.open : previewBase;
         openBrowser(path.startsWith('http')
             ? path
-            : `${protocol}://${hostname.name}:${serverPort}${path}`, true, logger);
+            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, logger);
     }
     return {
         config,

package/dist/node/chunks/{dep-ec9f7a0d.js → dep-e4585742.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { C as commonjsGlobal } from './dep-2285ba4f.js';
+import { C as commonjsGlobal } from './dep-6305614c.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 picocolors, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-2285ba4f.js';
+import { A as picocolors, B as bindShortcuts, w as createLogger, h as resolveConfig } from './chunks/dep-6305614c.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -724,7 +724,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-2285ba4f.js').then(function (n) { return n.F; });
+    const { createServer } = await import('./chunks/dep-6305614c.js').then(function (n) { return n.F; });
     try {
         const server = await createServer({
             root,
@@ -802,7 +802,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-2285ba4f.js').then(function (n) { return n.E; });
+    const { build } = await import('./chunks/dep-6305614c.js').then(function (n) { return n.E; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -830,14 +830,14 @@ 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-2285ba4f.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-6305614c.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
             base: options.base,
             configFile: options.config,
             logLevel: options.logLevel,
-        }, 'build');
+        }, 'serve');
         await optimizeDeps(config, options.force, true);
     }
     catch (e) {
@@ -855,7 +855,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-2285ba4f.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-6305614c.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-2285ba4f.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-6305614c.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.0.1",
+  "version": "4.0.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -52,6 +52,7 @@
     "build-types-roll": "api-extractor run && rimraf temp",
     "build-types-post-patch": "tsx scripts/postPatchTypes.ts",
     "build-types-check": "tsx scripts/checkBuiltTypes.ts && tsc --project tsconfig.check.json",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint --cache --ext .ts src/**",
     "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
@@ -84,7 +85,7 @@
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
     "connect-history-api-fallback": "^2.0.0",
-    "convert-source-map": "^1.9.0",
+    "convert-source-map": "^2.0.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
@@ -99,7 +100,7 @@
     "launch-editor-middleware": "^2.6.0",
     "magic-string": "^0.27.0",
     "micromatch": "^4.0.5",
-    "mlly": "^0.5.17",
+    "mlly": "^1.0.0",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
@@ -111,6 +112,7 @@
     "postcss-load-config": "^4.0.1",
     "postcss-modules": "^6.0.0",
     "resolve.exports": "^1.1.0",
+    "rollup-plugin-license": "^3.0.1",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
@@ -119,7 +121,7 @@
     "tsconfck": "^2.0.1",
     "tslib": "^2.4.1",
     "types": "link:./types",
-    "ufo": "^0.8.6",
+    "ufo": "^1.0.1",
     "ws": "^8.11.0"
   },
   "peerDependencies": {