Make 'lit' always be bundled in SSR (withastro#3164)

* Make 'lit' always be bundled in SSR * Adds a changeset
SiriousHunter · Apr 21, 2022 · e4bc30c · e4bc30c
1 parent 45046c2
commit e4bc30c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/core/build/vite-plugin-pages.ts b/src/core/build/vite-plugin-pages.ts
@@ -40,7 +40,9 @@ export function vitePluginPages(opts: StaticBuildOptions, internals: BuildIntern
 				let rendererItems = '';
 				for (const renderer of opts.astroConfig._ctx.renderers) {
 					const variable = `_renderer${i}`;
-					imports.push(`import ${variable} from '${renderer.serverEntrypoint}';`);
+					// Use unshift so that renderers are imported before user code, in case they set globals
+					// that user code depends on.
+					imports.unshift(`import ${variable} from '${renderer.serverEntrypoint}';`);
 					rendererItems += `Object.assign(${JSON.stringify(renderer)}, { ssr: ${variable} }),`;
 					i++;
 				}

diff --git a/test/ssr-lit.test.js b/test/ssr-lit.test.js
@@ -27,6 +27,7 @@ describe('Lit integration in SSR', () => {
 	}
 
 	it('Is able to load', async () => {
+		delete globalThis.window;
 		const html = await fetchHTML('/');
 		const $ = cheerioLoad(html);
 		expect($('#win').text()).to.equal('function');