solid-js 1.6.7 → 1.6.8

package/dist/server.cjs

@@ -494,31 +494,21 @@ function createResource(source, fetcher, options = {}) {
   }];
 }
 function lazy(fn) {
-  let resolved;
   let p;
   let load = id => {
     if (!p) {
-      if (id) {
-        let ref = sharedConfig.context.resources[id] = {
-          ref: p = fn()
-        };
-        p.then(mod => ref.data = resolved = mod.default);
-        return p;
-      }
       p = fn();
-      p.then(mod => resolved = mod.default);
+      p.then(mod => p.resolved = mod.default);
+      if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
   };
   const contexts = new Set();
   const wrap = props => {
     const id = sharedConfig.context.id.slice(0, -1);
-    let ref = sharedConfig.context.resources[id];
-    if (ref) {
-      p = ref.ref;
-      resolved = ref.data;
-    } else load(id);
-    if (resolved) return resolved(props);
+    let ref = sharedConfig.context.lazy[id];
+    if (ref) p = ref;else load(id);
+    if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
       loading: true,

package/dist/server.js

@@ -492,31 +492,21 @@ function createResource(source, fetcher, options = {}) {
   }];
 }
 function lazy(fn) {
-  let resolved;
   let p;
   let load = id => {
     if (!p) {
-      if (id) {
-        let ref = sharedConfig.context.resources[id] = {
-          ref: p = fn()
-        };
-        p.then(mod => ref.data = resolved = mod.default);
-        return p;
-      }
       p = fn();
-      p.then(mod => resolved = mod.default);
+      p.then(mod => p.resolved = mod.default);
+      if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
   };
   const contexts = new Set();
   const wrap = props => {
     const id = sharedConfig.context.id.slice(0, -1);
-    let ref = sharedConfig.context.resources[id];
-    if (ref) {
-      p = ref.ref;
-      resolved = ref.data;
-    } else load(id);
-    if (resolved) return resolved(props);
+    let ref = sharedConfig.context.lazy[id];
+    if (ref) p = ref;else load(id);
+    if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
       loading: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/types/server/rendering.d.ts

@@ -134,6 +134,7 @@ declare type HydrationContext = {
     resources: Record<string, any>;
     suspense: Record<string, SuspenseContextType>;
     registerFragment: (v: string) => (v?: string, err?: any) => boolean;
+    lazy: Record<string, Promise<any>>;
     async?: boolean;
     noHydrate: boolean;
 };

package/web/dist/server.cjs

@@ -268,6 +268,7 @@ function renderToString(code, options = {}) {
     id: options.renderId || "",
     count: 0,
     suspense: {},
+    lazy: {},
     assets: [],
     nonce: options.nonce,
     writeResource(id, p, error) {
@@ -349,6 +350,7 @@ function renderToStream(code, options = {}) {
     count: 0,
     async: true,
     resources: {},
+    lazy: {},
     suspense: {},
     assets: [],
     nonce,

package/web/dist/server.js

@@ -267,6 +267,7 @@ function renderToString(code, options = {}) {
     id: options.renderId || "",
     count: 0,
     suspense: {},
+    lazy: {},
     assets: [],
     nonce: options.nonce,
     writeResource(id, p, error) {
@@ -348,6 +349,7 @@ function renderToStream(code, options = {}) {
     count: 0,
     async: true,
     resources: {},
+    lazy: {},
     suspense: {},
     assets: [],
     nonce,