Merge branch 'update-dom-expressions' of https://github.com/trusktr/s…

…olid into trusktr-update-dom-expressions

packages/solid/store/src/server.ts

@@ -1,5 +1,19 @@
 import type { SetStoreFunction, Store } from "./store.js";
 
+export type {
+  ArrayFilterFn,
+  DeepMutable,
+  DeepReadonly,
+  NotWrappable,
+  Part,
+  SetStoreFunction,
+  SolidStore,
+  Store,
+  StoreNode,
+  StorePathRange,
+  StoreSetter
+} from "./store.js";
+
 export const $RAW = Symbol("state-raw");
 
 export function isWrappable(obj: any) {
@@ -103,6 +117,10 @@ export function createMutable<T>(state: T | Store<T>): T {
   return state as T;
 }
 
+export function modifyMutable<T>(state: T, modifier: (state: T) => T) {
+  notSup();
+}
+
 type ReconcileOptions = {
   key?: string | null;
   merge?: boolean;
@@ -137,3 +155,7 @@ export function produce<T>(fn: (state: T) => void): (state: T) => T {
 }
 
 export const DEV = undefined;
+
+function notSup(): never {
+  throw new Error("not supported on server side");
+}

packages/solid/store/src/store.ts

@@ -14,7 +14,7 @@ type DataNode = {
   (): any;
   $(value?: any): void;
 };
-type DataNodes = Record<PropertyKey, DataNode | undefined>;
+export type DataNodes = Record<PropertyKey, DataNode | undefined>;
 
 export type OnStoreNodeUpdate = (
   state: StoreNode,

packages/solid/web/server/index.ts

@@ -12,12 +12,15 @@ export {
   Match,
   Index,
   ErrorBoundary,
+  // This overrides mergeProps from dom-expressions/src/server.js
   mergeProps
 } from "solid-js";
 
 export const isServer: boolean = true;
 export const isDev: boolean = false;
 
+// Types for these come from dom-expressions/src/server.d.ts
+// These override the functions from dom-expressions that throw on the serverside.
 export function render() {}
 export function hydrate() {}
 export function insert() {}