vite 4.3.0-beta.7 → 4.3.0-beta.8

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

package/dist/node/index.d.ts

@@ -1199,6 +1199,11 @@ export declare const isCSSRequest: (request: string) => boolean;
 
 export declare function isDepsOptimizerEnabled(config: ResolvedConfig, ssr: boolean): boolean;
 
+/**
+ * Check if the url is allowed to be served, via the `server.fs` config.
+ */
+export declare function isFileServingAllowed(url: string, server: ViteDevServer): boolean;
+
 export declare interface JsonOptions {
     /**
      * Generate a named export for every property of the JSON object

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-f1f8facc.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, l as loadConfigFromFile, z 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, A as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-f1f8facc.js';
+import { i as isInNodeModules } from './chunks/dep-c7e79736.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-c7e79736.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/dist/node-cjs/publicUtils.cjs

@@ -11,12 +11,16 @@ var require$$0 = require('tty');
 var require$$1 = require('util');
 var require$$0$1 = require('path');
 var require$$0$2 = require('crypto');
-var require$$1$1 = require('fs');
+var fs$2 = require('fs');
 var readline = require('node:readline');
 var require$$2 = require('os');
 
 const { version: version$2 } = JSON.parse(fs$1.readFileSync(new URL('../../package.json', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)))).toString());
 const VERSION = version$2;
+/**
+ * Prefix for resolved fs paths, since windows paths may not be valid as URLs.
+ */
+const FS_PREFIX = `/@fs/`;
 const VITE_PACKAGE_DIR = path$3.resolve(
 // import.meta.url is `dist/node/constants.js` after bundle
 node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))), '../../..');
@@ -3341,11 +3345,39 @@ function testCaseInsensitiveFS() {
     }
     return fs$1.existsSync(CLIENT_ENTRY.replace('client.mjs', 'cLiEnT.mjs'));
 }
-testCaseInsensitiveFS();
+const isCaseInsensitiveFS = testCaseInsensitiveFS();
 const isWindows = os$1.platform() === 'win32';
+const VOLUME_RE = /^[A-Z]:/i;
 function normalizePath(id) {
     return path$3.posix.normalize(isWindows ? slash(id) : id);
 }
+function fsPathFromId(id) {
+    const fsPath = normalizePath(id.startsWith(FS_PREFIX) ? id.slice(FS_PREFIX.length) : id);
+    return fsPath[0] === '/' || fsPath.match(VOLUME_RE) ? fsPath : `/${fsPath}`;
+}
+function fsPathFromUrl(url) {
+    return fsPathFromId(cleanUrl(url));
+}
+/**
+ * Check if dir is a parent of file
+ *
+ * Warning: parameters are not validated, only works with normalized absolute paths
+ *
+ * @param dir - normalized absolute path
+ * @param file - normalized absolute path
+ * @returns true if dir is a parent of file
+ */
+function isParentDirectory(dir, file) {
+    if (dir[dir.length - 1] !== '/') {
+        dir = `${dir}/`;
+    }
+    return (file.startsWith(dir) ||
+        (isCaseInsensitiveFS && file.toLowerCase().startsWith(dir.toLowerCase())));
+}
+const postfixRE = /[?#].*$/s;
+function cleanUrl(url) {
+    return url.replace(postfixRE, '');
+}
 function isObject(value) {
     return Object.prototype.toString.call(value) === '[object Object]';
 }
@@ -3596,7 +3628,7 @@ var etag_1 = etag;
  */
 
 var crypto = require$$0$2;
-var Stats = require$$1$1.Stats;
+var Stats = fs$2.Stats;
 
 /**
  * Module variables.
@@ -3920,6 +3952,22 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
     return searchForWorkspaceRoot(dir, root);
 }
 
+/**
+ * Check if the url is allowed to be served, via the `server.fs` config.
+ */
+function isFileServingAllowed(url, server) {
+    if (!server.config.server.fs.strict)
+        return true;
+    const file = fsPathFromUrl(url);
+    if (server._fsDenyGlob(file))
+        return false;
+    if (server.moduleGraph.safeModulesPath.has(file))
+        return true;
+    if (server.config.server.fs.allow.some((dir) => isParentDirectory(dir, file)))
+        return true;
+    return false;
+}
+
 var mainExports = {};
 var main$1 = {
   get exports(){ return mainExports; },
@@ -4000,7 +4048,7 @@ var require$$3 = {
 	engines: engines
 };
 
-const fs = require$$1$1;
+const fs = fs$2;
 const path = require$$0$1;
 const os = require$$2;
 const packageJson = require$$3;
@@ -4238,6 +4286,7 @@ exports.rollupVersion = rollup.VERSION;
 exports.createFilter = createFilter;
 exports.createLogger = createLogger;
 exports.isCSSRequest = isCSSRequest;
+exports.isFileServingAllowed = isFileServingAllowed;
 exports.loadEnv = loadEnv;
 exports.mergeAlias = mergeAlias;
 exports.mergeConfig = mergeConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.3.0-beta.7",
+  "version": "4.3.0-beta.8",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -86,6 +86,7 @@
     "@rollup/plugin-typescript": "^11.0.0",
     "@rollup/pluginutils": "^5.0.2",
     "@types/pnpapi": "^0.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",