solid-js 1.5.0-beta.5 → 1.5.0

package/dist/dev.cjs

@@ -147,7 +147,6 @@ const UNOWNED = {
   owner: null
 };
 const NO_INIT = {};
-const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
@@ -157,6 +156,7 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
+const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
@@ -272,7 +272,7 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (options.ssrValue === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, success, key) {
     if (pr === p) {
@@ -532,7 +532,7 @@ function devComponent(Comp, props) {
 }
 function hashValue(v) {
   const s = new Set();
-  return `s${typeof v === "string" ? hash(v) : hash(JSON.stringify(v, (k, v) => {
+  return `s${typeof v === "string" ? hash(v) : hash(untrack(() => JSON.stringify(v, (k, v) => {
     if (typeof v === "object" && v != null) {
       if (s.has(v)) return;
       s.add(v);
@@ -549,7 +549,7 @@ function hashValue(v) {
       return `${v.toString()}n`;
     }
     return v;
-  }) || "")}`;
+  }) || ""))}`;
 }
 function registerGraph(name, value) {
   let tryName = name;

package/dist/dev.js

@@ -143,7 +143,6 @@ const UNOWNED = {
   owner: null
 };
 const NO_INIT = {};
-const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
@@ -153,6 +152,7 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
+const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
@@ -268,7 +268,7 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (options.ssrValue === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, success, key) {
     if (pr === p) {
@@ -528,7 +528,7 @@ function devComponent(Comp, props) {
 }
 function hashValue(v) {
   const s = new Set();
-  return `s${typeof v === "string" ? hash(v) : hash(JSON.stringify(v, (k, v) => {
+  return `s${typeof v === "string" ? hash(v) : hash(untrack(() => JSON.stringify(v, (k, v) => {
     if (typeof v === "object" && v != null) {
       if (s.has(v)) return;
       s.add(v);
@@ -545,7 +545,7 @@ function hashValue(v) {
       return `${v.toString()}n`;
     }
     return v;
-  }) || "")}`;
+  }) || ""))}`;
 }
 function registerGraph(name, value) {
   let tryName = name;

package/dist/server.cjs

@@ -399,7 +399,7 @@ function createResource(source, fetcher, options = {}) {
   let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
   let error;
-  if (sharedConfig.context.async && options.ssrValue !== "initial") {
+  if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
       if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
@@ -409,7 +409,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = options.ssrValue !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -472,7 +472,7 @@ function createResource(source, fetcher, options = {}) {
     p = null;
     return ctx.resources[id].data;
   }
-  if (options.ssrValue !== "initial") load();
+  if (options.ssrLoadFrom !== "initial") load();
   return resource.ref = [read, {
     refetch: load,
     mutate: v => value = v

package/dist/server.js

@@ -395,7 +395,7 @@ function createResource(source, fetcher, options = {}) {
   let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
   let error;
-  if (sharedConfig.context.async && options.ssrValue !== "initial") {
+  if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
       if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
@@ -405,7 +405,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = options.ssrValue !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -468,7 +468,7 @@ function createResource(source, fetcher, options = {}) {
     p = null;
     return ctx.resources[id].data;
   }
-  if (options.ssrValue !== "initial") load();
+  if (options.ssrLoadFrom !== "initial") load();
   return resource.ref = [read, {
     refetch: load,
     mutate: v => value = v

package/dist/solid.cjs

@@ -147,7 +147,6 @@ const UNOWNED = {
   owner: null
 };
 const NO_INIT = {};
-const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
@@ -156,6 +155,7 @@ let Listener = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
+const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
@@ -264,7 +264,7 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (options.ssrValue === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, success, key) {
     if (pr === p) {

package/dist/solid.js

@@ -143,7 +143,6 @@ const UNOWNED = {
   owner: null
 };
 const NO_INIT = {};
-const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
@@ -152,6 +151,7 @@ let Listener = null;
 let Updates = null;
 let Effects = null;
 let ExecCount = 0;
+const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
@@ -260,7 +260,7 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (options.ssrValue === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, success, key) {
     if (pr === p) {

package/jsx-runtime.d.ts

@@ -0,0 +1 @@
+export * from "./types/jsx";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.5.0-beta.5",
+  "version": "1.5.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -197,6 +197,9 @@
     "compiler",
     "performance"
   ],
+  "dependencies": {
+    "csstype": "^3.1.0"
+  },
   "scripts": {
     "build": "npm-run-all -nl build:*",
     "build:clean": "rimraf dist/ coverage/ store/dist/ web/dist/ h/dist/ h/jsx-runtime/dist html/dist/",

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createReaction, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $DEVCOMP, $PROXY, $TRACK } from "./reactive/signal.js";
-export type { Accessor, Setter, Signal, Resource, ResourceOptions, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, ChildrenReturn, Context, ReturnTypes, Owner, InitializedResource, InitializedResourceOptions, InitializedResourceReturn } from "./reactive/signal.js";
+export type { Accessor, Setter, Signal, Resource, ResourceActions, ResourceSource, ResourceOptions, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, ChildrenReturn, Context, ReturnTypes, Owner, InitializedResource, InitializedResourceOptions, InitializedResourceReturn } from "./reactive/signal.js";
 export * from "./reactive/observable.js";
 export * from "./reactive/scheduler.js";
 export * from "./reactive/array.js";

package/types/jsx.d.ts

@@ -1,4 +1,4 @@
-import * as csstype from 'csstype';
+import * as csstype from 'csstype/index.js';
 
 /**
  * Based on JSX types for Surplus and Inferno and adapted for `dom-expressions`.

package/types/reactive/signal.d.ts

@@ -247,7 +247,7 @@ export declare type ResourceOptions<T, S = unknown> = {
     initialValue?: T;
     name?: string;
     deferStream?: boolean;
-    ssrValue?: "initial" | "server";
+    ssrLoadFrom?: "initial" | "server";
     storage?: (init: T | undefined) => [Accessor<T | undefined>, Setter<T | undefined>];
     onHydrated?: (k: S | undefined, info: {
         value: T | undefined;

package/types/server/rendering.d.ts

@@ -100,14 +100,14 @@ export declare type ResourceOptions<T> = undefined extends T ? {
     initialValue?: T;
     name?: string;
     deferStream?: boolean;
-    ssrValue?: "initial" | "server";
+    ssrLoadFrom?: "initial" | "server";
     storage?: () => Signal<T | undefined>;
     onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
 } : {
     initialValue: T;
     name?: string;
     deferStream?: boolean;
-    ssrValue?: "initial" | "server";
+    ssrLoadFrom?: "initial" | "server";
     storage?: (v?: T) => Signal<T | undefined>;
     onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
 };

package/web/dist/server.cjs

@@ -266,7 +266,8 @@ function toRefParam(index) {
 const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
-  solidJs.sharedConfig.context = {
+  let context;
+  solidJs.sharedConfig.context = context = {
     id: options.renderId || "",
     count: 0,
     suspense: {},
@@ -277,7 +278,9 @@ function renderToString(code, options = {}) {
       scripts += `_$HY.set("${id}", ${stringify(p)});`;
     }
   };
-  let html = injectAssets(solidJs.sharedConfig.context.assets, resolveSSRNode(escape(code())));
+  let html = resolveSSRNode(escape(code()));
+  solidJs.sharedConfig.context = undefined;
+  html = injectAssets(context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
@@ -397,6 +400,7 @@ function renderToStream(code, options = {}) {
   };
   let html = resolveSSRNode(escape(code()));
   function doShell() {
+    solidJs.sharedConfig.context = undefined;
     html = injectAssets(context.assets, html);
     for (const key in context.resources) {
       if (!("data" in context.resources[key] || context.resources[key].ref[0].error)) pushTask(`_$HY.init("${key}")`);
@@ -634,7 +638,7 @@ function injectAssets(assets, html) {
   if (!assets || !assets.length) return html;
   let out = "";
   for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
-  return html.replace(`<head>`, `<head>` + out);
+  return html.replace(`</head>`, out + `</head>`);
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
@@ -725,7 +729,7 @@ function pipeToWritable(code, writable, options = {}) {
 }
 function ssrSpread(props, isSVG, skipChildren) {
   let result = "";
-  if (props == null) return results;
+  if (props == null) return result;
   if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;

package/web/dist/server.js

@@ -263,7 +263,8 @@ function toRefParam(index) {
 const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
-  sharedConfig.context = {
+  let context;
+  sharedConfig.context = context = {
     id: options.renderId || "",
     count: 0,
     suspense: {},
@@ -274,7 +275,9 @@ function renderToString(code, options = {}) {
       scripts += `_$HY.set("${id}", ${stringify(p)});`;
     }
   };
-  let html = injectAssets(sharedConfig.context.assets, resolveSSRNode(escape(code())));
+  let html = resolveSSRNode(escape(code()));
+  sharedConfig.context = undefined;
+  html = injectAssets(context.assets, html);
   if (scripts.length) html = injectScripts(html, scripts, options.nonce);
   return html;
 }
@@ -394,6 +397,7 @@ function renderToStream(code, options = {}) {
   };
   let html = resolveSSRNode(escape(code()));
   function doShell() {
+    sharedConfig.context = undefined;
     html = injectAssets(context.assets, html);
     for (const key in context.resources) {
       if (!("data" in context.resources[key] || context.resources[key].ref[0].error)) pushTask(`_$HY.init("${key}")`);
@@ -631,7 +635,7 @@ function injectAssets(assets, html) {
   if (!assets || !assets.length) return html;
   let out = "";
   for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
-  return html.replace(`<head>`, `<head>` + out);
+  return html.replace(`</head>`, out + `</head>`);
 }
 function injectScripts(html, scripts, nonce) {
   const tag = `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>`;
@@ -722,7 +726,7 @@ function pipeToWritable(code, writable, options = {}) {
 }
 function ssrSpread(props, isSVG, skipChildren) {
   let result = "";
-  if (props == null) return results;
+  if (props == null) return result;
   if (typeof props === "function") props = props();
   const keys = Object.keys(props);
   let classResolved;

package/web/types/client.d.ts

@@ -62,7 +62,7 @@ export function getHydrationKey(): string;
 export function getNextElement(template?: HTMLTemplateElement): Element;
 export function getNextMatch(start: Node, elementName: string): Element;
 export function getNextMarker(start: Node): [Node, Array<Node>];
-export function useAsset(fn: () => string): void;
+export function useAssets(fn: () => string): void;
 export function getAssets(): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function HydrationScript(): JSX.Element;

package/web/types/server.d.ts

@@ -37,7 +37,7 @@ export function ssrAttribute(key: string, value: any, isBoolean: boolean): strin
 export function ssrHydrationKey(): string;
 export function resolveSSRNode(node: any): string;
 export function escape(html: string): string;
-export function useAsset(fn: () => string): void;
+export function useAssets(fn: () => string): void;
 export function getAssets(): string;
 export function getHydrationKey(): string;
 export function effect<T>(fn: (prev?: T) => T, init?: T): void;