fix(ssr): preloading fixes and tweaks #7506
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- use json again because overall it takes less time to parse - don't preload so that the critical bundles have precedence - don't exclude preloader from critical bundles
🦋 Changeset detectedLatest commit: d9446cf The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -88,16 +81,21 @@ | |||
| opts.push(`Q:${minPreloadProbability}`); | |||
| } | |||
| const optsStr = opts.length ? `,{${opts.join(',')}}` : ''; | |||
| const script = `let b=fetch("${base}q-bundle-graph-${manifestHash}.json");import("${base}${preloadChunk}").then(({l,p})=>{l(${JSON.stringify(base)},b${optsStr});p(${JSON.stringify(referencedBundles)});})`; | |||
Check warning
Code scanning / CodeQL
Improper code sanitization Medium
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 2 months ago
To fix the problem, we need to ensure that the referencedBundles array is properly sanitized before being included in the JavaScript code. We can achieve this by escaping potentially dangerous characters in each string within the referencedBundles array. This can be done by creating a utility function to escape unsafe characters and applying it to each element of the array before passing it to JSON.stringify.
- Create a utility function
escapeUnsafeCharsto escape potentially dangerous characters. - Apply this function to each element of the
referencedBundlesarray before passing it toJSON.stringify. - Update the relevant lines in the
includePreloaderfunction to use the sanitized array.
Suggested changeset
1
packages/qwik/src/server/prefetch-implementation.ts
| @@ -83,3 +83,4 @@ | ||
| const optsStr = opts.length ? `,{${opts.join(',')}}` : ''; | ||
| const script = `let b=fetch("${base}q-bundle-graph-${manifestHash}.json");import("${base}${preloadChunk}").then(({l,p})=>{l(${JSON.stringify(base)},b${optsStr});p(${JSON.stringify(referencedBundles)});})`; | ||
| const sanitizedBundles = referencedBundles.map(bundle => escapeUnsafeChars(bundle)); | ||
| const script = `let b=fetch("${base}q-bundle-graph-${manifestHash}.json");import("${base}${preloadChunk}").then(({l,p})=>{l(${JSON.stringify(base)},b${optsStr});p(${JSON.stringify(sanitizedBundles)});})`; | ||
| /** | ||
| @@ -128 +129,19 @@ | ||
| }; | ||
|
|
||
| function escapeUnsafeChars(str: string): string { | ||
| const charMap: { [key: string]: string } = { | ||
| '<': '\\u003C', | ||
| '>': '\\u003E', | ||
| '/': '\\u002F', | ||
| '\\': '\\\\', | ||
| '\b': '\\b', | ||
| '\f': '\\f', | ||
| '\n': '\\n', | ||
| '\r': '\\r', | ||
| '\t': '\\t', | ||
| '\0': '\\0', | ||
| '\u2028': '\\u2028', | ||
| '\u2029': '\\u2029' | ||
| }; | ||
| return str.replace(/[<>\b\f\n\r\t\0\u2028\u2029]/g, x => charMap[x]); | ||
| } |
Copilot is powered by AI and may make mistakes. Always verify output.
built with Refined Cloudflare Pages Action⚡ Cloudflare Pages Deployment
|
wmertens
force-pushed
the
fix-preload-ssr
branch
from
9712be5 to
f26a942
Compare
commit: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.