fix ssr escaping, fetcher tracking

package.json

@@ -33,15 +33,15 @@
     "@types/jest": "^26.0.23",
     "@types/shelljs": "^0.8.8",
     "babel-jest": "^26.6.3",
-    "babel-plugin-jsx-dom-expressions": "^0.28.3",
+    "babel-plugin-jsx-dom-expressions": "^0.28.5",
     "coveralls": "^3.1.0",
-    "dom-expressions": "0.28.4",
+    "dom-expressions": "0.28.5",
     "gitly": "^2.1.0",
-    "hyper-dom-expressions": "0.28.4",
+    "hyper-dom-expressions": "0.28.5",
     "jest": "~26.6.3",
     "jest-ts-webcompat-resolver": "^1.0.0",
     "lerna": "^4.0.0",
-    "lit-dom-expressions": "0.28.4",
+    "lit-dom-expressions": "0.28.5",
     "ncp": "2.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",

packages/babel-preset-solid/package.json

@@ -14,6 +14,6 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.28.3"
+    "babel-plugin-jsx-dom-expressions": "^0.28.5"
   }
 }

packages/solid/src/reactive/signal.ts

@@ -107,11 +107,11 @@ export function createSignal<T>(): [
 ];
 export function createSignal<T>(
   value: T,
-  options?: { equals?: false | ((prev: T, next: T) => boolean); name?: string; }
+  options?: { equals?: false | ((prev: T, next: T) => boolean); name?: string }
 ): [get: Accessor<T>, set: (v: T) => T];
 export function createSignal<T>(
   value?: T,
-  options?: { equals?: false | ((prev: T, next: T) => boolean); name?: string; }
+  options?: { equals?: false | ((prev: T, next: T) => boolean); name?: string }
 ): [get: Accessor<T>, set: (v: T) => T] {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
   const s: Signal<T> = {
@@ -306,7 +306,10 @@ export function createResource<T, U>(
     }
     if (Transition && pr) Transition.promises.delete(pr);
     const p =
-      initP || (fetcher as (k: U, getPrev: Accessor<T | undefined>) => T | Promise<T>)(lookup, s);
+      initP ||
+      untrack(() =>
+        (fetcher as (k: U, getPrev: Accessor<T | undefined>) => T | Promise<T>)(lookup, s)
+      );
     initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
@@ -405,7 +408,7 @@ export function createSelector<T, U>(
 export function batch<T>(fn: () => T): T {
   if (Pending) return fn();
   let result;
-  const q: Signal<any>[] = Pending = [];
+  const q: Signal<any>[] = (Pending = []);
   try {
     result = fn();
   } finally {
@@ -985,10 +988,10 @@ function resolveChildren(children: any): unknown {
 
 function createProvider(id: symbol) {
   return function provider(props: { value: unknown; children: any }) {
-    return (createMemo(() => {
+    return createMemo(() => {
       Owner!.context = { [id]: props.value };
       return children(() => props.children);
-    }) as unknown) as JSX.Element;
+    }) as unknown as JSX.Element;
   };
 }