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.

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

feat: non-blocking scanning of dependencies #7379

Merged
merged 20 commits into from Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/playground/cli-module/__tests__/serve.js
Expand Up @@ -78,7 +78,7 @@ exports.serve = async function serve(root, isProd) {
const timeoutError = `server process still alive after 3s`
try {
killProcess(serverProcess)
await resolvedOrTimeout(serverProcess, 3000, timeoutError)
await resolvedOrTimeout(serverProcess, 10000, timeoutError)
} catch (e) {
if (e === timeoutError || (!serverProcess.killed && !isWindows)) {
collectErrorStreams('server', e)
Expand Down
3 changes: 2 additions & 1 deletion packages/vite/src/node/index.ts
Expand Up @@ -39,7 +39,8 @@ export type {
DepOptimizationOptions,
DepOptimizationResult,
DepOptimizationProcessing,
OptimizedDepInfo
OptimizedDepInfo,
OptimizedDeps
patak-dev marked this conversation as resolved.
Show resolved Hide resolved
} from './optimizer'
export type { Plugin } from './plugin'
export type { PackageCache, PackageData } from './packages'
Expand Down
10 changes: 5 additions & 5 deletions packages/vite/src/node/optimizer/esbuildDepPlugin.ts
Expand Up @@ -37,8 +37,7 @@ const externalTypes = [
export function esbuildDepPlugin(
qualified: Record<string, string>,
exportsData: Record<string, ExportsData>,
config: ResolvedConfig,
ssr?: boolean
config: ResolvedConfig
): Plugin {
// remove optimizable extensions from `externalTypes` list
const allExternalTypes = config.optimizeDeps.extensions
Expand All @@ -48,12 +47,13 @@ export function esbuildDepPlugin(
: externalTypes

// default resolver which prefers ESM
const _resolve = config.createResolver({ asSrc: false })
const _resolve = config.createResolver({ asSrc: false, scan: true })

// cjs resolver that prefers Node
const _resolveRequire = config.createResolver({
asSrc: false,
isRequire: true
isRequire: true,
scan: true
})

const resolve = (
Expand All @@ -72,7 +72,7 @@ export function esbuildDepPlugin(
_importer = importer in qualified ? qualified[importer] : importer
}
const resolver = kind.startsWith('require') ? _resolveRequire : _resolve
return resolver(id, _importer, undefined, ssr)
return resolver(id, _importer, undefined)
}

return {
Expand Down