Skip to content

Commit a466c67

Browse files
author
Tyler Brenneman
committed
fix: react fast refresh by reordering Vite React preamble script first
1 parent 72838a2 commit a466c67

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

src/helpers.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,26 @@ export function isObject(value: unknown): value is Record<string, unknown> {
2525
function getViteScripts() {
2626
const entries: string[] = []
2727

28-
for (const source of bundleEntries) {
29-
if (/\.(js|ts)x?/.test(source)) {
30-
entries.push(`<script type="module" src="/${source}"></script>`)
31-
} else if (/\.(css|less|sass|scss|postcss)/.test(source)) {
32-
entries.push(`<link rel="stylesheet" href="/${source}"/>`)
33-
}
34-
}
35-
36-
let scripts = `
37-
<script type="module" src="/@vite/client"></script>
38-
${entries.join('\n')}
39-
`
28+
entries.push('<script type="module" src="/@vite/client"></script>')
4029

4130
const isUsingReact = resolvedConfig.plugins.find(({ name }) => name === 'vite:react-refresh')
42-
4331
if (isUsingReact) {
44-
scripts += `
32+
entries.push(`
4533
<script type="module">
4634
${viteReact.preambleCode.replace('__BASE__', resolvedConfig.base)}
4735
</script>
48-
`
36+
`)
37+
}
38+
39+
for (const source of bundleEntries) {
40+
if (/\.(js|ts)x?/.test(source)) {
41+
entries.push(`<script type="module" src="/${source}"></script>`)
42+
} else if (/\.(css|less|sass|scss|postcss)/.test(source)) {
43+
entries.push(`<link rel="stylesheet" href="/${source}"/>`)
44+
}
4945
}
5046

51-
return scripts
47+
return entries.join('\n')
5248
}
5349

5450
/**

0 commit comments

Comments
 (0)