Skip to content

Commit

Permalink
feat: optimizeDeps.disabled (#7646)
Browse files Browse the repository at this point in the history
  • Loading branch information
patak-dev committed Apr 13, 2022
1 parent 83d32d9 commit 48e038c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
3 changes: 2 additions & 1 deletion packages/playground/vue-jsx/vite.config.js
Expand Up @@ -35,5 +35,6 @@ export default defineComponent(() => {
build: {
// to make tests faster
minify: false
}
},
optimizeDeps: false
}
15 changes: 10 additions & 5 deletions packages/vite/src/node/config.ts
Expand Up @@ -145,8 +145,10 @@ export interface UserConfig {
preview?: PreviewOptions
/**
* Dep optimization options
*
* false disables optimization completely (experimental)
*/
optimizeDeps?: DepOptimizationOptions
optimizeDeps?: DepOptimizationOptions | false
/**
* SSR specific options
* @alpha
Expand Down Expand Up @@ -463,6 +465,8 @@ export async function resolveConfig(

const server = resolveServerOptions(resolvedRoot, config.server)

const optimizeDeps = config.optimizeDeps || {}

const resolved: ResolvedConfig = {
...config,
configFile: configFile ? normalizePath(configFile) : undefined,
Expand Down Expand Up @@ -497,11 +501,12 @@ export async function resolveConfig(
packageCache: new Map(),
createResolver,
optimizeDeps: {
...config.optimizeDeps,
disabled: config.optimizeDeps === false,
...optimizeDeps,
esbuildOptions: {
keepNames: config.optimizeDeps?.keepNames,
keepNames: optimizeDeps.keepNames,
preserveSymlinks: config.resolve?.preserveSymlinks,
...config.optimizeDeps?.esbuildOptions
...optimizeDeps.esbuildOptions
}
},
worker: resolvedWorkerOptions
Expand Down Expand Up @@ -605,7 +610,7 @@ export async function resolveConfig(
}
})

if (config.optimizeDeps?.keepNames) {
if (optimizeDeps.keepNames) {
logDeprecationWarning(
'optimizeDeps.keepNames',
'Use "optimizeDeps.esbuildOptions.keepNames" instead.'
Expand Down
6 changes: 6 additions & 0 deletions packages/vite/src/node/optimizer/index.ts
Expand Up @@ -101,6 +101,12 @@ export interface DepOptimizationOptions {
* @experimental
*/
extensions?: string[]
/**
* Disables dependencies optimizations
* @default false
* @experimental
*/
disabled?: boolean
}

export interface DepOptimizationResult {
Expand Down
10 changes: 8 additions & 2 deletions packages/vite/src/node/server/index.ts
Expand Up @@ -571,6 +571,12 @@ export async function createServer(
// error handler
middlewares.use(errorMiddleware(server, !!middlewareMode))

const initOptimizer = () => {
if (!config.optimizeDeps.disabled) {
server._optimizedDeps = createOptimizedDeps(server)
}
}

if (!middlewareMode && httpServer) {
let isOptimized = false
// overwrite listen to init optimizer before server start
Expand All @@ -579,7 +585,7 @@ export async function createServer(
if (!isOptimized) {
try {
await container.buildStart({})
server._optimizedDeps = createOptimizedDeps(server)
initOptimizer()
isOptimized = true
} catch (e) {
httpServer.emit('error', e)
Expand All @@ -590,7 +596,7 @@ export async function createServer(
}) as any
} else {
await container.buildStart({})
server._optimizedDeps = createOptimizedDeps(server)
initOptimizer()
}

return server
Expand Down

0 comments on commit 48e038c

Please sign in to comment.