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

perf: async fs calls in resolve and package handling #15211

Closed
wants to merge 9 commits into from
Closed

perf: async fs calls in resolve and package handling #15211

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2b30bb
perf: async fs calls in resolve and package handling
patak-dev Dec 1, 2023
0faf06c
refactor: avoid creating promises in tryCleanFsResolve
patak-dev Dec 2, 2023
06462a8
test: check if windows in CI is happy forcing fs.realpathSync
patak-dev Dec 2, 2023
664284b
Revert "test: check if windows in CI is happy forcing fs.realpathSync"
patak-dev Dec 2, 2023
d3c8f90
fix: optimizeSafeRealPath should be run in parallel
patak-dev Dec 2, 2023
cafe433
fix: back to realpathSync for windows
patak-dev Dec 2, 2023
8d60191
chore: revert "fix: back to realpathSync for windows"
sapphi-red Dec 3, 2023
6a2210d
fix: use `fs.realpath.native` instead of `fsp.realpath`
sapphi-red Dec 3, 2023
fef3099
chore: update return type
patak-dev Dec 9, 2023
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
151 changes: 70 additions & 81 deletions packages/vite/src/node/__tests__/build.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import colors from 'picocolors'
import { describe, expect, test, vi } from 'vitest'
import type { OutputChunk, OutputOptions, RollupOutput } from 'rollup'
import type { LibraryFormats, LibraryOptions } from '../build'
import { build, resolveBuildOutputs, resolveLibFilename } from '../build'
import { build, createResolveLibFilename, resolveBuildOutputs } from '../build'
import type { Logger } from '../logger'
import { createLogger } from '../logger'

Expand Down Expand Up @@ -205,75 +205,71 @@ describe('resolveBuildOutputs', () => {
})

describe('resolveLibFilename', () => {
test('custom filename function', () => {
const filename = resolveLibFilename(
test('custom filename function', async () => {
const resolveLibFilename = await createResolveLibFilename(
{
fileName: (format) => `custom-filename-function.${format}.js`,
entry: 'mylib.js',
},
'es',
'myLib',
resolve(__dirname, 'packages/name'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(filename).toBe('custom-filename-function.es.js')
})

test('custom filename string', () => {
const filename = resolveLibFilename(
test('custom filename string', async () => {
const resolveLibFilename = await createResolveLibFilename(
{
fileName: 'custom-filename',
entry: 'mylib.js',
},
'es',
'myLib',
resolve(__dirname, 'packages/name'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(filename).toBe('custom-filename.mjs')
})

test('package name as filename', () => {
const filename = resolveLibFilename(
test('package name as filename', async () => {
const resolveLibFilename = await createResolveLibFilename(
{
entry: 'mylib.js',
},
'es',
'myLib',
resolve(__dirname, 'packages/name'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(filename).toBe('mylib.mjs')
})

test('custom filename and no package name', () => {
const filename = resolveLibFilename(
test('custom filename and no package name', async () => {
const resolveLibFilename = await createResolveLibFilename(
{
fileName: 'custom-filename',
entry: 'mylib.js',
},
'es',
'myLib',
resolve(__dirname, 'packages/noname'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(filename).toBe('custom-filename.mjs')
})

test('missing filename', () => {
test('missing filename', async () => {
const resolveLibFilename = await createResolveLibFilename(
{
entry: 'mylib.js',
},
'es',
resolve(__dirname, 'packages/noname'),
)
expect(() => {
resolveLibFilename(
{
entry: 'mylib.js',
},
'es',
'myLib',
resolve(__dirname, 'packages/noname'),
)
resolveLibFilename({ name: 'myLib' })
}).toThrow()
})

test('commonjs package extensions', () => {
test('commonjs package extensions', async () => {
const formatsToFilenames: FormatsToFileNames = [
['es', 'my-lib.mjs'],
['umd', 'my-lib.umd.js'],
Expand All @@ -282,18 +278,17 @@ describe('resolveLibFilename', () => {
]

for (const [format, expectedFilename] of formatsToFilenames) {
const filename = resolveLibFilename(
const resolveLibFilename = await createResolveLibFilename(
baseLibOptions,
format,
'myLib',
resolve(__dirname, 'packages/noname'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(filename).toBe(expectedFilename)
}
})

test('module package extensions', () => {
test('module package extensions', async () => {
const formatsToFilenames: FormatsToFileNames = [
['es', 'my-lib.js'],
['umd', 'my-lib.umd.cjs'],
Expand All @@ -302,39 +297,37 @@ describe('resolveLibFilename', () => {
]

for (const [format, expectedFilename] of formatsToFilenames) {
const filename = resolveLibFilename(
const resolveLibFilename = await createResolveLibFilename(
baseLibOptions,
format,
'myLib',
resolve(__dirname, 'packages/module'),
)

const filename = resolveLibFilename({ name: 'myLib' })
expect(expectedFilename).toBe(filename)
}
})

test('multiple entries with aliases', () => {
test('multiple entries with aliases', async () => {
const libOptions: LibraryOptions = {
entry: {
entryA: 'entryA.js',
entryB: 'entryB.js',
},
}

const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)
const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('entryA.mjs')
expect(fileName2).toBe('entryB.mjs')
})

test('multiple entries with aliases: custom filename function', () => {
test('multiple entries with aliases: custom filename function', async () => {
const libOptions: LibraryOptions = {
entry: {
entryA: 'entryA.js',
Expand All @@ -343,93 +336,89 @@ describe('resolveLibFilename', () => {
fileName: (format, entryAlias) =>
`custom-filename-function.${entryAlias}.${format}.js`,
}

const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)
const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('custom-filename-function.entryA.es.js')
expect(fileName2).toBe('custom-filename-function.entryB.es.js')
})

test('multiple entries with aliases: custom filename string', () => {
test('multiple entries with aliases: custom filename string', async () => {
const libOptions: LibraryOptions = {
entry: {
entryA: 'entryA.js',
entryB: 'entryB.js',
},
fileName: 'custom-filename',
}

const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)
const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('custom-filename.mjs')
expect(fileName2).toBe('custom-filename.mjs')
})

test('multiple entries as array', () => {
test('multiple entries as array', async () => {
const libOptions: LibraryOptions = {
entry: ['entryA.js', 'entryB.js'],
}

const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)
const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('entryA.mjs')
expect(fileName2).toBe('entryB.mjs')
})

test('multiple entries as array: custom filename function', () => {
test('multiple entries as array: custom filename function', async () => {
const libOptions: LibraryOptions = {
entry: ['entryA.js', 'entryB.js'],
fileName: (format, entryAlias) =>
`custom-filename-function.${entryAlias}.${format}.js`,
}

const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)
const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('custom-filename-function.entryA.es.js')
expect(fileName2).toBe('custom-filename-function.entryB.es.js')
})

test('multiple entries as array: custom filename string', () => {
test('multiple entries as array: custom filename string', async () => {
const libOptions: LibraryOptions = {
entry: ['entryA.js', 'entryB.js'],
fileName: 'custom-filename',
}
const resolveLibFilename = await createResolveLibFilename(
libOptions,
'es',
resolve(__dirname, 'packages/name'),
)

const [fileName1, fileName2] = ['entryA', 'entryB'].map((entryAlias) =>
resolveLibFilename(
libOptions,
'es',
entryAlias,
resolve(__dirname, 'packages/name'),
),
resolveLibFilename({ name: entryAlias }),
)

expect(fileName1).toBe('custom-filename.mjs')
Expand Down
Loading