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

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

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
22 changes: 22 additions & 0 deletions packages/vite/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,28 @@ License: MIT
By: Rich Harris
Repository: rollup/plugins

> The MIT License (MIT)
>
> Copyright (c) 2019 RollupJS Plugin Contributors (https://github.com/rollup/plugins/graphs/contributors)
>
> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
> in the Software without restriction, including without limitation the rights
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> copies of the Software, and to permit persons to whom the Software is
> furnished to do so, subject to the following conditions:
>
> The above copyright notice and this permission notice shall be included in
> all copies or substantial portions of the Software.
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE SOFTWARE.

---------------------------------------

## acorn
Expand Down
151 changes: 70 additions & 81 deletions packages/vite/src/node/__tests__/build.spec.ts
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
Loading