diff --git a/packages/vite/src/node/plugin.ts b/packages/vite/src/node/plugin.ts index f2d73cbf1232e0..e522295f30c896 100644 --- 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 index 4426150cccd59e..c92e7fe80c1e84 100644 --- 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 index 9961e7629311c2..8a9ab56559815b 100644 --- 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 index d69e6be820f431..13e870df0a84f2 100644 --- 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 index 63ea68d2ed6d3c..13904ce04922a4 100644 --- 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,