smyalygames/quartz
Template
1
0
Fork 0
mirror of https://github.com/jackyzha0/quartz.git synced 2025-11-30 09:47:56 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent double-loading of afterDOMReady scripts (#2213)
Some checks failed
Build and Test / build-and-test (ubuntu-latest) (push) Has been skipped
Details
Build and Test / publish-tag (push) Has been skipped
Details
Build and Test / build-and-test (windows-latest) (push) Has been cancelled
Details
Build and Test / build-and-test (macos-latest) (push) Has been cancelled
Details

Browse Source 
Co-authored-by: Adam <adam@canny.io>
This commit is contained in:
Adam Laycock
2025-11-27 15:51:56 -07:00
committed by GitHub
parent c99c8070f2
commit 87f7f4804e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quartz/components/renderPage.tsx
View File

@@ -294,7 +294,7 @@ export function renderPage(
</body> </body>
{pageResources.js {pageResources.js
.filter((resource) => resource.loadTime === "afterDOMReady") .filter((resource) => resource.loadTime === "afterDOMReady")
.map((res) => JSResourceToScriptElement(res))} .map((res) => JSResourceToScriptElement(res, true))}
</html> </html>
) )

4
quartz/components/scripts/spa.inline.ts
View File

@@ -115,9 +115,9 @@ async function _navigate(url: URL, isBack: boolean = false) {
} }
// now, patch head, re-executing scripts // now, patch head, re-executing scripts
const elementsToRemove = document.head.querySelectorAll(":not([spa-preserve])") const elementsToRemove = document.head.querySelectorAll(":not([data-persist])")
elementsToRemove.forEach((el) => el.remove()) elementsToRemove.forEach((el) => el.remove())
const elementsToAdd = html.head.querySelectorAll(":not([spa-preserve])") const elementsToAdd = html.head.querySelectorAll(":not([data-persist])")
elementsToAdd.forEach((el) => document.head.appendChild(el)) elementsToAdd.forEach((el) => document.head.appendChild(el))
// delay setting the url until now // delay setting the url until now

7
quartz/util/resources.tsx
View File

@@ -26,9 +26,10 @@ export type CSSResource = {
export function JSResourceToScriptElement(resource: JSResource, preserve?: boolean): JSX.Element { export function JSResourceToScriptElement(resource: JSResource, preserve?: boolean): JSX.Element {
const scriptType = resource.moduleType ?? "application/javascript" const scriptType = resource.moduleType ?? "application/javascript"
const spaPreserve = preserve ?? resource.spaPreserve const spaPreserve = preserve ?? resource.spaPreserve
if (resource.contentType === "external") { if (resource.contentType === "external") {
return ( return (
<script key={resource.src} src={resource.src} type={scriptType} spa-preserve={spaPreserve} /> <script key={resource.src} src={resource.src} type={scriptType} data-persist={spaPreserve} />
) )
} else { } else {
const content = resource.script const content = resource.script
@@ -36,7 +37,7 @@ export function JSResourceToScriptElement(resource: JSResource, preserve?: boole
<script <script
key={randomUUID()} key={randomUUID()}
type={scriptType} type={scriptType}
spa-preserve={spaPreserve} data-persist={spaPreserve}
dangerouslySetInnerHTML={{ __html: content }} dangerouslySetInnerHTML={{ __html: content }}
></script> ></script>
) )
@@ -54,7 +55,7 @@ export function CSSResourceToStyleElement(resource: CSSResource, preserve?: bool
href={resource.content} href={resource.content}
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
spa-preserve={spaPreserve} data-persist={spaPreserve}
/> />
) )
} }