Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: optimizeDeps.disabled #7646

Merged
merged 3 commits into from Apr 13, 2022
Merged

feat: optimizeDeps.disabled #7646

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
939b38c
feat: optimizeDeps.disabled
patak-dev Apr 8, 2022
edd99bd
chore: update
patak-dev Apr 11, 2022
a7bdb3d
chore: missing line break
patak-dev Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/playground/vue-jsx/vite.config.js
View file
Open in desktop
Expand Up @@ -35,5 +35,6 @@ export default defineComponent(() => {
build: {
// to make tests faster
minify: false
}
},
optimizeDeps: false
}
14 changes: 9 additions & 5 deletions packages/vite/src/node/config.ts
View file
Open in desktop
Expand Up @@ -145,8 +145,9 @@ export interface UserConfig {
preview?: PreviewOptions
/**
* Dep optimization options
* false disables optimization completely (experimental)
patak-dev marked this conversation as resolved.
Show resolved Hide resolved
*/
optimizeDeps?: DepOptimizationOptions
optimizeDeps?: DepOptimizationOptions | false
/**
* SSR specific options
* @alpha
Expand Down Expand Up @@ -463,6 +464,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 +500,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 +609,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
View file
Open in desktop
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
View file
Open in desktop
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