fix(vite): explicitly import publicAssetsURL

danielroe · danielroe · commit 9d08cdfd1f1d · 2024-03-15T11:00:18.000-07:00
diff --git a/packages/vite/src/plugins/public-dirs.ts b/packages/vite/src/plugins/public-dirs.ts
@@ -24,10 +24,9 @@ export const VitePublicDirsPlugin = createUnplugin(() => {
     vite: {
       load: {
         enforce: 'pre',
-        handler (id, options) {
+        handler (id) {
           if (id.startsWith(PREFIX)) {
-            const helper = !options?.ssr || nitro.options.imports !== false ? '' : 'globalThis.'
-            return `export default ${helper}__publicAssetsURL(${JSON.stringify(decodeURIComponent(id.slice(PREFIX.length)))})`
+            return `import { publicAssetsURL } from '#build/paths.mjs';export default publicAssetsURL(${JSON.stringify(decodeURIComponent(id.slice(PREFIX.length)))})`
           }
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,9 @@ export const VitePublicDirsPlugin = createUnplugin(() => {`
`24`	`24`	`vite: {`
`25`	`25`	`load: {`
`26`	`26`	`enforce: 'pre',`
`27`		`- handler (id, options) {`
	`27`	`+ handler (id) {`
`28`	`28`	`if (id.startsWith(PREFIX)) {`
`29`		`- const helper = !options?.ssr \|\| nitro.options.imports !== false ? '' : 'globalThis.'`
`30`		- return `export default ${helper}__publicAssetsURL(${JSON.stringify(decodeURIComponent(id.slice(PREFIX.length)))})`
	`29`	+ return `import { publicAssetsURL } from '#build/paths.mjs';export default publicAssetsURL(${JSON.stringify(decodeURIComponent(id.slice(PREFIX.length)))})`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`	`},`