Skip to content

Commit f8a7394

Browse files
authored
Merge branch 'main' into fix-externals
2 parents 7f71b46 + c6a33a2 commit f8a7394

5 files changed

Lines changed: 132 additions & 120 deletions

File tree

‎.changeset/fifty-flies-yell.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": minor
3+
---
4+
5+
fix text/html missing when ssr is false

‎.vscode/settings.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.organizeImports": "explicit"
3+
// "source.organizeImports": "explicit"
44
},
5-
"typescript.tsdk": "node_modules/typescript/lib"
5+
"typescript.tsdk": "node_modules/typescript/lib",
6+
"editor.formatOnSave": true,
7+
"editor.defaultFormatter": "oxc.oxc-vscode"
68
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"@changesets/cli": "^2.29.8",
3333
"citty": "^0.1.5",
34-
"oxfmt": "^0.14.0",
34+
"oxfmt": "^0.28.0",
3535
"tinyglobby": "^0.2.2",
3636
"tippy.js": "^6.3.7",
3737
"typescript": "^5.7.0"

‎packages/start/src/server/handler.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ export function createBaseHandler(
7979
return redirect(context.response.headers.get("Location")!, status);
8080
}
8181

82+
event.response.headers.set("content-type", "text/html");
83+
8284
return html;
8385
}
8486

0 commit comments

Comments
 (0)