Skip to content

feat: non-blocking scanning of dependencies #7379

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

Merged
patak-cat merged 20 commits into from
Mar 23, 2022
Merged

feat: non-blocking scanning of dependencies #7379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0060c11
feat: non-blocking scanning of dependencies
patak-cat Mar 18, 2022
f15c779
fix: calling resolve before listening to the server
patak-cat Mar 19, 2022
07a01b5
chore: merge main
patak-cat Mar 19, 2022
cd57010
chore: merge main
patak-cat Mar 19, 2022
06f1a43
refactor: findOptimizedDepInfo
patak-cat Mar 19, 2022
3e8348e
perf: optimize depInfo iteration
patak-cat Mar 19, 2022
ace8a77
chore: addOptimizedDepInfo
patak-cat Mar 20, 2022
09eaa69
chore: update
patak-cat Mar 20, 2022
93056e1
chore: simplify parsing of metadata
patak-cat Mar 20, 2022
6bf27f4
fix: windows
patak-cat Mar 20, 2022
2b68162
fix: laddle and vaadin start
patak-cat Mar 21, 2022
6519a71
chore: apply suggestions
patak-cat Mar 22, 2022
ecbda41
chore: asCommand log
patak-cat Mar 22, 2022
2d630a3
chore: remove unneeded ssr code
patak-cat Mar 22, 2022
8a54e91
chore: explicit fileHash comparison
patak-cat Mar 22, 2022
e0c54f8
test: increase cli-module timeout
patak-cat Mar 22, 2022
020b25b
chore: mark scan as internal
patak-cat Mar 22, 2022
26e726e
chore: improve logs
patak-cat Mar 22, 2022
e55d8a9
feat: batch dependencies optimized logs
patak-cat Mar 22, 2022
df53203
chore: apply blu suggestion about @internal
patak-cat Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/playground/cli-module/__tests__/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export type {
DepOptimizationOptions,
DepOptimizationResult,
DepOptimizationProcessing,
OptimizedDepInfo
OptimizedDepInfo,
OptimizedDeps
} 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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
Loading