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

Using Rolldown with Vite v6 #43

Draft
wants to merge 127 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
bf08db0
feat: use rolldown in the dep optimizer
sapphi-red Sep 11, 2024
ffa3e31
feat: use rolldown for build
sapphi-red Sep 12, 2024
326cbc4
chore: skip plugin-legacy build
sapphi-red Sep 12, 2024
7ebc011
chore: skip typecheck for now
sapphi-red Sep 12, 2024
11e7185
chore: 🤖 add justfile for faster dev
IWANABETHATGUY Aug 15, 2024
db165dc
feat: add experimental.enableNativePlugin (#41)
IWANABETHATGUY Sep 10, 2024
6f1fadc
feat: clone class plugins correctly
IWANABETHATGUY Sep 13, 2024
a33802f
feat: native build plugins (#45) (#46)
IWANABETHATGUY Sep 12, 2024
4d44e3e
perf: reduce pre alias plugin in build mode
IWANABETHATGUY Sep 12, 2024
1015194
feat: 🎸 add an new option to disable build report
IWANABETHATGUY Sep 13, 2024
6a8748b
feat: support native define
sapphi-red Sep 18, 2024
16e974c
feat: use filter for plugins (#49) (#50) (#51) (#52) (#53)
sapphi-red Sep 18, 2024
4041e46
perf: ⚡️ use default resolver (#56)
IWANABETHATGUY Sep 14, 2024
5570f29
fix: 🐛 lint (#58)
IWANABETHATGUY Sep 20, 2024
07f5d08
chore: bump rolldown
sapphi-red Sep 24, 2024
13708ac
chore: skip data uri by load fallback plugin for native data uri hand…
sapphi-red Sep 24, 2024
f8c395f
feat: handle non-relative paths by Vite's resolver for enableNativePl…
sapphi-red Sep 19, 2024
de3d275
chore: remove browser field edge case test
sapphi-red Sep 25, 2024
ebaccfb
chore: use advancedChunks instead of manualChunks
sapphi-red Oct 1, 2024
3ca8a3b
feat: convert `optimizeDeps.esbuildOptions` to `optimizeDeps.rollupOp…
sapphi-red Oct 4, 2024
3837a7d
fix: optimizeDeps test pass on windows
sapphi-red Oct 9, 2024
3e8bfcc
chore: make some tests passing
sapphi-red Oct 9, 2024
1dea78b
chore: make glob-import test pass with workarounds
sapphi-red Oct 9, 2024
5c21174
chore: run worker-es tests
sapphi-red Oct 9, 2024
bf8e8b8
fix: use preliminaryFileName for chunkMetadata key
sapphi-red Oct 10, 2024
bb0ee9b
feat: oxc tranformer (#60)
underfin Oct 11, 2024
b95e312
feat: use `onlyRemoveTypeImports`
sapphi-red Oct 11, 2024
9050705
chore: enable continuous release under rolldown-vite (#61)
yyx990803 Oct 12, 2024
c730899
feat: environment aware native plugins
sapphi-red Oct 15, 2024
381783d
feat: export transformWithOxc (#62)
underfin Oct 17, 2024
516124d
feat: add oxc jsxInclude and jsxExclude (#63)
underfin Oct 18, 2024
32f4711
chore: update some tests that relies on rollup's behavior
sapphi-red Oct 24, 2024
3e3a8f4
chore: skip environment-react-ssr for now
sapphi-red Oct 24, 2024
b4e99bb
chore: bump rolldown
sapphi-red Oct 24, 2024
eef952a
chore: skip minifySyntax test as it relies on specific esbuild option
sapphi-red Oct 24, 2024
d588aff
chore: fix type errors
sapphi-red Oct 24, 2024
63370e2
chore: skip sideeffects set for HTML scripts for now
sapphi-red Nov 6, 2024
4be32cc
chore: tweak tests
sapphi-red Nov 6, 2024
0cd5924
chore: bump rolldown
sapphi-red Nov 6, 2024
8e98958
chore: enable backend-integration test
sapphi-red Nov 6, 2024
1472474
chore: skip error message test
sapphi-red Nov 13, 2024
cd45583
feat: enable lib mode tests (#64)
sapphi-red Nov 13, 2024
bbaee44
chore: fix LICENSE
sapphi-red Nov 14, 2024
4291941
chore: uncomment things implemented on rolldown now
sapphi-red Nov 18, 2024
01a83db
chore: enable html sideeffects test
sapphi-red Nov 18, 2024
9ca4b71
chore: reduce diff
sapphi-red Nov 18, 2024
402af90
feat: use native Vite resolver (#65)
sapphi-red Nov 19, 2024
8dbfb1a
chore: add workaround and make environment-react-ssr playground pass
sapphi-red Nov 21, 2024
df383f4
chore: add comment
sapphi-red Nov 21, 2024
76f5211
chore: fix oxc option convertion and reduce warnings
sapphi-red Nov 22, 2024
354e2cf
chore: bump rolldown
sapphi-red Nov 25, 2024
a92e5c6
chore: update snapshot
sapphi-red Nov 25, 2024
11a483e
chore: fix for new vite resolve plugin
sapphi-red Nov 25, 2024
1d4896e
feat: use native plugin for create id resolver (#68)
sapphi-red Nov 25, 2024
d5e94b7
chore: bump rolldown
sapphi-red Nov 28, 2024
88826d6
chore: fix for the latest rolldown
sapphi-red Nov 28, 2024
144458e
chore: enable modulepreload unit test
sapphi-red Nov 28, 2024
44f510f
chore: bump rolldown
sapphi-red Nov 29, 2024
4bd6eb7
chore: set platform option and remove workaround in environment-react…
sapphi-red Nov 29, 2024
7e1cf2e
chore: update some tests that relies on rollup's behavior
sapphi-red Nov 29, 2024
0b35155
feat: use rolldown for config loader (#69)
sapphi-red Nov 29, 2024
db52727
feat: use rolldown effectively for the optimizer (#70)
sapphi-red Nov 29, 2024
a71643e
feat: use oxc for non-native define plugin (#71)
sapphi-red Dec 3, 2024
cb504b8
feat: use lightningcss by default for cssMinify (#72)
sapphi-red Dec 3, 2024
a4323ef
chore: reduce oxc not supported warnings
sapphi-red Dec 3, 2024
309ed6b
feat: use rolldown minify (#73)
sapphi-red Dec 4, 2024
25677f3
fix: isolate `chunk.viteMetadata` values for each build (#74)
hi-ogawa Dec 6, 2024
1317956
perf: do less on js side for optimizer (#76)
sapphi-red Dec 10, 2024
6b5ae7f
chore: bump rolldown
sapphi-red Dec 11, 2024
f753c72
chore: handle oxc errors
sapphi-red Dec 11, 2024
a65a2b2
chore: change for latest native vite resolver plugin
sapphi-red Dec 6, 2024
502a79b
chore: getCombinedSourcemap is now supported
sapphi-red Dec 6, 2024
95f1161
chore: set keepNames
sapphi-red Dec 6, 2024
a49f566
chore: update sourcemap snapshot
sapphi-red Dec 11, 2024
8444ec1
chore: enable some define tests
sapphi-red Dec 11, 2024
bb1ac91
chore: change for latest native json plugin
sapphi-red Dec 11, 2024
8f07fac
chore: update modulePreloadPolyfill snapshot
sapphi-red Dec 11, 2024
b8a6c10
chore: reduce diff for Sourcemap::toUrl/Sourcemap::toString
sapphi-red Dec 11, 2024
8543bda
chore: make external test pass by manually polyfilling require
sapphi-red Dec 11, 2024
dd714ac
chore: remove workaround
sapphi-red Dec 11, 2024
2151478
feat: use oxc for lowering (#77)
sapphi-red Dec 12, 2024
4b01af3
feat: make esbuild optional peer dep (#78)
sapphi-red Dec 12, 2024
6af9cbd
fix(css): inline css insert for single quote `use strict` (#79)
underfin Dec 16, 2024
07a5aee
chore: bump rolldown
sapphi-red Dec 16, 2024
7f32fa9
chore: bump rolldown
sapphi-red Dec 19, 2024
7f59e4b
chore: update for oxc.jsx type change
sapphi-red Dec 19, 2024
229855b
chore: update for PluginContext type change
sapphi-red Dec 19, 2024
e36ce02
fix: return transformed content as `moduleType: 'js'`
sapphi-red Dec 20, 2024
8c471d4
feat: use setPublicClassFields for useDefineForClassFields support
sapphi-red Dec 20, 2024
5349b89
fix: set `onlyRemoveTypeImports: false` by default
sapphi-red Dec 20, 2024
df47dd9
chore: bump rolldown
sapphi-red Dec 20, 2024
ae43864
chore: tweak types
sapphi-red Dec 20, 2024
ed78b68
chore: update some snapshots
sapphi-red Dec 26, 2024
231eebe
chore: bump rolldown
sapphi-red Dec 26, 2024
05d3313
chore: update snapshot
sapphi-red Dec 26, 2024
3df52f2
chore: fix type
sapphi-red Dec 26, 2024
f623ddd
chore: disable rolldown define process.env.NODE_ENV
sapphi-red Dec 26, 2024
0311aa1
chore: suppress rolldown minifier warning
sapphi-red Dec 26, 2024
aad3745
chore: use types from rolldown
sapphi-red Dec 26, 2024
df13437
chore: remove lightningcss from optional peer dep
sapphi-red Dec 28, 2024
2c5c78d
chore: format
sapphi-red Jan 9, 2025
56cf3c3
fix: oxc esbuild transform option compat
sapphi-red Jan 10, 2025
6488b37
fix: use esbuildOptions.platform as rollupOptions.platform for compat
sapphi-red Jan 10, 2025
b56893b
fix: generate sourcemap in oxc plugin
sapphi-red Jan 10, 2025
6fde86b
chore: bump rolldown
sapphi-red Jan 16, 2025
a7b62cd
chore: fix types
sapphi-red Jan 16, 2025
ee3bf5b
chore: skip a test due to bug in rolldown
sapphi-red Jan 16, 2025
982857f
chore: tweak snapshots
sapphi-red Jan 16, 2025
e6598ec
refactor: use parseAst from rolldown (#81)
sapphi-red Jan 17, 2025
8f3fd82
refactor: remove rollup from dependency
sapphi-red Jan 17, 2025
6501f27
fix: don't modify oxc options in each transform
sapphi-red Jan 17, 2025
0a9a201
feat: allow using parseAst from rollup with VITE_USE_LEGACY_PARSE_AST
sapphi-red Jan 17, 2025
c8b81a0
fix: oxc esbuild jsx option compat
sapphi-red Jan 17, 2025
ab52e0e
feat: allow `cssPlugin.transform` to be called
sapphi-red Jan 17, 2025
317f920
chore: export OxcOptions
sapphi-red Jan 17, 2025
b02d678
chore: export esbuildVersion for backward compat
sapphi-red Jan 22, 2025
9602f31
fix: match optimizer entry by file name than facadeModuleId
sapphi-red Jan 22, 2025
b79dc57
chore: bump rolldown
sapphi-red Jan 23, 2025
b3c198d
Revert "chore: skip a test due to bug in rolldown"
sapphi-red Jan 23, 2025
53d3449
chore: use `moduleResolution: bundler` for now
sapphi-red Jan 23, 2025
1d20b9a
fix: double `export default` for txt files
sapphi-red Jan 23, 2025
dad6100
feat: convert esbuild plugin to rolldown plugin
sapphi-red Jan 23, 2025
a0c4fb7
fix: incorrect optimizer file hash
sapphi-red Jan 24, 2025
6a75773
fix: buffer full reload messages
sapphi-red Jan 24, 2025
6768ff2
chore: bump rolldown
sapphi-red Jan 24, 2025
fc32f0b
fix: oxc transpile use normal options over tsconfig options
sapphi-red Jan 24, 2025
794aea0
fix: slient output for runtime helper bundle
sapphi-red Jan 24, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ jobs:
- name: Check formatting
run: pnpm prettier --write --log-level=warn . && git diff --exit-code

- name: Typecheck
run: pnpm run typecheck
# - name: Typecheck
# run: pnpm run typecheck

- name: Test docs
run: pnpm run test-docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/preview-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ permissions:
on:
push:
branches:
- main
- rolldown-v6
pull_request:
types: [opened, synchronize, labeled]

jobs:
preview:
if: >
github.repository == 'vitejs/vite' &&
github.repository == 'rolldown/vite' &&
(github.event_name == 'push' ||
(github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'trigger: preview')))
runs-on: ubuntu-latest
Expand All @@ -35,4 +35,4 @@ jobs:
working-directory: ./packages/vite
run: pnpm build

- run: pnpm dlx [email protected] publish --compact --pnpm ./packages/vite
- run: pnpm dlx [email protected] publish --pnpm ./packages/vite
2 changes: 1 addition & 1 deletion docs/_data/blog.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface Post {
}

declare const data: Post[]
export { data }
export { type data }

export default createContentLoader('blog/*.md', {
// excerpt: true,
Expand Down
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export default tseslint.config(
{
allowModules: [
'vite',
'esbuild',
'less',
'sass',
'sass-embedded',
Expand Down
13 changes: 13 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
build-vite:
pnpm --filter vite run build-bundle

test-serve:
pnpm run test-serve

test-build:
pnpm run test-build

test: test-serve test-build

fmt:
pnpm --filter vite run format
1 change: 0 additions & 1 deletion packages/plugin-legacy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
},
"scripts": {
"dev": "unbuild --stub",
"build": "unbuild && pnpm run patch-cjs",
"patch-cjs": "tsx ../../scripts/patchCJS.ts",
"prepublishOnly": "npm run build"
},
Expand Down
77 changes: 33 additions & 44 deletions packages/vite/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,11 @@ Repository: lukeed/polka

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

## @rollup/plugin-alias, @rollup/plugin-commonjs, @rollup/plugin-dynamic-import-vars, @rollup/pluginutils
## @rollup/plugin-alias, @rollup/plugin-dynamic-import-vars, @rollup/pluginutils
License: MIT
By: Johannes Stein
Repository: rollup/plugins

License: MIT
By: Rich Harris
Repository: rollup/plugins

License: MIT
By: LarsDenBakker
Repository: rollup/plugins
Expand Down Expand Up @@ -584,38 +580,6 @@ Repository: git+https://github.com/paulmillr/chokidar.git

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

## commondir, shell-quote
License: MIT
By: James Halliday
Repositories: http://github.com/substack/node-commondir.git, http://github.com/ljharb/shell-quote.git

> The MIT License
>
> Copyright (c) 2013 James Halliday ([email protected])
>
> 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.

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

## connect
License: MIT
By: TJ Holowaychuk, Douglas Christopher Wilson, Jonathan Ong, Tim Caswell
Expand Down Expand Up @@ -1298,13 +1262,6 @@ Repository: micromatch/is-glob

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

## is-reference
License: MIT
By: Rich Harris
Repository: git+https://github.com/Rich-Harris/is-reference.git

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

## isexe, which
License: ISC
By: Isaac Z. Schlueter
Expand Down Expand Up @@ -2147,6 +2104,38 @@ Repository: kevva/shebang-command

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

## shell-quote
License: MIT
By: James Halliday
Repository: http://github.com/ljharb/shell-quote.git

> The MIT License
>
> Copyright (c) 2013 James Halliday ([email protected])
>
> 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.

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

## sirv
License: MIT
By: Luke Edwards
Expand Down
1 change: 1 addition & 0 deletions packages/vite/index.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const asyncFunctions = [
'createServer',
'preview',
'transformWithEsbuild',
'transformWithOxc',
'resolveConfig',
'optimizeDeps',
'formatPostcssSourceMap',
Expand Down
17 changes: 9 additions & 8 deletions packages/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "module",
"license": "MIT",
"author": "Evan You",
"description": "Native-ESM powered web dev build tool",
"description": "Vite on Rolldown preview",
"bin": {
"vite": "bin/vite.js"
},
Expand Down Expand Up @@ -85,9 +85,9 @@
},
"//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
"dependencies": {
"esbuild": "^0.24.2",
"lightningcss": "^1.28.2",
"postcss": "^8.4.49",
"rollup": "^4.23.0"
"rolldown": "1.0.0-beta.3-commit.ce40585"
},
"optionalDependencies": {
"fsevents": "~2.3.3"
Expand Down Expand Up @@ -117,12 +117,12 @@
"dotenv": "^16.4.7",
"dotenv-expand": "^12.0.1",
"es-module-lexer": "^1.6.0",
"esbuild": "^0.24.2",
"escape-html": "^1.0.3",
"estree-walker": "^3.0.3",
"etag": "^1.8.1",
"http-proxy": "^1.18.1",
"launch-editor-middleware": "^2.9.1",
"lightningcss": "^1.28.2",
"magic-string": "^0.30.17",
"mlly": "^1.7.3",
"mrmime": "^2.0.0",
Expand All @@ -137,6 +137,7 @@
"postcss-load-config": "^6.0.1",
"postcss-modules": "^6.0.1",
"resolve.exports": "^2.0.3",
"rollup": "^4.23.0",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-esbuild": "^6.1.1",
"rollup-plugin-license": "^3.5.3",
Expand All @@ -155,9 +156,9 @@
},
"peerDependencies": {
"@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
"esbuild": "^0.24.0",
"jiti": ">=1.21.0",
"less": "*",
"lightningcss": "^1.21.0",
"sass": "*",
"sass-embedded": "*",
"stylus": "*",
Expand All @@ -170,6 +171,9 @@
"@types/node": {
"optional": true
},
"esbuild": {
"optional": true
},
"jiti": {
"optional": true
},
Expand All @@ -188,9 +192,6 @@
"sugarss": {
"optional": true
},
"lightningcss": {
"optional": true
},
"terser": {
"optional": true
},
Expand Down
4 changes: 3 additions & 1 deletion packages/vite/rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ const nodeConfig = defineConfig({
/^vite\//,
'fsevents',
'rollup/parseAst',
'rolldown/parseAst',
'rolldown/experimental',
/^tsx\//,
/^#/,
...Object.keys(pkg.dependencies),
Expand Down Expand Up @@ -190,7 +192,7 @@ const moduleRunnerConfig = defineConfig({
external: [
'fsevents',
'lightningcss',
'rollup/parseAst',
'rolldown/parseAst',
...Object.keys(pkg.dependencies),
],
plugins: [
Expand Down
20 changes: 10 additions & 10 deletions packages/vite/rollup.dts.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ const pkg = JSON.parse(
const external = [
/^node:*/,
/^vite\//,
'rollup/parseAst',
'rolldown/parseAst',
'rolldown/experimental',
...Object.keys(pkg.dependencies),
...Object.keys(pkg.peerDependencies),
...Object.keys(pkg.devDependencies),
Expand Down Expand Up @@ -46,16 +47,15 @@ const identifierWithTrailingDollarRE = /\b(\w+)\$\d+\b/g
* the module that imports the identifer as a named import alias
*/
const identifierReplacements: Record<string, Record<string, string>> = {
rollup: {
Plugin$1: 'rollup.Plugin',
PluginContext$1: 'rollup.PluginContext',
TransformPluginContext$1: 'rollup.TransformPluginContext',
TransformResult$2: 'rollup.TransformResult',
rolldown: {
Plugin$1: 'rolldown.Plugin',
PluginContext$1: 'rolldown.PluginContext',
TransformPluginContext$1: 'rolldown.TransformPluginContext',
TransformResult$2: 'rolldown.TransformResult',
},
esbuild: {
TransformResult$1: 'esbuild_TransformResult',
TransformOptions$1: 'esbuild_TransformOptions',
BuildOptions$1: 'esbuild_BuildOptions',
'rolldown/experimental': {
TransformOptions$1: 'rolldown_experimental_TransformOptions',
TransformResult$1: 'rolldown_experimental_TransformResult',
},
'node:https': {
Server$1: 'HttpsServer',
Expand Down
8 changes: 4 additions & 4 deletions packages/vite/src/node/__tests__/build.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { basename, resolve } from 'node:path'
import { fileURLToPath } from 'node:url'
import colors from 'picocolors'
import { describe, expect, test, vi } from 'vitest'
import type { OutputChunk, OutputOptions, RollupOutput } from 'rollup'
import type { OutputChunk, OutputOptions, RollupOutput } from 'rolldown'
import type { LibraryFormats, LibraryOptions } from '../build'
import {
build,
Expand Down Expand Up @@ -120,8 +120,8 @@ describe('build', () => {
{
"changed": [
"index",
"_foo",
"_bar",
"_foo",
"_baz.css",
],
"unchanged": [
Expand Down Expand Up @@ -851,11 +851,11 @@ test.for([true, false])(
([client, ssr, custom1, custom2] as RollupOutput[]).map(
(o) => o.output[0].code.split('\n').length,
),
).toEqual([2, 5, 2, 5])
).toEqual([1, 5, 1, 5])
},
)

test('adjust worker build error for worker.format', async () => {
test.skip('adjust worker build error for worker.format', async () => {
try {
await build({
root: resolve(__dirname, 'fixtures/worker-dynamic'),
Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/node/__tests__/environment.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'node:path'
import { describe, expect, onTestFinished, test } from 'vitest'
import type { RollupOutput } from 'rollup'
import type { RolldownOutput } from 'rolldown'
import { createServer } from '../server'
import type { InlineConfig } from '../config'
import { createBuilder } from '../build'
Expand Down Expand Up @@ -167,7 +167,7 @@ describe('custom environment conditions', () => {
const results: Record<string, unknown> = {}
for (const key of ['ssr', 'worker', 'custom1', 'custom1_2']) {
const output = await builder.build(builder.environments[key])
const chunk = (output as RollupOutput).output[0]
const chunk = (output as RolldownOutput).output[0]
const mod = await import(
path.join(
import.meta.dirname,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { describe, expect, test } from 'vitest'
import { parseAst } from 'rollup/parseAst'
import { assetImportMetaUrlPlugin } from '../../plugins/assetImportMetaUrl'
import { resolveConfig } from '../../config'
import { PartialEnvironment } from '../../baseEnvironment'
Expand All @@ -10,9 +9,9 @@ async function createAssetImportMetaurlPluginTransform() {
const environment = new PartialEnvironment('client', config)

return async (code: string) => {
// @ts-expect-error transform should exist
const result = await instance.transform.call(
{ environment, parse: parseAst },
// @ts-expect-error transform.handler should exist
const result = await instance.transform.handler.call(
{ environment },
code,
'foo.ts',
)
Expand Down
Loading
Loading