michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not crawl non-style deps imported by styles (#4115)

Browse source 
* fix: do not crawl non-style deps imported by styles

* Update vite.ts

Co-authored-by: Nate Moore <nate@astro.build>
This commit is contained in:
Nate Moore 2022-08-02 10:26:38 -05:00 committed by GitHub
parent 004995eecd
commit 26cc0bbf78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/weak-crabs-pump.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix edge case with hoisted scripts and Tailwind during dev

9
packages/astro/src/core/render/dev/vite.ts
View file

@ -1,5 +1,6 @@
import npath from 'path'; import npath from 'path';
import vite from 'vite'; import vite from 'vite';
import { STYLE_EXTENSIONS } from '../util.js';
import { unwrapId } from '../../util.js'; import { unwrapId } from '../../util.js';
/** /**
@ -36,6 +37,7 @@ export async function* crawlGraph(
} }
if (id === entry.id) { if (id === entry.id) {
scanned.add(id); scanned.add(id);
const entryIsStyle = STYLE_EXTENSIONS.has(npath.extname(id))
for (const importedModule of entry.importedModules) { for (const importedModule of entry.importedModules) {
// some dynamically imported modules are *not* server rendered in time // some dynamically imported modules are *not* server rendered in time
// to only SSR modules that we can safely transform, we check against // to only SSR modules that we can safely transform, we check against
@ -43,6 +45,13 @@ export async function* crawlGraph(
if (importedModule.id) { if (importedModule.id) {
// use URL to strip special query params like "?content" // use URL to strip special query params like "?content"
const { pathname } = new URL(`file://${importedModule.id}`); const { pathname } = new URL(`file://${importedModule.id}`);
// If the entry is a style, skip any modules that are not also styles.
// Tools like Tailwind might add HMR dependencies as `importedModules`
// but we should skip them--they aren't really imported. Without this,
// every hoisted script in the project is added to every page!
if (entryIsStyle && !STYLE_EXTENSIONS.has(npath.extname(pathname))) {
continue;
}
if (fileExtensionsToSSR.has(npath.extname(pathname))) { if (fileExtensionsToSSR.has(npath.extname(pathname))) {
const mod = viteServer.moduleGraph.getModuleById(importedModule.id); const mod = viteServer.moduleGraph.getModuleById(importedModule.id);
if (!mod?.ssrModule) { if (!mod?.ssrModule) {