@solidjs/web 2.0.0-beta.0 → 2.0.0-beta.1

package/dist/dev.cjs

@@ -242,12 +242,15 @@ function ref(fn, element) {
 function insert(parent, accessor, marker, initial) {
   const multi = marker !== undefined;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent) && Array.isArray(initial)) {
-    let j = 0;
-    for (let i = 0; i < initial.length; i++) {
-      if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+  if (isHydrating(parent)) {
+    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+    if (Array.isArray(initial)) {
+      let j = 0;
+      for (let i = 0; i < initial.length; i++) {
+        if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+      }
+      initial.length = j;
     }
-    initial.length = j;
   }
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
@@ -602,12 +605,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return solidJs.sharedConfig.getNextContextId();
 }
-function NoHydration(props) {
-  return solidJs.sharedConfig.hydrating ? undefined : props.children;
-}
-function Hydration(props) {
-  return props.children;
-}
 const voidFn = () => undefined;
 const RequestContext = Symbol();
 
@@ -713,6 +710,10 @@ Object.defineProperty(exports, "For", {
   enumerable: true,
   get: function () { return solidJs.For; }
 });
+Object.defineProperty(exports, "Hydration", {
+  enumerable: true,
+  get: function () { return solidJs.Hydration; }
+});
 Object.defineProperty(exports, "Loading", {
   enumerable: true,
   get: function () { return solidJs.Loading; }
@@ -721,6 +722,10 @@ Object.defineProperty(exports, "Match", {
   enumerable: true,
   get: function () { return solidJs.Match; }
 });
+Object.defineProperty(exports, "NoHydration", {
+  enumerable: true,
+  get: function () { return solidJs.NoHydration; }
+});
 Object.defineProperty(exports, "Show", {
   enumerable: true,
   get: function () { return solidJs.Show; }
@@ -750,9 +755,7 @@ exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
-exports.Hydration = Hydration;
 exports.HydrationScript = voidFn;
-exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
 exports.RequestContext = RequestContext;

package/dist/dev.js

@@ -1,5 +1,5 @@
 import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, createRoot, flatten, omit, $DEVCOMP, enableHydration } from 'solid-js';
-export { Errored, For, Loading, Match, Show, Switch, createComponent, getOwner, merge as mergeProps, untrack } from 'solid-js';
+export { Errored, For, Hydration, Loading, Match, NoHydration, Show, Switch, createComponent, getOwner, merge as mergeProps, untrack } from 'solid-js';
 
 const Properties = /*#__PURE__*/new Set([
 "value", "checked", "selected", "muted"]);
@@ -241,12 +241,15 @@ function ref(fn, element) {
 function insert(parent, accessor, marker, initial) {
   const multi = marker !== undefined;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent) && Array.isArray(initial)) {
-    let j = 0;
-    for (let i = 0; i < initial.length; i++) {
-      if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+  if (isHydrating(parent)) {
+    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+    if (Array.isArray(initial)) {
+      let j = 0;
+      for (let i = 0; i < initial.length; i++) {
+        if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+      }
+      initial.length = j;
     }
-    initial.length = j;
   }
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
@@ -601,12 +604,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return sharedConfig.getNextContextId();
 }
-function NoHydration(props) {
-  return sharedConfig.hydrating ? undefined : props.children;
-}
-function Hydration(props) {
-  return props.children;
-}
 const voidFn = () => undefined;
 const RequestContext = Symbol();
 
@@ -704,4 +701,4 @@ function Dynamic(props) {
   return createDynamic(() => props.component, others);
 }
 
-export { voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, voidFn as HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, addEventListener, applyRef, assign, className, clearDelegatedEvents, createDynamic, delegateEvents, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, ref, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, voidFn as useAssets };
+export { voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, voidFn as HydrationScript, Portal, Properties, RequestContext, SVGElements, SVGNamespace, addEventListener, applyRef, assign, className, clearDelegatedEvents, createDynamic, delegateEvents, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, ref, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, voidFn as useAssets };

package/dist/server.cjs

@@ -56,6 +56,7 @@ function getLocalHeaderScript(id) {
 
 function resolveAssets(moduleUrl, manifest) {
   if (!manifest) return null;
+  const base = manifest._base || "/";
   const entry = manifest[moduleUrl];
   if (!entry) return null;
   const css = [];
@@ -66,8 +67,8 @@ function resolveAssets(moduleUrl, manifest) {
     visited.add(key);
     const e = manifest[key];
     if (!e) return;
-    js.push(e.file);
-    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(e.css[i]);
+    js.push(base + e.file);
+    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(base + e.css[i]);
     if (e.imports) for (let i = 0; i < e.imports.length; i++) walk(e.imports[i]);
   };
   walk(moduleUrl);
@@ -646,7 +647,7 @@ function mergeProps(...sources) {
 }
 function getHydrationKey() {
   const hydrate = solidJs.sharedConfig.context;
-  return hydrate && !hydrate.noHydrate && solidJs.sharedConfig.getNextContextId();
+  return hydrate && solidJs.sharedConfig.getNextContextId();
 }
 function applyRef(r, element) {
   Array.isArray(r) ? r.flat(Infinity).forEach(f => f && f(element)) : r(element);
@@ -666,27 +667,6 @@ function generateHydrationScript({
 } = {}) {
   return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("_hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
-function Hydration(props) {
-  if (!solidJs.sharedConfig.context.noHydrate) return props.children;
-  const context = solidJs.sharedConfig.context;
-  solidJs.sharedConfig.context = {
-    ...context,
-    noHydrate: false
-  };
-  const res = props.children;
-  solidJs.sharedConfig.context = context;
-  return res;
-}
-function NoHydration(props) {
-  let context = solidJs.sharedConfig.context;
-  if (context) solidJs.sharedConfig.context = {
-    ...context,
-    noHydrate: true
-  };
-  const res = props.children;
-  if (context) solidJs.sharedConfig.context = context;
-  return res;
-}
 function queue(fn) {
   return Promise.resolve().then(fn);
 }
@@ -882,6 +862,10 @@ Object.defineProperty(exports, "For", {
   enumerable: true,
   get: function () { return solidJs.For; }
 });
+Object.defineProperty(exports, "Hydration", {
+  enumerable: true,
+  get: function () { return solidJs.Hydration; }
+});
 Object.defineProperty(exports, "Loading", {
   enumerable: true,
   get: function () { return solidJs.Loading; }
@@ -890,6 +874,10 @@ Object.defineProperty(exports, "Match", {
   enumerable: true,
   get: function () { return solidJs.Match; }
 });
+Object.defineProperty(exports, "NoHydration", {
+  enumerable: true,
+  get: function () { return solidJs.NoHydration; }
+});
 Object.defineProperty(exports, "Repeat", {
   enumerable: true,
   get: function () { return solidJs.Repeat; }
@@ -922,9 +910,7 @@ exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
-exports.Hydration = Hydration;
 exports.HydrationScript = HydrationScript;
-exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
 exports.RequestContext = RequestContext;

package/dist/server.js

@@ -1,5 +1,5 @@
 import { createRenderEffect, createMemo, sharedConfig, createRoot, ssrHandleError, omit, getOwner, getNextChildId, createOwner, runWithOwner } from 'solid-js';
-export { Errored, For, Loading, Match, Repeat, Show, Switch, createComponent, getOwner, ssrRunInScope, untrack } from 'solid-js';
+export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Show, Switch, createComponent, getOwner, ssrRunInScope, untrack } from 'solid-js';
 import { Serializer, Feature, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
@@ -55,6 +55,7 @@ function getLocalHeaderScript(id) {
 
 function resolveAssets(moduleUrl, manifest) {
   if (!manifest) return null;
+  const base = manifest._base || "/";
   const entry = manifest[moduleUrl];
   if (!entry) return null;
   const css = [];
@@ -65,8 +66,8 @@ function resolveAssets(moduleUrl, manifest) {
     visited.add(key);
     const e = manifest[key];
     if (!e) return;
-    js.push(e.file);
-    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(e.css[i]);
+    js.push(base + e.file);
+    if (e.css) for (let i = 0; i < e.css.length; i++) css.push(base + e.css[i]);
     if (e.imports) for (let i = 0; i < e.imports.length; i++) walk(e.imports[i]);
   };
   walk(moduleUrl);
@@ -645,7 +646,7 @@ function mergeProps(...sources) {
 }
 function getHydrationKey() {
   const hydrate = sharedConfig.context;
-  return hydrate && !hydrate.noHydrate && sharedConfig.getNextContextId();
+  return hydrate && sharedConfig.getNextContextId();
 }
 function applyRef(r, element) {
   Array.isArray(r) ? r.flat(Infinity).forEach(f => f && f(element)) : r(element);
@@ -665,27 +666,6 @@ function generateHydrationScript({
 } = {}) {
   return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("_hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{if(!e.events)return;let s=t(o.composedPath&&o.composedPath()[0]||o.target);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});</script><!--xs-->`;
 }
-function Hydration(props) {
-  if (!sharedConfig.context.noHydrate) return props.children;
-  const context = sharedConfig.context;
-  sharedConfig.context = {
-    ...context,
-    noHydrate: false
-  };
-  const res = props.children;
-  sharedConfig.context = context;
-  return res;
-}
-function NoHydration(props) {
-  let context = sharedConfig.context;
-  if (context) sharedConfig.context = {
-    ...context,
-    noHydrate: true
-  };
-  const res = props.children;
-  if (context) sharedConfig.context = context;
-  return res;
-}
 function queue(fn) {
   return Promise.resolve().then(fn);
 }
@@ -873,4 +853,4 @@ function Portal(props) {
   throw new Error("Portal is not supported on the server");
 }
 
-export { ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, notSup as addEventListener, applyRef, notSup as assign, notSup as className, createDynamic, notSup as delegateEvents, notSup as dynamicProperty, effect, escape, generateHydrationScript, getAssets, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, mergeProps, notSup as render, renderToStream, renderToString, renderToStringAsync, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrHydrationKey, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, useAssets };
+export { ChildProperties, DOMElements, DelegatedEvents, Dynamic, HydrationScript, Portal, Properties, RequestContext, SVGElements, SVGNamespace, notSup as addEventListener, applyRef, notSup as assign, notSup as className, createDynamic, notSup as delegateEvents, notSup as dynamicProperty, effect, escape, generateHydrationScript, getAssets, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, notSup as hydrate, notSup as insert, isDev, isServer, memo, mergeProps, notSup as render, renderToStream, renderToString, renderToStringAsync, notSup as runHydrationEvents, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrHydrationKey, ssrStyle, ssrStyleProperty, notSup as style, notSup as template, useAssets };

package/dist/web.cjs

@@ -237,12 +237,15 @@ function ref(fn, element) {
 function insert(parent, accessor, marker, initial) {
   const multi = marker !== undefined;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent) && Array.isArray(initial)) {
-    let j = 0;
-    for (let i = 0; i < initial.length; i++) {
-      if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+  if (isHydrating(parent)) {
+    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+    if (Array.isArray(initial)) {
+      let j = 0;
+      for (let i = 0; i < initial.length; i++) {
+        if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+      }
+      initial.length = j;
     }
-    initial.length = j;
   }
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
@@ -548,12 +551,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return solidJs.sharedConfig.getNextContextId();
 }
-function NoHydration(props) {
-  return solidJs.sharedConfig.hydrating ? undefined : props.children;
-}
-function Hydration(props) {
-  return props.children;
-}
 const voidFn = () => undefined;
 const RequestContext = Symbol();
 
@@ -656,6 +653,10 @@ Object.defineProperty(exports, "For", {
   enumerable: true,
   get: function () { return solidJs.For; }
 });
+Object.defineProperty(exports, "Hydration", {
+  enumerable: true,
+  get: function () { return solidJs.Hydration; }
+});
 Object.defineProperty(exports, "Loading", {
   enumerable: true,
   get: function () { return solidJs.Loading; }
@@ -664,6 +665,10 @@ Object.defineProperty(exports, "Match", {
   enumerable: true,
   get: function () { return solidJs.Match; }
 });
+Object.defineProperty(exports, "NoHydration", {
+  enumerable: true,
+  get: function () { return solidJs.NoHydration; }
+});
 Object.defineProperty(exports, "Show", {
   enumerable: true,
   get: function () { return solidJs.Show; }
@@ -693,9 +698,7 @@ exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
-exports.Hydration = Hydration;
 exports.HydrationScript = voidFn;
-exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
 exports.RequestContext = RequestContext;

package/dist/web.js

@@ -1,5 +1,5 @@
 import { createRenderEffect, createMemo, sharedConfig, untrack, runWithOwner, createRoot, flatten, omit, enableHydration } from 'solid-js';
-export { Errored, For, Loading, Match, Show, Switch, createComponent, getOwner, merge as mergeProps, untrack } from 'solid-js';
+export { Errored, For, Hydration, Loading, Match, NoHydration, Show, Switch, createComponent, getOwner, merge as mergeProps, untrack } from 'solid-js';
 
 const Properties = /*#__PURE__*/new Set([
 "value", "checked", "selected", "muted"]);
@@ -236,12 +236,15 @@ function ref(fn, element) {
 function insert(parent, accessor, marker, initial) {
   const multi = marker !== undefined;
   if (multi && !initial) initial = [];
-  if (isHydrating(parent) && Array.isArray(initial)) {
-    let j = 0;
-    for (let i = 0; i < initial.length; i++) {
-      if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+  if (isHydrating(parent)) {
+    if (!multi && initial === undefined && parent) initial = [...parent.childNodes];
+    if (Array.isArray(initial)) {
+      let j = 0;
+      for (let i = 0; i < initial.length; i++) {
+        if (initial[i].nodeType === 8 && initial[i].nodeValue === "!$") initial[i].remove();else initial[j++] = initial[i];
+      }
+      initial.length = j;
     }
-    initial.length = j;
   }
   if (typeof accessor !== "function") {
     accessor = normalize(accessor, initial, multi, true);
@@ -547,12 +550,6 @@ function gatherHydratable(element, root) {
 function getHydrationKey() {
   return sharedConfig.getNextContextId();
 }
-function NoHydration(props) {
-  return sharedConfig.hydrating ? undefined : props.children;
-}
-function Hydration(props) {
-  return props.children;
-}
 const voidFn = () => undefined;
 const RequestContext = Symbol();
 
@@ -647,4 +644,4 @@ function Dynamic(props) {
   return createDynamic(() => props.component, others);
 }
 
-export { voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Hydration, voidFn as HydrationScript, NoHydration, Portal, Properties, RequestContext, SVGElements, SVGNamespace, addEventListener, applyRef, assign, className, clearDelegatedEvents, createDynamic, delegateEvents, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, ref, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, voidFn as useAssets };
+export { voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, voidFn as HydrationScript, Portal, Properties, RequestContext, SVGElements, SVGNamespace, addEventListener, applyRef, assign, className, clearDelegatedEvents, createDynamic, delegateEvents, dynamicProperty, effect, escape, voidFn as generateHydrationScript, voidFn as getAssets, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, hydrate, insert, isDev, isServer, memo, ref, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template, voidFn as useAssets };

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-beta.0",
+  "version": "2.0.0-beta.1",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -75,10 +75,10 @@
     "seroval-plugins": "^1.1.0"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.0"
+    "solid-js": "^2.0.0-beta.1"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.0"
+    "solid-js": "2.0.0-beta.1"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/storage/types/src/index.d.ts

@@ -1,7 +1,7 @@
 import { hydrate as hydrateCore } from "./client.js";
 import { JSX, ComponentProps, ValidComponent } from "solid-js";
 export * from "./client.js";
-export { For, Show, Switch, Match, Errored, Loading, merge as mergeProps } from "solid-js";
+export { For, Show, Switch, Match, Errored, Loading, NoHydration, Hydration, merge as mergeProps } from "solid-js";
 export * from "./server-mock.js";
 export declare const isServer: boolean;
 export declare const isDev: boolean;

package/types/client.d.ts

@@ -79,8 +79,6 @@ export function getAssets(): string;
 export function HydrationScript(props?: { nonce?: string; eventNames?: string[] }): JSX.Element;
 export function generateHydrationScript(options?: { nonce?: string; eventNames?: string[] }): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
-export function Hydration(props: { children?: JSX.Element }): JSX.Element;
-export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
 export interface RequestEvent {
   request: Request;
   locals: Record<string | number | symbol, any>;

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { hydrate as hydrateCore } from "./client.js";
 import { JSX, ComponentProps, ValidComponent } from "solid-js";
 export * from "./client.js";
-export { For, Show, Switch, Match, Errored, Loading, merge as mergeProps } from "solid-js";
+export { For, Show, Switch, Match, Errored, Loading, NoHydration, Hydration, merge as mergeProps } from "solid-js";
 export * from "./server-mock.js";
 export declare const isServer: boolean;
 export declare const isDev: boolean;

package/types/server.d.ts

@@ -15,6 +15,7 @@ export function renderToString<T>(
     renderId?: string;
     noScripts?: boolean;
     plugins?: any[];
+    manifest?: Record<string, { file: string; css?: string[]; isEntry?: boolean; imports?: string[] }> & { _base?: string };
     onError?: (err: any) => void;
   }
 ): string;
@@ -27,6 +28,7 @@ export function renderToStringAsync<T>(
     renderId?: string;
     noScripts?: boolean;
     plugins?: any[];
+    manifest?: Record<string, { file: string; css?: string[]; isEntry?: boolean; imports?: string[] }> & { _base?: string };
     onError?: (err: any) => void;
   }
 ): Promise<string>;
@@ -37,6 +39,7 @@ export function renderToStream<T>(
     renderId?: string;
     noScripts?: boolean;
     plugins?: any[];
+    manifest?: Record<string, { file: string; css?: string[]; isEntry?: boolean; imports?: string[] }> & { _base?: string };
     onCompleteShell?: (info: { write: (v: string) => void }) => void;
     onCompleteAll?: (info: { write: (v: string) => void }) => void;
     onError?: (err: any) => void;
@@ -80,8 +83,6 @@ export interface RequestEvent {
 }
 export function getRequestEvent(): RequestEvent | undefined;
 
-export function Hydration(props: { children?: JSX.Element }): JSX.Element;
-export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function untrack<T>(fn: () => T): T;