@solidjs/web 2.0.0-experimental.3 → 2.0.0-experimental.4

package/dist/server.cjs

@@ -505,6 +505,29 @@ function resolveSSRNode(node, top) {
   if (t === "function") return resolveSSRNode(node());
   return String(node);
 }
+function mergeProps(...sources) {
+  const target = {};
+  for (let i = 0; i < sources.length; i++) {
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) {
+      const descriptors = Object.getOwnPropertyDescriptors(source);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
+    }
+  }
+  return target;
+}
 function getHydrationKey() {
   const hydrate = solidJs.sharedConfig.context;
   return hydrate && !hydrate.noHydrate && solidJs.sharedConfig.getNextContextId();
@@ -618,11 +641,11 @@ function createDynamic(component, props) {
   }
 }
 function Dynamic(props) {
-  const [, others] = solidJs.splitProps(props, ["component"]);
+  const others = solidJs.omit(props, "component");
   return createDynamic(() => props.component, others);
 }
 function Portal(props) {
-  return "";
+  throw new Error("Portal is not supported on the server");
 }
 
 Object.defineProperty(exports, "ErrorBoundary", {
@@ -633,14 +656,14 @@ Object.defineProperty(exports, "For", {
   enumerable: true,
   get: function () { return solidJs.For; }
 });
-Object.defineProperty(exports, "Index", {
-  enumerable: true,
-  get: function () { return solidJs.Index; }
-});
 Object.defineProperty(exports, "Match", {
   enumerable: true,
   get: function () { return solidJs.Match; }
 });
+Object.defineProperty(exports, "Repeat", {
+  enumerable: true,
+  get: function () { return solidJs.Repeat; }
+});
 Object.defineProperty(exports, "Show", {
   enumerable: true,
   get: function () { return solidJs.Show; }
@@ -649,10 +672,6 @@ Object.defineProperty(exports, "Suspense", {
   enumerable: true,
   get: function () { return solidJs.Suspense; }
 });
-Object.defineProperty(exports, "SuspenseList", {
-  enumerable: true,
-  get: function () { return solidJs.SuspenseList; }
-});
 Object.defineProperty(exports, "Switch", {
   enumerable: true,
   get: function () { return solidJs.Switch; }
@@ -673,10 +692,6 @@ Object.defineProperty(exports, "memo", {
   enumerable: true,
   get: function () { return solidJs.createMemo; }
 });
-Object.defineProperty(exports, "mergeProps", {
-  enumerable: true,
-  get: function () { return solidJs.mergeProps; }
-});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
@@ -713,6 +728,7 @@ exports.hydrate = notSup;
 exports.insert = notSup;
 exports.isDev = isDev;
 exports.isServer = isServer;
+exports.mergeProps = mergeProps;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;

package/dist/server.js

@@ -1,18 +1,16 @@
-import { sharedConfig, createRoot, splitProps } from "solid-js";
+import { sharedConfig, createRoot, omit } from "solid-js";
 export {
   ErrorBoundary,
   For,
-  Index,
   Match,
+  Repeat,
   Show,
   Suspense,
-  SuspenseList,
   Switch,
   createComponent,
   createRenderEffect as effect,
   getOwner,
   createMemo as memo,
-  mergeProps,
   untrack
 } from "solid-js";
 import { Feature, Serializer, getCrossReferenceHeader } from "seroval";
@@ -965,6 +963,29 @@ function resolveSSRNode(node, top) {
   if (t === "function") return resolveSSRNode(node());
   return String(node);
 }
+function mergeProps(...sources) {
+  const target = {};
+  for (let i = 0; i < sources.length; i++) {
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) {
+      const descriptors = Object.getOwnPropertyDescriptors(source);
+      for (const key in descriptors) {
+        if (key in target) continue;
+        Object.defineProperty(target, key, {
+          enumerable: true,
+          get() {
+            for (let i = sources.length - 1; i >= 0; i--) {
+              const v = (sources[i] || {})[key];
+              if (v !== undefined) return v;
+            }
+          }
+        });
+      }
+    }
+  }
+  return target;
+}
 function getHydrationKey() {
   const hydrate = sharedConfig.context;
   return hydrate && !hydrate.noHydrate && sharedConfig.getNextContextId();
@@ -1090,11 +1111,11 @@ function createDynamic(component, props) {
   }
 }
 function Dynamic(props) {
-  const [, others] = splitProps(props, ["component"]);
+  const others = omit(props, "component");
   return createDynamic(() => props.component, others);
 }
 function Portal(props) {
-  return "";
+  throw new Error("Portal is not supported on the server");
 }
 
 export {
@@ -1130,6 +1151,7 @@ export {
   notSup as insert,
   isDev,
   isServer,
+  mergeProps,
   notSup as render,
   renderToStream,
   renderToString,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime for the browser and the server",
-  "version": "2.0.0-experimental.3",
+  "version": "2.0.0-experimental.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -75,10 +75,10 @@
     "seroval-plugins": "^1.1.0"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-experimental.3"
+    "solid-js": "^2.0.0-experimental.4"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-experimental.3"
+    "solid-js": "2.0.0-experimental.4"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",