Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-10 23:01:26 -05:00
Code Issues Activity

Ensure router only targets scripts for execution (#12177)

Browse source 
* Ensure router only targets scripts for execution

* Add a test

* Move the test up to the file that's testing

* remove extra prop

* just see if tests pass

* use local file

* smaller file

* use getElementsByTagName again
This commit is contained in:
Matthew Phillips 2024-10-11 09:37:06 -04:00 • committed by GitHub
parent 411af55153
commit a4ffbfaa5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.changeset/nervous-peaches-sort.md Normal file
View file

@ -0,0 +1,7 @@
---
'astro': patch
---
Ensure we target scripts for execution in the router
Using `document.scripts` is unsafe because if the application has a `name="scripts"` this will shadow the built-in `document.scripts`. Fix is to use `getElementsByTagName` to ensure we're only grabbing real scripts.

BIN
packages/astro/e2e/fixtures/view-transitions/src/assets/astro-build.mp4 Normal file
View file

Binary file not shown.

7
packages/astro/e2e/fixtures/view-transitions/src/components/Video.astro
View file

@ -1,3 +1,6 @@
<video controls="" autoplay="" name="media" transition:persist transition:name="video" autoplay> ---
<source src="https://ia804502.us.archive.org/33/items/GoldenGa1939_3/GoldenGa1939_3_512kb.mp4" type="video/mp4"> import vidUrl from '../assets/astro-build.mp4';
---
<video controls="" autoplay="" transition:persist transition:name="video" autoplay>
<source src={vidUrl} type="video/mp4">
</video> </video>

3
packages/astro/e2e/fixtures/view-transitions/src/pages/one.astro
View file

@ -20,4 +20,7 @@ import Layout from '../components/Layout.astro';
</custom-a> </custom-a>
<div id="test">test content</div> <div id="test">test content</div>
<!-- This ensures we're correctly grabbing just scripts for execution -->
<div name="scripts"></div>
</Layout> </Layout>

4
packages/astro/src/transitions/router.ts
View file

@ -134,7 +134,7 @@ export function getFallback(): Fallback {
function runScripts() { function runScripts() {
let wait = Promise.resolve(); let wait = Promise.resolve();
for (const script of Array.from(document.scripts)) { for (const script of document.getElementsByTagName('script')) {
if (script.dataset.astroExec === '') continue; if (script.dataset.astroExec === '') continue;
const type = script.getAttribute('type'); const type = script.getAttribute('type');
if (type && type !== 'module' && type !== 'text/javascript') continue; if (type && type !== 'module' && type !== 'text/javascript') continue;
@ -643,7 +643,7 @@ if (inBrowser) {
); );
} }
} }
for (const script of document.scripts) { for (const script of document.getElementsByTagName('script')) {
script.dataset.astroExec = ''; script.dataset.astroExec = '';
} }
} }