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

Less verbose HMR script (#457)

Browse source 
* Less verbose HMR script

* push changeset
This commit is contained in:
Nurettin Kaya 2021-06-16 05:17:06 -07:00 • committed by GitHub
parent 54c291efa0
commit 251b0b5c06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/breezy-carrots-clap.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Less verbose HMR script

2
packages/astro/src/compiler/transform/head.ts
View file

@ -62,7 +62,7 @@ export default function (opts: TransformOptions): Transformer {
type: 'Element', type: 'Element',
name: 'script', name: 'script',
attributes: [], attributes: [],
children: [{ type: 'Text', data: `window.HMR_WEBSOCKET_URL = window.HMR_WEBSOCKET_URL || 'ws://localhost:${hmrPort}';`, start: 0, end: 0 }], children: [{ type: 'Text', data: `window.HMR_WEBSOCKET_PORT = ${hmrPort};`, start: 0, end: 0 }],
start: 0, start: 0,
end: 0, end: 0,
}, },

4
packages/astro/test/astro-basic.test.js
View file

@ -23,13 +23,13 @@ Basics('Can load page', async ({ runtime }) => {
Basics('Sets the HMR port when dynamic components used', async ({ runtime }) => { Basics('Sets the HMR port when dynamic components used', async ({ runtime }) => {
const result = await runtime.load('/client'); const result = await runtime.load('/client');
const html = result.contents; const html = result.contents;
assert.ok(/HMR_WEBSOCKET_URL/.test(html), 'Sets the websocket port'); assert.ok(/HMR_WEBSOCKET_PORT/.test(html), 'Sets the websocket port');
}); });
Basics('Does not set the HMR port when no dynamic component used', async ({ runtime }) => { Basics('Does not set the HMR port when no dynamic component used', async ({ runtime }) => {
const result = await runtime.load('/'); const result = await runtime.load('/');
const html = result.contents; const html = result.contents;
assert.ok(!/HMR_WEBSOCKET_URL/.test(html), 'Does not set the websocket port'); assert.ok(!/HMR_WEBSOCKET_PORT/.test(html), 'Does not set the websocket port');
}); });
Basics('Correctly serializes boolean attributes', async ({ runtime }) => { Basics('Correctly serializes boolean attributes', async ({ runtime }) => {

6
packages/astro/test/astro-hmr.test.js
View file

@ -16,7 +16,7 @@ HMR('Honors the user provided port', async ({ runtime }) => {
if (result.error) throw new Error(result.error); if (result.error) throw new Error(result.error);
const html = result.contents; const html = result.contents;
assert.ok(/window\.HMR_WEBSOCKET_URL = window\.HMR_WEBSOCKET_URL || 'ws:\/\/localhost:5555'/.test(html), "Uses the user's websocket port"); assert.ok(/window\.HMR_WEBSOCKET_PORT = 5555/.test(html), "Uses the user's websocket port");
}); });
HMR('Does not override script added by the user', async ({ runtime }) => { HMR('Does not override script added by the user', async ({ runtime }) => {
@ -25,8 +25,8 @@ HMR('Does not override script added by the user', async ({ runtime }) => {
const html = result.contents; const html = result.contents;
assert.ok(!/window\.HMR_WEBSOCKET_URL = 'ws:\/\/localhost:3333'/.test(html), 'Users script included'); assert.ok(/window\.HMR_WEBSOCKET_URL = 'wss:\/\/example.com:3333'/.test(html), "User's script included");
assert.ok(/window\.HMR_WEBSOCKET_URL = window\.HMR_WEBSOCKET_URL || 'ws:\/\/localhost:5555'/.test(html), 'Our script defers to the port already being set'); assert.ok(/window\.HMR_WEBSOCKET_PORT = 5555/.test(html), 'Ignored when window.HMR_WEBSOCKET_URL set');
}); });
HMR.run(); HMR.run();