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

fix(hmr): HMR regression related to .astro updates (#2681)

Browse source
This commit is contained in:
Nate Moore 2022-02-28 16:00:09 -06:00 • committed by GitHub
parent bfaff255f7
commit 046af36475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/thin-birds-rescue.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix HMR regression related to fine-grained `.astro` HMR. This fixes HMR for Tailwind and CSS styles when `.astro` files are edited.

2
packages/astro/package.json
View file

@ -85,7 +85,7 @@
"htmlparser2": "^7.1.2", "htmlparser2": "^7.1.2",
"kleur": "^4.1.4", "kleur": "^4.1.4",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"micromorph": "^0.0.2", "micromorph": "^0.1.1",
"mime": "^3.0.0", "mime": "^3.0.0",
"parse5": "^6.0.1", "parse5": "^6.0.1",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",

2
packages/astro/src/runtime/client/hmr.ts
View file

@ -1,4 +1,6 @@
if (import.meta.hot) { if (import.meta.hot) {
// signal to Vite that we accept HMR
import.meta.hot.accept((mod) => mod);
const parser = new DOMParser(); const parser = new DOMParser();
import.meta.hot.on('astro:update', async ({ file }) => { import.meta.hot.on('astro:update', async ({ file }) => {
const { default: diff } = await import('micromorph'); const { default: diff } = await import('micromorph');

7
packages/astro/src/vite-plugin-astro/hmr.ts
View file

@ -55,6 +55,12 @@ export function handleHotUpdate(ctx: HmrContext, config: AstroConfig, logging: L
const filtered = new Set<ModuleNode>(ctx.modules); const filtered = new Set<ModuleNode>(ctx.modules);
const files = new Set<string>(); const files = new Set<string>();
for (const mod of ctx.modules) { for (const mod of ctx.modules) {
// This is always the HMR script, we skip it to avoid spamming
// the browser console with HMR updates about this file
if (mod.id?.endsWith('.astro?html-proxy&index=0.js')) {
filtered.delete(mod);
continue;
}
if (mod.file && isCached(config, mod.file)) { if (mod.file && isCached(config, mod.file)) {
filtered.add(mod); filtered.add(mod);
files.add(mod.file); files.add(mod.file);
@ -77,7 +83,6 @@ export function handleHotUpdate(ctx: HmrContext, config: AstroConfig, logging: L
const file = ctx.file.replace(config.projectRoot.pathname, '/'); const file = ctx.file.replace(config.projectRoot.pathname, '/');
logger.info('astro', green('hmr'), `${file}`); logger.info('astro', green('hmr'), `${file}`);
ctx.server.ws.send({ type: 'custom', event: 'astro:update', data: { file } }); ctx.server.ws.send({ type: 'custom', event: 'astro:update', data: { file } });
return [];
} }
return Array.from(filtered); return Array.from(filtered);

7
packages/astro/src/vite-plugin-astro/index.ts
View file

@ -34,6 +34,7 @@ export default function astro({ config, logging }: AstroPluginOptions): vite.Plu
return slash(fileURLToPath(url)) + url.search; return slash(fileURLToPath(url)) + url.search;
} }
let isProduction: boolean;
let viteTransform: TransformHook; let viteTransform: TransformHook;
let viteDevServer: vite.ViteDevServer | null = null; let viteDevServer: vite.ViteDevServer | null = null;
@ -46,6 +47,7 @@ export default function astro({ config, logging }: AstroPluginOptions): vite.Plu
enforce: 'pre', // run transforms before other plugins can enforce: 'pre', // run transforms before other plugins can
configResolved(resolvedConfig) { configResolved(resolvedConfig) {
viteTransform = getViteTransform(resolvedConfig); viteTransform = getViteTransform(resolvedConfig);
isProduction = resolvedConfig.isProduction;
}, },
configureServer(server) { configureServer(server) {
viteDevServer = server; viteDevServer = server;
@ -140,8 +142,11 @@ export default function astro({ config, logging }: AstroPluginOptions): vite.Plu
sourcefile: id, sourcefile: id,
}); });
// Signal to Vite that we accept HMR updates
const SUFFIX = isProduction ? '' : `\nif (import.meta.hot) import.meta.hot.accept((mod) => mod);`;
return { return {
code, code: `${code}${SUFFIX}`,
map, map,
}; };
} catch (err: any) { } catch (err: any) {

8
yarn.lock
View file

@ -5867,10 +5867,10 @@ micromatch@^4.0.2, micromatch@^4.0.4:
braces "^3.0.1" braces "^3.0.1"
picomatch "^2.2.3" picomatch "^2.2.3"
micromorph@^0.0.2: micromorph@^0.1.1:
version "0.0.2" version "0.1.1"
resolved "https://registry.yarnpkg.com/micromorph/-/micromorph-0.0.2.tgz#5cfbaea66ae5fb8629c8041897e88d9e827afc2f" resolved "https://registry.yarnpkg.com/micromorph/-/micromorph-0.1.1.tgz#1772b07f1be6cae10b3210a0f84fe5364987f029"
integrity sha512-hfy/OA8rtwI/vPRm4L6a3/u6uDvqsPmTok7pPmtfv2a7YfaTVfxd9HX2Kdn/SZ8rGMKkKVJ9A0WcBnzs0bjLXw== integrity sha512-VIAYxW6D9yOkcMJK/G6xS1fh8r1gD+mmD4VLPKki7Xqzfrq1qlCfQAA6ITIbUnLDAHv8UpPPhCWzFJ29fiUjZQ==
mime@1.6.0: mime@1.6.0:
version "1.6.0" version "1.6.0"