diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts index 9f91daca8..9f2f8a30d 100644 --- a/packages/vite/src/node/config.ts +++ b/packages/vite/src/node/config.ts @@ -231,6 +231,7 @@ function defaultCreateClientDevEnvironment( return new DevEnvironment(name, config, { hot: true, transport: context.ws, + disableFetchModule: true, }) } diff --git a/packages/vite/src/node/server/environment.ts b/packages/vite/src/node/server/environment.ts index 81a7c6a94..6c8329525 100644 --- a/packages/vite/src/node/server/environment.ts +++ b/packages/vite/src/node/server/environment.ts @@ -22,10 +22,7 @@ import { EnvironmentModuleGraph } from './moduleGraph' import type { EnvironmentModuleNode } from './moduleGraph' import type { HotChannel, NormalizedHotChannel } from './hmr' import { getShortName, normalizeHotChannel, updateModules } from './hmr' -import type { - TransformOptionsInternal, - TransformResult, -} from './transformRequest' +import type { TransformResult } from './transformRequest' import { transformRequest } from './transformRequest' import type { EnvironmentPluginContainer } from './pluginContainer' import { @@ -44,6 +41,8 @@ export interface DevEnvironmentContext { inlineSourceMap?: boolean } depsOptimizer?: DepsOptimizer + /** @internal used for client environment */ + disableFetchModule?: boolean } export class DevEnvironment extends BaseEnvironment { @@ -55,6 +54,10 @@ export class DevEnvironment extends BaseEnvironment { * @internal */ _remoteRunnerOptions: DevEnvironmentContext['remoteRunner'] + /** + * @internal + */ + _skipFsCheck: boolean get pluginContainer(): EnvironmentPluginContainer { if (!this._pluginContainer) @@ -122,6 +125,11 @@ export class DevEnvironment extends BaseEnvironment { this._crawlEndFinder = setupOnCrawlEnd() this._remoteRunnerOptions = context.remoteRunner ?? {} + this._skipFsCheck = !!( + context.transport && + !(isWebSocketServer in context.transport) && + context.transport.skipFsCheck + ) this.hot = context.transport ? isWebSocketServer in context.transport @@ -131,6 +139,9 @@ export class DevEnvironment extends BaseEnvironment { this.hot.setInvokeHandler({ fetchModule: (id, importer, options) => { + if (context.disableFetchModule) { + throw new Error('fetchModule is disabled in this environment') + } return this.fetchModule(id, importer, options) }, getBuiltins: async () => { @@ -216,17 +227,13 @@ export class DevEnvironment extends BaseEnvironment { } } - transformRequest( - url: string, - /** @internal */ - options?: TransformOptionsInternal, - ): Promise { - return transformRequest(this, url, options) + transformRequest(url: string): Promise { + return transformRequest(this, url, { skipFsCheck: this._skipFsCheck }) } async warmupRequest(url: string): Promise { try { - await this.transformRequest(url) + await transformRequest(this, url, { skipFsCheck: true }) } catch (e) { if ( e?.code === ERR_OUTDATED_OPTIMIZED_DEP || diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts index b7e29e929..4a65d4e2b 100644 --- a/packages/vite/src/node/server/hmr.ts +++ b/packages/vite/src/node/server/hmr.ts @@ -84,6 +84,11 @@ export type HotChannelListener = ( ) => void export interface HotChannel { + /** + * When true, the fs access check is skipped in fetchModule. + * Set this for transports that is not exposed over the network. + */ + skipFsCheck?: boolean /** * Broadcast events to all clients */ @@ -1118,6 +1123,7 @@ export function createServerHotChannel(): ServerHotChannel { const outsideEmitter = new EventEmitter() return { + skipFsCheck: true, send(payload: HotPayload) { outsideEmitter.emit('send', payload) }, diff --git a/packages/vite/src/node/server/middlewares/transform.ts b/packages/vite/src/node/server/middlewares/transform.ts index b467ba5bc..9e2b2b90a 100644 --- a/packages/vite/src/node/server/middlewares/transform.ts +++ b/packages/vite/src/node/server/middlewares/transform.ts @@ -57,7 +57,10 @@ const rawRE = /[?&]raw\b/ const inlineRE = /[?&]inline\b/ const svgRE = /\.svg\b/ -function isServerAccessDeniedForTransform(config: ResolvedConfig, id: string) { +export function isServerAccessDeniedForTransform( + config: ResolvedConfig, + id: string, +): boolean { if (rawRE.test(id) || urlRE.test(id) || inlineRE.test(id) || svgRE.test(id)) { return checkLoadingAccess(config, id) !== 'allowed' } @@ -244,14 +247,7 @@ export function transformMiddleware( } // resolve, load and transform using the plugin container - const result = await environment.transformRequest(url, { - allowId(id) { - return ( - id[0] === '\0' || - !isServerAccessDeniedForTransform(server.config, id) - ) - }, - }) + const result = await environment.transformRequest(url) if (result) { const depsOptimizer = environment.depsOptimizer const type = isDirectCSSRequest(url) ? 'css' : 'js' diff --git a/packages/vite/src/node/server/transformRequest.ts b/packages/vite/src/node/server/transformRequest.ts index 2dd0d38cf..addc758a7 100644 --- a/packages/vite/src/node/server/transformRequest.ts +++ b/packages/vite/src/node/server/transformRequest.ts @@ -30,6 +30,7 @@ import { import { isFileLoadingAllowed } from './middlewares/static' import { throwClosedServerError } from './pluginContainer' import type { DevEnvironment } from './environment' +import { isServerAccessDeniedForTransform } from './middlewares/transform' export const ERR_LOAD_URL = 'ERR_LOAD_URL' export const ERR_LOAD_PUBLIC_URL = 'ERR_LOAD_PUBLIC_URL' @@ -55,11 +56,11 @@ export interface TransformOptions { ssr?: boolean } -export interface TransformOptionsInternal { +interface TransformOptionsInternal { /** - * @internal + * Whether to skip the `server.fs` check. */ - allowId?: (id: string) => boolean + skipFsCheck: boolean } // TODO: This function could be moved to the DevEnvironment class. @@ -72,7 +73,7 @@ export interface TransformOptionsInternal { export function transformRequest( environment: DevEnvironment, url: string, - options: TransformOptionsInternal = {}, + options: TransformOptionsInternal, ): Promise { if (environment._closing && environment.config.dev.recoverable) throwClosedServerError() @@ -243,7 +244,11 @@ async function loadAndTransform( const moduleGraph = environment.moduleGraph - if (options.allowId && !options.allowId(id)) { + if ( + !options.skipFsCheck && + id[0] !== '\0' && + isServerAccessDeniedForTransform(config, id) + ) { const err: any = new Error(`Denied ID ${id}`) err.code = ERR_DENIED_ID err.id = id @@ -266,7 +271,7 @@ async function loadAndTransform( // only try the fallback if access is allowed, skip for out of root url // like /service-worker.js or /api/users if ( - environment.config.consumer === 'server' || + options.skipFsCheck || isFileLoadingAllowed(environment.getTopLevelConfig(), slash(file)) ) { try {