vite 6.0.0-alpha.2 → 6.0.0-alpha.3

package/dist/node-cjs/publicUtils.cjs

@@ -2956,9 +2956,9 @@ const isObject$2 = val => val && typeof val === 'object' && !Array.isArray(val);
  * @api public
  */
 
-const picomatch$1 = (glob, options, returnState = false) => {
+const picomatch$2 = (glob, options, returnState = false) => {
   if (Array.isArray(glob)) {
-    const fns = glob.map(input => picomatch$1(input, options, returnState));
+    const fns = glob.map(input => picomatch$2(input, options, returnState));
     const arrayMatcher = str => {
       for (const isMatch of fns) {
         const state = isMatch(str);
@@ -2978,8 +2978,8 @@ const picomatch$1 = (glob, options, returnState = false) => {
   const opts = options || {};
   const posix = utils.isWindows(options);
   const regex = isState
-    ? picomatch$1.compileRe(glob, options)
-    : picomatch$1.makeRe(glob, options, false, true);
+    ? picomatch$2.compileRe(glob, options)
+    : picomatch$2.makeRe(glob, options, false, true);
 
   const state = regex.state;
   delete regex.state;
@@ -2987,11 +2987,11 @@ const picomatch$1 = (glob, options, returnState = false) => {
   let isIgnored = () => false;
   if (opts.ignore) {
     const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
-    isIgnored = picomatch$1(opts.ignore, ignoreOpts, returnState);
+    isIgnored = picomatch$2(opts.ignore, ignoreOpts, returnState);
   }
 
   const matcher = (input, returnObject = false) => {
-    const { isMatch, match, output } = picomatch$1.test(input, regex, options, { glob, posix });
+    const { isMatch, match, output } = picomatch$2.test(input, regex, options, { glob, posix });
     const result = { glob, state, regex, posix, input, output, match, isMatch };
 
     if (typeof opts.onResult === 'function') {
@@ -3041,7 +3041,7 @@ const picomatch$1 = (glob, options, returnState = false) => {
  * @api public
  */
 
-picomatch$1.test = (input, regex, options, { glob, posix } = {}) => {
+picomatch$2.test = (input, regex, options, { glob, posix } = {}) => {
   if (typeof input !== 'string') {
     throw new TypeError('Expected input to be a string');
   }
@@ -3062,7 +3062,7 @@ picomatch$1.test = (input, regex, options, { glob, posix } = {}) => {
 
   if (match === false || opts.capture === true) {
     if (opts.matchBase === true || opts.basename === true) {
-      match = picomatch$1.matchBase(input, regex, options, posix);
+      match = picomatch$2.matchBase(input, regex, options, posix);
     } else {
       match = regex.exec(output);
     }
@@ -3085,8 +3085,8 @@ picomatch$1.test = (input, regex, options, { glob, posix } = {}) => {
  * @api public
  */
 
-picomatch$1.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-  const regex = glob instanceof RegExp ? glob : picomatch$1.makeRe(glob, options);
+picomatch$2.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
+  const regex = glob instanceof RegExp ? glob : picomatch$2.makeRe(glob, options);
   return regex.test(path$1.basename(input));
 };
 
@@ -3107,7 +3107,7 @@ picomatch$1.matchBase = (input, glob, options, posix = utils.isWindows(options))
  * @api public
  */
 
-picomatch$1.isMatch = (str, patterns, options) => picomatch$1(patterns, options)(str);
+picomatch$2.isMatch = (str, patterns, options) => picomatch$2(patterns, options)(str);
 
 /**
  * Parse a glob pattern to create the source string for a regular
@@ -3123,8 +3123,8 @@ picomatch$1.isMatch = (str, patterns, options) => picomatch$1(patterns, options)
  * @api public
  */
 
-picomatch$1.parse = (pattern, options) => {
-  if (Array.isArray(pattern)) return pattern.map(p => picomatch$1.parse(p, options));
+picomatch$2.parse = (pattern, options) => {
+  if (Array.isArray(pattern)) return pattern.map(p => picomatch$2.parse(p, options));
   return parse$1(pattern, { ...options, fastpaths: false });
 };
 
@@ -3155,7 +3155,7 @@ picomatch$1.parse = (pattern, options) => {
  * @api public
  */
 
-picomatch$1.scan = (input, options) => scan(input, options);
+picomatch$2.scan = (input, options) => scan(input, options);
 
 /**
  * Compile a regular expression from the `state` object returned by the
@@ -3169,7 +3169,7 @@ picomatch$1.scan = (input, options) => scan(input, options);
  * @api public
  */
 
-picomatch$1.compileRe = (state, options, returnOutput = false, returnState = false) => {
+picomatch$2.compileRe = (state, options, returnOutput = false, returnState = false) => {
   if (returnOutput === true) {
     return state.output;
   }
@@ -3183,7 +3183,7 @@ picomatch$1.compileRe = (state, options, returnOutput = false, returnState = fal
     source = `^(?!${source}).*$`;
   }
 
-  const regex = picomatch$1.toRegex(source, options);
+  const regex = picomatch$2.toRegex(source, options);
   if (returnState === true) {
     regex.state = state;
   }
@@ -3210,7 +3210,7 @@ picomatch$1.compileRe = (state, options, returnOutput = false, returnState = fal
  * @api public
  */
 
-picomatch$1.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
+picomatch$2.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
   if (!input || typeof input !== 'string') {
     throw new TypeError('Expected a non-empty string');
   }
@@ -3225,7 +3225,7 @@ picomatch$1.makeRe = (input, options = {}, returnOutput = false, returnState = f
     parsed = parse$1(input, options);
   }
 
-  return picomatch$1.compileRe(parsed, options, returnOutput, returnState);
+  return picomatch$2.compileRe(parsed, options, returnOutput, returnState);
 };
 
 /**
@@ -3245,7 +3245,7 @@ picomatch$1.makeRe = (input, options = {}, returnOutput = false, returnState = f
  * @api public
  */
 
-picomatch$1.toRegex = (source, options) => {
+picomatch$2.toRegex = (source, options) => {
   try {
     const opts = options || {};
     return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
@@ -3260,17 +3260,17 @@ picomatch$1.toRegex = (source, options) => {
  * @return {Object}
  */
 
-picomatch$1.constants = constants;
+picomatch$2.constants = constants;
 
 /**
  * Expose "picomatch"
  */
 
-var picomatch_1 = picomatch$1;
+var picomatch_1 = picomatch$2;
 
 var picomatch = picomatch_1;
 
-var pm = /*@__PURE__*/getDefaultExportFromCjs(picomatch);
+var picomatch$1 = /*@__PURE__*/getDefaultExportFromCjs(picomatch);
 
 // Helper since Typescript can't detect readonly arrays with Array.isArray
 function isArray(arg) {
@@ -3310,7 +3310,7 @@ const createFilter$1 = function createFilter(include, exclude, options) {
             test: (what) => {
                 // this refactor is a tad overly verbose but makes for easy debugging
                 const pattern = getMatcherString(id, resolutionBase);
-                const fn = pm(pattern, { dot: true });
+                const fn = picomatch$1(pattern, { dot: true });
                 const result = fn(what);
                 return result;
             }
@@ -5435,12 +5435,14 @@ function createLogger(level = 'info', options = {}) {
     const clear = canClearScreen ? clearScreen : () => { };
     function format(type, msg, options = {}) {
         if (options.timestamp) {
-            const tag = type === 'info'
-                ? colors.cyan(colors.bold(prefix))
+            const color = type === 'info'
+                ? colors.cyan
                 : type === 'warn'
-                    ? colors.yellow(colors.bold(prefix))
-                    : colors.red(colors.bold(prefix));
-            return `${colors.dim(getTimeFormatter().format(new Date()))} ${tag} ${msg}`;
+                    ? colors.yellow
+                    : colors.red;
+            const tag = color(colors.bold(prefix));
+            const environment = options.environment ? options.environment + ' ' : '';
+            return `${colors.dim(getTimeFormatter().format(new Date()))} ${tag} ${environment}${msg}`;
         }
         else {
             return msg;
@@ -5568,18 +5570,55 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
     return searchForWorkspaceRoot(dir, root);
 }
 
+const safeModulePathsCache = new WeakMap();
+function isSafeModulePath(config, filePath) {
+    let safeModulePaths = safeModulePathsCache.get(config);
+    if (!safeModulePaths) {
+        safeModulePaths = new Set();
+        safeModulePathsCache.set(config, safeModulePaths);
+    }
+    return safeModulePaths.has(filePath);
+}
+const fsDenyGlobCache = new WeakMap();
+function fsDenyGlob(config, filePath) {
+    let matcher = fsDenyGlobCache.get(config);
+    if (!matcher) {
+        (matcher = picomatch$1(
+        // matchBase: true does not work as it's documented
+        // https://github.com/micromatch/picomatch/issues/89
+        // convert patterns without `/` on our side for now
+        config.server.fs.deny.map((pattern) => pattern.includes('/') ? pattern : `**/${pattern}`), {
+            matchBase: false,
+            nocase: true,
+            dot: true,
+        })),
+            fsDenyGlobCache.set(config, matcher);
+    }
+    return matcher(filePath);
+}
 /**
  * Check if the url is allowed to be served, via the `server.fs` config.
+ * @deprecate use isFileLoadingAllowed
  */
 function isFileServingAllowed(url, server) {
-    if (!server.config.server.fs.strict)
+    const { config } = server;
+    if (!config.server.fs.strict)
+        return true;
+    const filePath = fsPathFromUrl(url);
+    return isFileLoadingAllowed(config, filePath);
+}
+function isUriInFilePath(uri, filePath) {
+    return isSameFileUri(uri, filePath) || isParentDirectory(uri, filePath);
+}
+function isFileLoadingAllowed(config, filePath) {
+    const { fs } = config.server;
+    if (!fs.strict)
         return true;
-    const file = fsPathFromUrl(url);
-    if (server._fsDenyGlob(file))
+    if (fsDenyGlob(config, filePath))
         return false;
-    if (server._safeModulesPath.has(file))
+    if (isSafeModulePath(config, filePath))
         return true;
-    if (server.config.server.fs.allow.some((uri) => isSameFileUri(uri, file) || isParentDirectory(uri, file)))
+    if (fs.allow.some((uri) => isUriInFilePath(uri, filePath)))
         return true;
     return false;
 }

package/index.cjs

@@ -6,6 +6,7 @@ warnCjsUsage()
 module.exports.defineConfig = (config) => config
 
 // proxy cjs utils (sync functions)
+// eslint-disable-next-line n/no-missing-require -- will be generated by build
 Object.assign(module.exports, require('./dist/node-cjs/publicUtils.cjs'))
 
 // async functions, can be redirect from ESM build

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-alpha.3",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",