Skip to content

Commit b81ef40

Browse files
authored
fix: remove automatic setting of rolldown inlineConst (#1225)
1 parent bb4b033 commit b81ef40

File tree

3 files changed

+22
-34
lines changed

3 files changed

+22
-34
lines changed

.changeset/tall-days-draw.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/vite-plugin-svelte': patch
3+
---
4+
5+
Remove automatic configuration for rolldownOptions.optimization.inlineConst because latest version of rolldown-vite has it enabled by default.

packages/vite-plugin-svelte/src/plugins/configure.js

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
} from '../utils/options.js';
1313
import { buildIdFilter, buildIdParser } from '../utils/id.js';
1414
import { createCompileSvelte } from '../utils/compile.js';
15-
import { gte } from '../utils/svelte-version.js';
1615

1716
// @ts-ignore rolldownVersion
1817
const { version: viteVersion, rolldownVersion } = vite;
@@ -59,39 +58,7 @@ export function configure(api, inlineOptions) {
5958
preOptions = await preResolveOptions(inlineOptions, config, configEnv);
6059
// extra vite config
6160
const extraViteConfig = await buildExtraViteConfig(preOptions, config);
62-
63-
if (
64-
rolldownVersion &&
65-
configEnv.command === 'build' &&
66-
gte(rolldownVersion, '1.0.0-beta.35') // inlineConst received a critical bugfix in 1.0.0-beta.35
67-
) {
68-
extraViteConfig.build ??= {};
69-
// rename rollupOptions to rolldownOptions
70-
//@ts-ignore rolldownOptions only exists in rolldown-vite
71-
extraViteConfig.build.rolldownOptions = extraViteConfig.build.rollupOptions || {};
72-
delete extraViteConfig.build.rollupOptions;
73-
// read user config inlineConst value
74-
const inlineConst =
75-
//@ts-ignore optimization only exists in rolldown-vite
76-
config.build?.rolldownOptions?.optimization?.inlineConst ??
77-
//@ts-ignore optimization only exists in rolldown-vite
78-
config.build?.rollupOptions?.optimization?.inlineConst;
79-
80-
if (inlineConst == null) {
81-
// set inlineConst build optimization for esm-env
82-
//@ts-ignore rolldownOptions only exists in rolldown-vite
83-
extraViteConfig.build.rolldownOptions.optimization ??= {};
84-
//@ts-ignore rolldownOptions only exists in rolldown-vite
85-
extraViteConfig.build.rolldownOptions.optimization.inlineConst = true;
86-
} else if (inlineConst === false) {
87-
log.warn(
88-
'Your rolldown config contains `optimization.inlineConst: false`. This can lead to increased bundle size and leaked server code in client build.'
89-
);
90-
}
91-
}
92-
9361
log.debug('additional vite config', extraViteConfig, 'config');
94-
9562
return extraViteConfig;
9663
}
9764
},

packages/vite-plugin-svelte/src/utils/options.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ const {
66
defaultClientConditions,
77
defaultServerConditions,
88
normalizePath,
9-
searchForWorkspaceRoot
9+
searchForWorkspaceRoot,
10+
// @ts-ignore
11+
rolldownVersion
1012
} = vite;
1113
import { log } from './log.js';
1214
import { loadSvelteConfig } from './load-svelte-config.js';
@@ -418,6 +420,20 @@ function validateViteConfig(extraViteConfig, config, options) {
418420
);
419421
}
420422
}
423+
if (rolldownVersion && isBuild) {
424+
// read user config inlineConst value
425+
const inlineConst =
426+
//@ts-ignore optimization only exists in rolldown-vite
427+
config.build?.rolldownOptions?.optimization?.inlineConst ??
428+
//@ts-ignore optimization only exists in rolldown-vite
429+
config.build?.rollupOptions?.optimization?.inlineConst;
430+
431+
if (inlineConst === false) {
432+
log.warn(
433+
'Your rolldown config contains `optimization.inlineConst: false`. This can lead to increased bundle size and leaked server code in client build.'
434+
);
435+
}
436+
}
421437
}
422438

423439
/**

0 commit comments

Comments
 (0)