Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Script with innerHTML not working on Safari #4861

Merged
merged 5 commits into from
Sep 26, 2022
Merged

fix: Script with innerHTML not working on Safari #4861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ba04d1
fix: Script with innerHTML not working on Safari
rishi-raj-jain Sep 24, 2022
d7bfa89
Update cool-camels-tease.md
Sep 24, 2022
4894f51
Merge branch 'main' into fix-define-vars-incompatibility-chrome
Sep 26, 2022
f72b341
Merge branch 'main' into fix-define-vars-incompatibility-chrome
Sep 26, 2022
f9a0d75
Merge branch 'main' into fix-define-vars-incompatibility-chrome
Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/cool-camels-tease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

use const instead of let for define:vars
4 changes: 3 additions & 1 deletion packages/astro/src/runtime/server/render/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ const toStyleString = (obj: Record<string, any>) =>
export function defineScriptVars(vars: Record<any, any>) {
let output = '';
for (const [key, value] of Object.entries(vars)) {
output += `let ${toIdent(key)} = ${JSON.stringify(value)};\n`;
// Use const instead of let as let global unsupported with Safari
// https://stackoverflow.com/questions/29194024/cant-use-let-keyword-in-safari-javascript
output += `const ${toIdent(key)} = ${JSON.stringify(value)};\n`;
}
return markHTMLString(output);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/test/astro-directives.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ describe('Directives', async () => {
expect($(script).text().at(-1)).to.equal('}');
if (i < 2) {
// Inline defined variables
expect($(script).toString()).to.include('let foo = "bar"');
expect($(script).toString()).to.include('const foo = "bar"');
} else {
// Convert invalid keys to valid identifiers
expect($(script).toString()).to.include('let dashCase = "bar"');
expect($(script).toString()).to.include('const dashCase = "bar"');
}
i++;
}
Expand Down