Skip to content

Commit 56f94c7

Browse files
sapphi-redsapphi-red
authored
feat: bump rolldown (#344)
1 parent 2c4159e commit 56f94c7

File tree

7 files changed

+224
-47
lines changed

7 files changed

+224
-47
lines changed

‎packages/vite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"lightningcss": "^1.30.1",
8686
"picomatch": "^4.0.3",
8787
"postcss": "^8.5.6",
88-
"rolldown": "1.0.0-beta.29",
88+
"rolldown": "1.0.0-beta.30",
8989
"tinyglobby": "^0.2.14"
9090
},
9191
"optionalDependencies": {
@@ -97,7 +97,7 @@
9797
"@jridgewell/trace-mapping": "^0.3.29",
9898
"@oxc-project/types": "0.77.3",
9999
"@polka/compression": "^1.0.0-next.25",
100-
"@rolldown/pluginutils": "1.0.0-beta.29",
100+
"@rolldown/pluginutils": "1.0.0-beta.30",
101101
"@rollup/plugin-alias": "^5.1.1",
102102
"@rollup/plugin-commonjs": "^28.0.6",
103103
"@rollup/plugin-dynamic-import-vars": "2.1.4",

‎packages/vite/src/node/__tests__/plugins/define.spec.ts

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,66 +31,68 @@ describe('definePlugin', () => {
3131
const transform = await createDefinePluginTransform({
3232
__APP_VERSION__: JSON.stringify('1.0'),
3333
})
34-
expect(await transform('const version = __APP_VERSION__ ;')).toBe(
35-
'const version = "1.0";\n',
34+
expect(await transform('export const version = __APP_VERSION__ ;')).toBe(
35+
'export const version = "1.0";\n',
3636
)
37-
expect(await transform('const version = __APP_VERSION__;')).toBe(
38-
'const version = "1.0";\n',
37+
expect(await transform('export const version = __APP_VERSION__;')).toBe(
38+
'export const version = "1.0";\n',
3939
)
4040
})
4141

4242
test('should not replace if not defined', async () => {
4343
const transform = await createDefinePluginTransform({
4444
__APP_VERSION__: JSON.stringify('1.0'),
4545
})
46-
expect(await transform('const version = "1.0";')).toBe(undefined)
47-
expect(await transform('const version = import.meta.SOMETHING')).toBe(
48-
undefined,
49-
)
46+
expect(await transform('export const version = "1.0";')).toBe(undefined)
47+
expect(
48+
await transform('export const version = import.meta.SOMETHING'),
49+
).toBe(undefined)
5050
})
5151

5252
test('replaces import.meta.env.SSR with false', async () => {
5353
const transform = await createDefinePluginTransform()
54-
expect(await transform('const isSSR = import.meta.env.SSR;')).toBe(
55-
'const isSSR = false;\n',
54+
expect(await transform('export const isSSR = import.meta.env.SSR;')).toBe(
55+
'export const isSSR = false;\n',
5656
)
5757
})
5858

5959
test('preserve import.meta.hot with override', async () => {
6060
// assert that the default behavior is to replace import.meta.hot with undefined
6161
const transform = await createDefinePluginTransform()
62-
expect(await transform('const hot = import.meta.hot;')).toBe(
63-
'const hot = void 0;\n',
62+
expect(await transform('export const hot = import.meta.hot;')).toBe(
63+
'export const hot = void 0;\n',
6464
)
6565
// assert that we can specify a user define to preserve import.meta.hot
6666
const overrideTransform = await createDefinePluginTransform({
6767
'import.meta.hot': 'import.meta.hot',
6868
})
69-
expect(await overrideTransform('const hot = import.meta.hot;')).toBe(
70-
'const hot = import.meta.hot;\n',
69+
expect(await overrideTransform('export const hot = import.meta.hot;')).toBe(
70+
'export const hot = import.meta.hot;\n',
7171
)
7272
})
7373

7474
test('replace import.meta.env.UNKNOWN with undefined', async () => {
7575
const transform = await createDefinePluginTransform()
76-
expect(await transform('const foo = import.meta.env.UNKNOWN;')).toBe(
77-
'const foo = undefined ;\n',
76+
expect(await transform('export const foo = import.meta.env.UNKNOWN;')).toBe(
77+
'export const foo = undefined ;\n',
7878
)
7979
})
8080

8181
test('leave import.meta.env["UNKNOWN"] to runtime', async () => {
8282
const transform = await createDefinePluginTransform()
83-
expect(await transform('const foo = import.meta.env["UNKNOWN"];')).toMatch(
84-
/const __vite_import_meta_env__ = .*;\nconst foo = __vite_import_meta_env__\["UNKNOWN"\];/,
83+
expect(
84+
await transform('export const foo = import.meta.env["UNKNOWN"];'),
85+
).toMatch(
86+
/const __vite_import_meta_env__ = .*;\nexport const foo = __vite_import_meta_env__\["UNKNOWN"\];/,
8587
)
8688
})
8789

8890
test('preserve import.meta.env.UNKNOWN with override', async () => {
8991
const transform = await createDefinePluginTransform({
9092
'import.meta.env.UNKNOWN': 'import.meta.env.UNKNOWN',
9193
})
92-
expect(await transform('const foo = import.meta.env.UNKNOWN;')).toBe(
93-
'const foo = import.meta.env.UNKNOWN;\n',
94+
expect(await transform('export const foo = import.meta.env.UNKNOWN;')).toBe(
95+
'export const foo = import.meta.env.UNKNOWN;\n',
9496
)
9597
})
9698

@@ -101,46 +103,46 @@ describe('definePlugin', () => {
101103

102104
expect(
103105
await transform(
104-
'const isLegacy = import.meta.env.LEGACY;\nimport.meta.env.UNDEFINED && console.log(import.meta.env.UNDEFINED);',
106+
'export const isLegacy = import.meta.env.LEGACY;\nimport.meta.env.UNDEFINED && console.log(import.meta.env.UNDEFINED);',
105107
),
106108
).toMatchInlineSnapshot(`
107-
"const isLegacy = __VITE_IS_LEGACY__;
109+
"export const isLegacy = __VITE_IS_LEGACY__;
108110
undefined && console.log(undefined );
109111
"
110112
`)
111113
})
112114

113115
test('replace bare import.meta.env', async () => {
114116
const transform = await createDefinePluginTransform()
115-
expect(await transform('const env = import.meta.env;')).toMatch(
116-
/const __vite_import_meta_env__ = .*;\nconst env = __vite_import_meta_env__;/,
117+
expect(await transform('export const env = import.meta.env;')).toMatch(
118+
/const __vite_import_meta_env__ = .*;\nexport const env = __vite_import_meta_env__;/,
117119
)
118120
})
119121

120122
test('already has marker', async () => {
121123
const transform = await createDefinePluginTransform()
122124
expect(
123125
await transform(
124-
'console.log(__vite_import_meta_env__);\nconst env = import.meta.env;',
126+
'console.log(__vite_import_meta_env__);\nexport const env = import.meta.env;',
125127
),
126128
).toMatch(
127-
/const __vite_import_meta_env__1 = .*;\nconsole.log\(__vite_import_meta_env__\);\nconst env = __vite_import_meta_env__1;/,
129+
/const __vite_import_meta_env__1 = .*;\nconsole.log\(__vite_import_meta_env__\);\nexport const env = __vite_import_meta_env__1;/,
128130
)
129131

130132
expect(
131133
await transform(
132-
'console.log(__vite_import_meta_env__, __vite_import_meta_env__1);\n const env = import.meta.env;',
134+
'console.log(__vite_import_meta_env__, __vite_import_meta_env__1);\n export const env = import.meta.env;',
133135
),
134136
).toMatch(
135-
/const __vite_import_meta_env__2 = .*;\nconsole.log\(__vite_import_meta_env__, __vite_import_meta_env__1\);\nconst env = __vite_import_meta_env__2;/,
137+
/const __vite_import_meta_env__2 = .*;\nconsole.log\(__vite_import_meta_env__, __vite_import_meta_env__1\);\nexport const env = __vite_import_meta_env__2;/,
136138
)
137139

138140
expect(
139141
await transform(
140-
'console.log(__vite_import_meta_env__);\nconst env = import.meta.env;\nconsole.log(import.meta.env.UNDEFINED);',
142+
'console.log(__vite_import_meta_env__);\nexport const env = import.meta.env;\nconsole.log(import.meta.env.UNDEFINED);',
141143
),
142144
).toMatch(
143-
/const __vite_import_meta_env__1 = .*;\nconsole.log\(__vite_import_meta_env__\);\nconst env = __vite_import_meta_env__1;\nconsole.log\(undefined {26}\);/,
145+
/const __vite_import_meta_env__1 = .*;\nconsole.log\(__vite_import_meta_env__\);\nexport const env = __vite_import_meta_env__1;\nconsole.log\(undefined {26}\);/,
144146
)
145147
})
146148
})

‎packages/vite/src/node/__tests__/plugins/oxc.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ return exports;
263263
'iife',
264264
)
265265
expect(result).toMatchInlineSnapshot(`
266-
"var lib = function(exports) {var babelHelpers_asyncToGenerator;!(() => {function e(e,t,n,r,i,a,o){try{var s=e[a](o),c=s.value}catch(e){return void n(e)}s.done?t(c):Promise.resolve(c).then(r,i)}function t(t){return function(){var n=this,r=arguments;return new Promise(function(i,a){var o=t.apply(n,r);function s(t){e(o,i,a,s,c,\`next\`,t)}function c(t){e(o,i,a,s,c,\`throw\`,t)}s(void 0)})}}babelHelpers_asyncToGenerator=t;})();
266+
"var lib = (function(exports) {var babelHelpers_asyncToGenerator;!(() => {function e(e,t,n,r,i,a,o){try{var s=e[a](o),c=s.value}catch(e){return void n(e)}s.done?t(c):Promise.resolve(c).then(r,i)}function t(t){return function(){var n=this,r=arguments;return new Promise(function(i,a){var o=t.apply(n,r);function s(t){e(o,i,a,s,c,\`next\`,t)}function c(t){e(o,i,a,s,c,\`throw\`,t)}s(void 0)})}}babelHelpers_asyncToGenerator=t;})();
267267
268268
//#region entry.js
269269
babelHelpers_asyncToGenerator(function* () {
@@ -274,7 +274,7 @@ return exports;
274274
//#endregion
275275
exports.foo = foo;
276276
return exports;
277-
}({});
277+
})({});
278278
"
279279
`)
280280
})

‎packages/vite/src/node/server/pluginContainer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,8 @@ class MinimalPluginContext<T extends Environment = Environment>
643643

644644
class PluginContext
645645
extends MinimalPluginContext
646-
implements Omit<RollupPluginContext, 'cache'>
646+
// fs will be implemented in 7.1
647+
implements Omit<RollupPluginContext, 'cache' | 'fs'>
647648
{
648649
ssr = false
649650
_scan = false
@@ -960,7 +961,8 @@ class LoadPluginContext extends PluginContext {
960961

961962
class TransformPluginContext
962963
extends LoadPluginContext
963-
implements Omit<RollupTransformPluginContext, 'cache'>
964+
// fs will be implemented in 7.1
965+
implements Omit<RollupTransformPluginContext, 'cache' | 'fs'>
964966
{
965967
filename: string
966968
originalCode: string

‎playground/lib/__tests__/lib.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ describe.runIf(isBuild)('build', () => {
2929
)
3030
const namedCode = readFile('dist/named/my-lib-named.iife.js')
3131
// esbuild helpers are injected inside of the IIFE wrapper
32-
expect(code).toMatch(/^\/\*[^*]*\*\/\s*var MyLib=function\(\)\{\s*/)
32+
expect(code).toMatch(/^\/\*[^*]*\*\/\s*var MyLib=\(function\(\)\{\s*/)
3333
expect(noMinifyCode).toMatch(
34-
/^\/\*[^*]*\*\/\s*var MyLib\s*=\s*function\(\)\s*\{\s*/,
34+
/^\/\*[^*]*\*\/\s*var MyLib\s*=\s*\(function\(\)\s*\{\s*/,
3535
)
36-
expect(namedCode).toMatch(/^var MyLibNamed=function\([^()]+\)\{\s*/)
36+
expect(namedCode).toMatch(/^var MyLibNamed=\(function\([^()]+\)\{\s*/)
3737
})
3838

3939
test('restrisct-helpers-injection', async () => {

‎playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"convert-source-map": "^2.0.0",
1111
"css-color-names": "^1.0.1",
1212
"kill-port": "^1.6.1",
13-
"rolldown": "1.0.0-beta.29"
13+
"rolldown": "1.0.0-beta.30"
1414
}
1515
}

0 commit comments

Comments
 (0)