Skip to content

Commit 6704676

Browse files
committed
Merge branch 'main' into 2.x-dev-toolbar-redesign
2 parents 581f91e + d43ad1b commit 6704676

14 files changed

Lines changed: 163 additions & 153 deletions

File tree

.changeset/olive-donkeys-shave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Pre-bundle the dev toolbar's CommonJS dependencies so it no longer throws on every dev page load

.changeset/update-solid-1-9-15.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/start": patch
3+
---
4+
5+
Update Solid to 1.9.15 to include the latest lazy loading and hydration fixes

apps/fixtures/bare-js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@solidjs/start": "workspace:*",
1111
"nitro": "^3.0.260610-beta",
12-
"solid-js": "^1.9.14",
12+
"solid-js": "^1.9.15",
1313
"vite": "^8.1.5"
1414
},
1515
"engines": {

apps/fixtures/bare/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@solidjs/start": "workspace:*",
1111
"nitro": "^3.0.260610-beta",
12-
"solid-js": "^1.9.14",
12+
"solid-js": "^1.9.15",
1313
"vite": "^8.1.5"
1414
},
1515
"engines": {

apps/fixtures/basic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@solidjs/router": "^1.0.0",
1212
"@solidjs/start": "workspace:*",
1313
"nitro": "^3.0.260610-beta",
14-
"solid-js": "^1.9.14",
14+
"solid-js": "^1.9.15",
1515
"vite": "^8.1.5"
1616
},
1717
"engines": {

apps/fixtures/css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@solidjs/router": "^1.0.0",
1313
"@solidjs/start": "workspace:*",
1414
"nitro": "^3.0.260610-beta",
15-
"solid-js": "^1.9.14",
15+
"solid-js": "^1.9.15",
1616
"vite": "^8.1.5"
1717
},
1818
"devDependencies": {

apps/fixtures/experiments/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@solidjs/router": "^1.0.0",
1212
"@solidjs/start": "workspace:*",
1313
"nitro": "^3.0.260610-beta",
14-
"solid-js": "^1.9.14",
14+
"solid-js": "^1.9.15",
1515
"vite": "^8.1.5"
1616
},
1717
"engines": {

apps/fixtures/hackernews/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@solidjs/router": "^1.0.0",
1212
"@solidjs/start": "workspace:*",
13-
"solid-js": "^1.9.14",
13+
"solid-js": "^1.9.15",
1414
"vite": "^8.1.5"
1515
},
1616
"engines": {

apps/fixtures/notes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"date-fns": "^4.4.0",
1313
"marked": "^18.0.7",
1414
"nitro": "^3.0.260610-beta",
15-
"solid-js": "^1.9.14",
15+
"solid-js": "^1.9.15",
1616
"unstorage": "1.17.5",
1717
"vite": "^8.1.5"
1818
},

apps/fixtures/todomvc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@solidjs/router": "^1.0.0",
1212
"@solidjs/start": "workspace:*",
1313
"nitro": "^3.0.260610-beta",
14-
"solid-js": "^1.9.14",
14+
"solid-js": "^1.9.15",
1515
"unstorage": "1.17.5",
1616
"vite": "^8.1.5"
1717
},

0 commit comments

Comments
 (0)