feat: expose isFileServingAllowed as public utility (#12894)

vitejs · Apr 18, 2023 · 93e095c · 93e095c
1 parent 2ddeead
commit 93e095c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts
@@ -9,13 +9,12 @@ import type {
   TransformResult,
 } from 'rollup'
 export type { PluginContext } from 'rollup'
-import type { UserConfig } from './config'
+import type { ConfigEnv, ResolvedConfig, UserConfig } from './config'
 import type { ServerHook } from './server'
 import type { IndexHtmlTransform } from './plugins/html'
 import type { ModuleNode } from './server/moduleGraph'
 import type { HmrContext } from './server/hmr'
 import type { PreviewServerHook } from './preview'
-import type { ConfigEnv, ResolvedConfig } from './'
 
 /**
  * Vite plugins extends the Rollup plugin interface with a few extra

diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
@@ -20,9 +20,10 @@ import {
   generateCodeFrame,
   timeFrom,
 } from '../utils'
-import type { ResolvedConfig, ViteDevServer } from '..'
+import type { ViteDevServer } from '../server'
+import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
-import { searchForWorkspaceRoot } from '..'
+import { searchForWorkspaceRoot } from '../server/searchRoot'
 
 const debug = createDebugger('vite:esbuild')
 

diff --git a/packages/vite/src/node/publicUtils.ts b/packages/vite/src/node/publicUtils.ts
@@ -15,4 +15,5 @@ export { normalizePath, mergeConfig, mergeAlias, createFilter } from './utils'
 export { send } from './server/send'
 export { createLogger } from './logger'
 export { searchForWorkspaceRoot } from './server/searchRoot'
+export { isFileServingAllowed } from './server/middlewares/static'
 export { loadEnv, resolveEnvPrefix } from './env'
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -79,8 +79,6 @@ import type { TransformOptions, TransformResult } from './transformRequest'
 import { transformRequest } from './transformRequest'
 import { searchForWorkspaceRoot } from './searchRoot'
 
-export { searchForWorkspaceRoot } from './searchRoot'
-
 export interface ServerOptions extends CommonServerOptions {
   /**
    * Configure HMR-specific options (port, host, path & protocol)

diff --git a/packages/vite/src/node/server/middlewares/static.ts b/packages/vite/src/node/server/middlewares/static.ts
@@ -184,6 +184,9 @@ export function serveRawFsMiddleware(
   }
 }
 
+/**
+ * Check if the url is allowed to be served, via the `server.fs` config.
+ */
 export function isFileServingAllowed(
   url: string,
   server: ViteDevServer,