Skip to content

Commit 597a73a

Browse files
ganglemganglem
committed
chore(deps): bump solid-js to 1.9.15
Updates the workspace catalog pin for solid-js from 1.9.10 to 1.9.15 and regenerates the reactivity patch (patches/[email protected]) against the new version. The upstream fix for the Transition value issue (anomalyco#2046) is already included in 1.9.15, so only the cleanNode reordering fix still needs to be carried as a patch. Also adds solid-js to the root `overrides` list, matching the existing pattern for @opentui/core/keymap/solid, so that @solidjs/start and other nested consumers resolve to the same catalog-pinned instance instead of a separate 1.9.10 copy — without this, packages/console/app fails to typecheck because the RequestEvent interface augmentation from @solidjs/start no longer merges with the app's own solid-js types. Verified: `bun turbo typecheck` passes across all 30 packages, and `bun run --cwd packages/opencode build -- --single --skip-embed-web-ui` produces a working opencode-windows-x64 binary that passes its smoke test.
1 parent 1be9fd5 commit 597a73a

2 files changed

Lines changed: 14 additions & 49 deletions

File tree

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
9090
"@sentry/solid": "10.36.0",
9191
"@sentry/vite-plugin": "4.6.0",
92-
"solid-js": "1.9.10",
92+
"solid-js": "1.9.15",
9393
"solid-sonner": "0.3.1",
9494
"vite-plugin-solid": "2.11.10",
9595
"@lydell/node-pty": "1.2.0-beta.12"
@@ -141,15 +141,16 @@
141141
"@opentui/keymap": "catalog:",
142142
"@opentui/solid": "catalog:",
143143
"@types/bun": "catalog:",
144-
"@types/node": "catalog:"
144+
"@types/node": "catalog:",
145+
"solid-js": "catalog:"
145146
},
146147
"patchedDependencies": {
147148
"@dnd-kit/[email protected]": "patches/@dnd-kit%[email protected]",
148149
"@ff-labs/[email protected]": "patches/@ff-labs%[email protected]",
149150
"@npmcli/[email protected]": "patches/@npmcli%[email protected]",
150151
"@silvia-odwyer/[email protected]": "patches/@silvia-odwyer%[email protected]",
151152
"@standard-community/[email protected]": "patches/@standard-community%[email protected]",
152-
"[email protected].10": "patches/[email protected].10.patch",
153+
"[email protected].15": "patches/[email protected].15.patch",
153154
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
154155
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
155156
"[email protected]": "patches/[email protected]",

patches/[email protected] renamed to patches/[email protected]

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
diff --git a/dist/dev.cjs b/dist/dev.cjs
2-
index 7104749..dc3eac9 100644
2+
index 11f3095..d4fbb2b 100644
33
--- a/dist/dev.cjs
44
+++ b/dist/dev.cjs
5-
@@ -764,6 +764,8 @@ function runComputation(node, value, time) {
6-
if (node.updatedAt != null && "observers" in node) {
7-
writeSignal(node, nextValue, true);
8-
} else if (Transition && Transition.running && node.pure) {
9-
+ // On first computation during transition, also set committed value #2046
10-
+ if (!Transition.sources.has(node)) node.value = nextValue;
11-
Transition.sources.add(node);
12-
node.tValue = nextValue;
13-
} else node.value = nextValue;
14-
@@ -987,18 +989,21 @@ function cleanNode(node) {
5+
@@ -1009,18 +1009,21 @@ function cleanNode(node) {
156
}
167
}
178
if (node.tOwned) {
@@ -37,19 +28,10 @@ index 7104749..dc3eac9 100644
3728
if (Transition && Transition.running) node.tState = 0;else node.state = 0;
3829
delete node.sourceMap;
3930
diff --git a/dist/dev.js b/dist/dev.js
40-
index ea5e4bc..a2e2d59 100644
31+
index ea05c50..093bb7c 100644
4132
--- a/dist/dev.js
4233
+++ b/dist/dev.js
43-
@@ -762,6 +762,8 @@ function runComputation(node, value, time) {
44-
if (node.updatedAt != null && "observers" in node) {
45-
writeSignal(node, nextValue, true);
46-
} else if (Transition && Transition.running && node.pure) {
47-
+ // On first computation during transition, also set committed value #2046
48-
+ if (!Transition.sources.has(node)) node.value = nextValue;
49-
Transition.sources.add(node);
50-
node.tValue = nextValue;
51-
} else node.value = nextValue;
52-
@@ -985,18 +987,21 @@ function cleanNode(node) {
34+
@@ -1007,18 +1007,21 @@ function cleanNode(node) {
5335
}
5436
}
5537
if (node.tOwned) {
@@ -75,7 +57,7 @@ index ea5e4bc..a2e2d59 100644
7557
if (Transition && Transition.running) node.tState = 0;else node.state = 0;
7658
delete node.sourceMap;
7759
diff --git a/dist/server.cjs b/dist/server.cjs
78-
index e715309..188ba81 100644
60+
index 989ec19..df19676 100644
7961
--- a/dist/server.cjs
8062
+++ b/dist/server.cjs
8163
@@ -127,12 +127,14 @@ function onCleanup(fn) {
@@ -96,7 +78,7 @@ index e715309..188ba81 100644
9678
}
9779
function catchError(fn, handler) {
9880
diff --git a/dist/server.js b/dist/server.js
99-
index d5f8803..320d9af 100644
81+
index 1455ee9..23ff7d2 100644
10082
--- a/dist/server.js
10183
+++ b/dist/server.js
10284
@@ -125,12 +125,14 @@ function onCleanup(fn) {
@@ -117,19 +99,10 @@ index d5f8803..320d9af 100644
11799
}
118100
function catchError(fn, handler) {
119101
diff --git a/dist/solid.cjs b/dist/solid.cjs
120-
index 7c133a2..5ef1501 100644
102+
index 5fcf6a7..e1b375f 100644
121103
--- a/dist/solid.cjs
122104
+++ b/dist/solid.cjs
123-
@@ -717,6 +717,8 @@ function runComputation(node, value, time) {
124-
if (node.updatedAt != null && "observers" in node) {
125-
writeSignal(node, nextValue, true);
126-
} else if (Transition && Transition.running && node.pure) {
127-
+ // On first computation during transition, also set committed value #2046
128-
+ if (!Transition.sources.has(node)) node.value = nextValue;
129-
Transition.sources.add(node);
130-
node.tValue = nextValue;
131-
} else node.value = nextValue;
132-
@@ -938,18 +940,21 @@ function cleanNode(node) {
105+
@@ -964,18 +964,21 @@ function cleanNode(node) {
133106
}
134107
}
135108
if (node.tOwned) {
@@ -155,19 +128,10 @@ index 7c133a2..5ef1501 100644
155128
if (Transition && Transition.running) node.tState = 0;else node.state = 0;
156129
}
157130
diff --git a/dist/solid.js b/dist/solid.js
158-
index 656fd26..6e0038c 100644
131+
index 7bf60d4..5f25cc7 100644
159132
--- a/dist/solid.js
160133
+++ b/dist/solid.js
161-
@@ -715,6 +715,8 @@ function runComputation(node, value, time) {
162-
if (node.updatedAt != null && "observers" in node) {
163-
writeSignal(node, nextValue, true);
164-
} else if (Transition && Transition.running && node.pure) {
165-
+ // On first computation during transition, also set committed value #2046
166-
+ if (!Transition.sources.has(node)) node.value = nextValue;
167-
Transition.sources.add(node);
168-
node.tValue = nextValue;
169-
} else node.value = nextValue;
170-
@@ -936,18 +938,21 @@ function cleanNode(node) {
134+
@@ -962,18 +962,21 @@ function cleanNode(node) {
171135
}
172136
}
173137
if (node.tOwned) {

0 commit comments

Comments
 (0)