feat: createWeakData

packages/vite/src/node/environment.ts

@@ -8,17 +8,3 @@ export type Environment =
   | BuildEnvironment
   | ScanEnvironment
   | FutureCompatEnvironment
-
-export function cachedByEnvironment<Data>(
-  create: (environment: Environment) => Data,
-): (environment: Environment) => Data {
-  const cache = new WeakMap<Environment, Data>()
-  return function (environment: Environment) {
-    let data = cache.get(environment)
-    if (!data) {
-      data = create(environment)
-      cache.set(environment, data)
-    }
-    return data
-  }
-}

packages/vite/src/node/index.ts

@@ -12,8 +12,7 @@ export { createServer } from './server'
 export { preview } from './preview'
 export { build, createBuilder } from './build'
 
-// TODO: Can we remove this?
-// export { optimizeDeps } from './optimizer'
+export { optimizeDeps } from './optimizer'
 
 export { formatPostcssSourceMap, preprocessCSS } from './plugins/css'
 export { transformWithEsbuild } from './plugins/esbuild'
@@ -53,6 +52,7 @@ export type {
   ResolvedDevEnvironmentOptions,
 } from './config'
 export type { Plugin, PluginOption, HookHandler } from './plugin'
+export type { Environment } from './environment'
 export type { FilterPattern } from './utils'
 export type { CorsOptions, CorsOrigin, CommonServerOptions } from './http'
 export type {

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

@@ -10,14 +10,15 @@ import { CLIENT_ENTRY } from '../constants'
 import { createIdResolver } from '../idResolver'
 import {
   createFilter,
+  createWeakData,
   normalizePath,
   rawRE,
   requestQueryMaybeEscapedSplitRE,
   requestQuerySplitRE,
   transformStableResult,
   urlRE,
 } from '../utils'
-import { type Environment, cachedByEnvironment } from '../environment'
+import type { Environment } from '../environment'
 import { toAbsoluteGlob } from './importMetaGlob'
 import { hasViteIgnoreRE } from './importAnalysis'
 import { workerOrSharedWorkerRE } from './worker'
@@ -174,7 +175,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
     extensions: [],
   })
 
-  const getFilter = cachedByEnvironment((environment: Environment) => {
+  const getFilter = createWeakData((environment: Environment) => {
     const { include, exclude } =
       environment.options.build.dynamicImportVarsOptions
     return createFilter(include, exclude)

packages/vite/src/node/publicUtils.ts

@@ -15,6 +15,7 @@ export {
   mergeConfig,
   mergeAlias,
   createFilter,
+  createWeakData,
   rollupVersion,
 } from './utils'
 export { send } from './server/send'

packages/vite/src/node/utils.ts

@@ -1438,3 +1438,22 @@ export function partialEncodeURIPath(uri: string): string {
   const postfix = filePath !== uri ? uri.slice(filePath.length) : ''
   return filePath.replaceAll('%', '%25') + postfix
 }
+
+/**
+ * Creates a function that hides the complexities of a WeakMap with an initial value
+ * to implement object metadata. Used by plugins to implement cross hooks per
+ * environment metadata
+ */
+export function createWeakData<Key extends WeakKey, Data>(
+  initial: (key: Key) => Data,
+): (key: Key) => Data {
+  const cache = new WeakMap<Key, Data>()
+  return function (key: Key) {
+    let data = cache.get(key)
+    if (!data) {
+      data = initial(key)
+      cache.set(key, data)
+    }
+    return data
+  }
+}