Skip to content

(fix) don't blank non-top-level scripts #1662

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

Merged
merged 1 commit into from
Sep 26, 2022
Merged

(fix) don't blank non-top-level scripts #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/svelte2tsx/src/svelte2tsx/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ function processSvelteTemplate(

// resolve scripts
const { scriptTag, moduleScriptTag } = scripts.getTopLevelScriptTags();
scripts.blankOtherScriptTags(str);
if (options.mode !== 'ts') {
scripts.blankOtherScriptTags(str);
}

//resolve stores
const resolvedStores = stores.getStoreNames();
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte2tsx/src/utils/htmlxparser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function extractTag(htmlx: string, tag: 'script' | 'style', useNewTransformation
let content = match[4];
if (!content) {
if (useNewTransformation) {
// Keep tag and transform it properly by removing it
// Keep tag and transform it like a regular element
content = '';
} else {
// Self-closing/empty tags don't need replacement
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte2tsx/test/svelte2tsx/samples/script-in-rawhtml/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
;
async () => {

``;};
`<script type="application/ld+json">${JSON.stringify(schema)}</script>`;};
return { props: {}, slots: {}, getters: {}, events: {} }}

export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
Expand Down
6 changes: 4 additions & 2 deletions ...svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
let b = 'top level';
;
async () => { { svelteHTML.createElement("div", {});

{ svelteHTML.createElement("script", {}); }
}



{ svelteHTML.createElement("svelte:head", {});
{ svelteHTML.createElement("link", { "rel":`stylesheet`,"href":`/lib/jodit.es2018.min.css`,});}

{ svelteHTML.createElement("script", { "src":`/lib/jodit.es2018.min.js`,});

}
}};
return { props: {}, slots: {}, getters: {}, events: {} }}

Expand Down