feat: safeModulePaths and denyGlob out of the server

packages/vite/src/node/__tests__/external.spec.ts

@@ -1,6 +1,5 @@
 import { fileURLToPath } from 'node:url'
 import { describe, expect, test } from 'vitest'
-import type { SSROptions } from '../ssr'
 import { resolveConfig } from '../config'
 import { createIsConfiguredAsExternal } from '../external'
 import { Environment } from '../environment'
@@ -27,6 +26,5 @@ async function createIsExternal(external?: true) {
     'serve',
   )
   const environment = new Environment('ssr', resolvedConfig)
-  console.log(environment.options)
   return createIsConfiguredAsExternal(environment)
 }

packages/vite/src/node/plugins/asset.ts

@@ -30,8 +30,6 @@ import {
 } from '../utils'
 import { DEFAULT_ASSETS_INLINE_LIMIT, FS_PREFIX } from '../constants'
 import { cleanUrl, withTrailingSlash } from '../../shared/utils'
-import type { ViteDevServer } from '../server'
-import type { DevEnvironment } from '../server/environment'
 
 // referenceId is base64url but replaces - with $
 export const assetUrlRE = /__VITE_ASSET__([\w$]+)__(?:\$_(.*?)__)?/g
@@ -142,7 +140,6 @@ const viteBuildPublicIdPrefix = '\0vite:asset:public'
  */
 export function assetPlugin(config: ResolvedConfig): Plugin {
   registerCustomMime()
-  let server: ViteDevServer
 
   return {
     name: 'vite:asset',
@@ -152,10 +149,6 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
       generatedAssets.set(config, new Map())
     },
 
-    configureServer(_server) {
-      server = _server
-    },
-
     resolveId(id) {
       if (!config.assetsInclude(cleanUrl(id)) && !urlRE.test(id)) {
         return
@@ -199,12 +192,12 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
       let url = await fileToUrl(id, config, this)
 
       // Inherit HMR timestamp if this asset was invalidated
-      if (server) {
-        const environment = this.environment as DevEnvironment | undefined
-        const mod = environment?.moduleGraph.getModuleById(id)
-        if (mod && mod.lastHMRTimestamp > 0) {
-          url = injectQuery(url, `t=${mod.lastHMRTimestamp}`)
-        }
+      const environment = this.environment
+      const mod =
+        environment?.mode === 'dev' &&
+        environment?.moduleGraph.getModuleById(id)
+      if (mod && mod.lastHMRTimestamp > 0) {
+        url = injectQuery(url, `t=${mod.lastHMRTimestamp}`)
       }
 
       return {

packages/vite/src/node/plugins/esbuild.ts

@@ -251,6 +251,8 @@ export function esbuildPlugin(config: ResolvedConfig): Plugin {
 
   return {
     name: 'vite:esbuild',
+    // TODO: Decouple server, the resolved config should be enough
+    // We may need a `configureWatcher` hook
     configureServer(_server) {
       server = _server
       server.watcher

packages/vite/src/node/plugins/importAnalysis.ts

@@ -12,7 +12,6 @@ import { parse as parseJS } from 'acorn'
 import type { Node } from 'estree'
 import { findStaticImports, parseStaticImport } from 'mlly'
 import { makeLegalIdentifier } from '@rollup/pluginutils'
-import type { ViteDevServer } from '..'
 import {
   CLIENT_DIR,
   CLIENT_PUBLIC_PATH,
@@ -55,6 +54,7 @@ import { getDepOptimizationConfig } from '../config'
 import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
 import type { DevEnvironment } from '../server/environment'
+import { addSafeModulePath } from '../server/middlewares/static'
 import { shouldExternalize } from '../external'
 import { optimizedDepNeedsInterop } from '../optimizer'
 import {
@@ -140,7 +140,7 @@ function extractImportedBindings(
 }
 
 /**
- * Server-only plugin that lexes, resolves, rewrites and analyzes url imports.
+ * Dev-only plugin that lexes, resolves, rewrites and analyzes url imports.
  *
  * - Imports are resolved to ensure they exist on disk
  *
@@ -174,7 +174,6 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   const clientPublicPath = path.posix.join(base, CLIENT_PUBLIC_PATH)
   const enablePartialAccept = config.experimental?.hmrPartialAccept
   const matchAlias = getAliasPatternMatcher(config.resolve.alias)
-  let server: ViteDevServer
 
   let _env: string | undefined
   let _ssrEnv: string | undefined
@@ -205,19 +204,12 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
   return {
     name: 'vite:import-analysis',
 
-    configureServer(_server) {
-      server = _server
-    },
-
     async transform(source, importer, options) {
-      // In a real app `server` is always defined, but it is undefined when
-      // running src/node/server/__tests__/pluginContainer.spec.ts
-
       const ssr = options?.ssr === true
-      const environment = this.environment as DevEnvironment | undefined
 
-      if (!server || !environment) {
-        return null
+      const environment = this.environment as DevEnvironment | undefined
+      if (!environment) {
+        return
       }
 
       const moduleGraph = environment.moduleGraph
@@ -531,7 +523,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             // record as safe modules
             // safeModulesPath should not include the base prefix.
             // See https://github.com/vitejs/vite/issues/9438#issuecomment-1465270409
-            server?._safeModulesPath.add(fsPathFromUrl(stripBase(url, base)))
+            addSafeModulePath(config, fsPathFromUrl(stripBase(url, base)))
 
             if (url !== specifier) {
               let rewriteDone = false
@@ -623,7 +615,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
             if (
               !isDynamicImport &&
               isLocalImport &&
-              config.server.preTransformRequests
+              environment.options.dev.preTransformRequests
             ) {
               // pre-transform known direct imports
               // These requests will also be registered in transformRequest to be awaited

packages/vite/src/node/plugins/loadFallback.ts

@@ -6,7 +6,7 @@ import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
 import type { ViteDevServer } from '../server'
 import { extractSourcemapFromFile } from '../server/sourcemap'
-import { isFileServingAllowed } from '../server/middlewares/static'
+import { isFileLoadingAllowed } from '../server/middlewares/static'
 import type { DevEnvironment } from '../server/environment'
 import type { EnvironmentModuleNode } from '../server/moduleGraph'
 import { ensureWatchedFile } from '../utils'
@@ -19,13 +19,19 @@ export const ERR_LOAD_PUBLIC_URL = 'ERR_LOAD_PUBLIC_URL'
  * A plugin to provide build load fallback for arbitrary request with queries.
  */
 export function loadFallbackPlugin(config: ResolvedConfig): Plugin {
-  let server: ViteDevServer
+  let server: ViteDevServer | undefined
   return {
     name: 'vite:load-fallback',
     configureServer(_server) {
       server = _server
     },
     async load(id, options) {
+      if (!server) {
+        // If the DevEnvironment is created as standalone, the configureServer server
+        // won't be called
+        return
+      }
+
       const environment = this.environment as DevEnvironment
       if (!environment) {
         return
@@ -47,7 +53,7 @@ export function loadFallbackPlugin(config: ResolvedConfig): Plugin {
       const file = cleanUrl(id)
       if (
         environment.options.nodeCompatible ||
-        isFileServingAllowed(file, server)
+        isFileLoadingAllowed(config, file) // Do we need fsPathFromId here?
       ) {
         try {
           code = await fsp.readFile(file, 'utf-8')

packages/vite/src/node/publicUtils.ts

@@ -20,5 +20,7 @@ export {
 export { send } from './server/send'
 export { createLogger } from './logger'
 export { searchForWorkspaceRoot } from './server/searchRoot'
+
+// TODO: export isFileLoadingAllowed?
 export { isFileServingAllowed } from './server/middlewares/static'
 export { loadEnv, resolveEnvPrefix } from './env'

packages/vite/src/node/server/__tests__/pluginContainer.spec.ts

@@ -1,11 +1,7 @@
-import { beforeEach, describe, expect, it } from 'vitest'
-import type { PartialResolvedId } from 'rollup'
-import type { ViteDevServer } from 'vite'
+import { describe, expect, it } from 'vitest'
 import type { UserConfig } from '../../config'
 import { resolveConfig } from '../../config'
 import type { Plugin } from '../../plugin'
-import type { PluginContainer } from '../pluginContainer'
-import { createPluginContainer } from '../pluginContainer'
 import { DevEnvironment } from '../environment'
 
 describe('plugin container', () => {
@@ -43,7 +39,7 @@ describe('plugin container', () => {
         },
       }
 
-      const { pluginContainer, environment } = await getPluginContainer({
+      const environment = await getDevEnvironment({
         plugins: [plugin],
       })
 
@@ -53,15 +49,11 @@ describe('plugin container', () => {
       )
       expect(entryModule.meta).toEqual({ x: 1 })
 
-      const loadResult: any = await pluginContainer.load(entryUrl, {
-        environment,
-      })
+      const loadResult: any = await environment.pluginContainer.load(entryUrl)
       expect(loadResult?.meta).toEqual({ x: 2 })
 
-      await pluginContainer.transform(loadResult.code, entryUrl, {
-        environment,
-      })
-      await pluginContainer.close()
+      await environment.pluginContainer.transform(loadResult.code, entryUrl)
+      await environment.pluginContainer.close()
 
       expect(metaArray).toEqual([{ x: 1 }, { x: 2 }])
     })
@@ -89,12 +81,12 @@ describe('plugin container', () => {
         },
       }
 
-      const { pluginContainer, environment } = await getPluginContainer({
+      const environment = await getDevEnvironment({
         plugins: [plugin1, plugin2],
       })
 
       await environment.moduleGraph.ensureEntryFromUrl(entryUrl, false)
-      await pluginContainer.load(entryUrl, { environment })
+      await environment.pluginContainer.load(entryUrl)
 
       expect.assertions(1)
     })
@@ -135,12 +127,12 @@ describe('plugin container', () => {
         },
       }
 
-      const { pluginContainer, environment } = await getPluginContainer({
+      const environment = await getDevEnvironment({
         plugins: [plugin1, plugin2],
       })
 
       await environment.moduleGraph.ensureEntryFromUrl(entryUrl, false)
-      await pluginContainer.load(entryUrl, { environment })
+      await environment.pluginContainer.load(entryUrl)
 
       expect.assertions(2)
     })
@@ -170,19 +162,14 @@ describe('plugin container', () => {
         },
       }
 
-      const { pluginContainer, environment } = await getPluginContainer({
+      const environment = await getDevEnvironment({
         plugins: [plugin],
       })
       await environment.moduleGraph.ensureEntryFromUrl(entryUrl, false)
-      const loadResult: any = await pluginContainer.load(entryUrl, {
-        environment,
-      })
-      const result: any = await pluginContainer.transform(
+      const loadResult: any = await environment.pluginContainer.load(entryUrl)
+      const result: any = await environment.pluginContainer.transform(
         loadResult.code,
         entryUrl,
-        {
-          environment,
-        },
       )
       expect(result.code).equals('2')
     })
@@ -210,29 +197,23 @@ describe('plugin container', () => {
         },
       }
 
-      const { pluginContainer, environment } = await getPluginContainer({
+      const environment = await getDevEnvironment({
         plugins: [plugin],
       })
       await environment.moduleGraph.ensureEntryFromUrl(entryUrl, false)
-      const loadResult: any = await pluginContainer.load(entryUrl, {
-        environment,
-      })
-      const result: any = await pluginContainer.transform(
+      const loadResult: any = await environment.pluginContainer.load(entryUrl)
+      const result: any = await environment.pluginContainer.transform(
         loadResult.code,
         entryUrl,
-        {
-          environment,
-        },
       )
       expect(result.code).equals('3')
     })
   })
 })
 
-async function getPluginContainer(inlineConfig?: UserConfig): Promise<{
-  pluginContainer: PluginContainer
-  environment: DevEnvironment
-}> {
+async function getDevEnvironment(
+  inlineConfig?: UserConfig,
+): Promise<DevEnvironment> {
   const config = await resolveConfig(
     { configFile: false, ...inlineConfig },
     'serve',
@@ -241,14 +222,8 @@ async function getPluginContainer(inlineConfig?: UserConfig): Promise<{
   // @ts-expect-error This plugin requires a ViteDevServer instance.
   config.plugins = config.plugins.filter((p) => !p.name.includes('pre-alias'))
 
-  const pluginContainer = await createPluginContainer(config)
-
-  const mockedServer = {
-    pluginContainer,
-    config,
-  }
-
-  const environment = new DevEnvironment(mockedServer as any, 'client')
+  const environment = new DevEnvironment('client', config)
+  await environment.init()
 
-  return { pluginContainer, environment }
+  return environment
 }