solid-js 1.5.0-beta.1 → 1.5.0-beta.4

package/web/dist/web.cjs

@@ -206,6 +206,9 @@ function dynamicProperty(props, key) {
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);
 }
+function use(fn, element, arg) {
+  return solidJs.untrack(() => fn(element, arg));
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -413,6 +416,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (solidJs.sharedConfig.context) {
+      if (!array.length) return current;
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
@@ -497,12 +501,10 @@ function getHydrationKey() {
   const hydrate = solidJs.sharedConfig.context;
   return `${hydrate.id}${hydrate.count++}`;
 }
-function Assets() {
-  return;
-}
 function NoHydration(props) {
   return solidJs.sharedConfig.context ? undefined : props.children;
 }
+function voidFn() {}
 
 function throwInBrowser(func) {
   const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
@@ -525,7 +527,7 @@ function ssrAttribute(key, value) {}
 function ssrHydrationKey() {}
 function resolveSSRNode(node) {}
 function escape(html) {}
-function generateHydrationScript() {}
+function ssrSpread(props, isSVG, skipChildren) {}
 
 const isServer = false;
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
@@ -639,12 +641,12 @@ Object.defineProperty(exports, 'mergeProps', {
   get: function () { return solidJs.mergeProps; }
 });
 exports.Aliases = Aliases;
-exports.Assets = Assets;
+exports.Assets = voidFn;
 exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DelegatedEvents = DelegatedEvents;
 exports.Dynamic = Dynamic;
-exports.HydrationScript = Assets;
+exports.HydrationScript = voidFn;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.PropAliases = PropAliases;
@@ -659,7 +661,8 @@ exports.clearDelegatedEvents = clearDelegatedEvents;
 exports.delegateEvents = delegateEvents;
 exports.dynamicProperty = dynamicProperty;
 exports.escape = escape;
-exports.generateHydrationScript = generateHydrationScript;
+exports.generateHydrationScript = voidFn;
+exports.getAssets = voidFn;
 exports.getHydrationKey = getHydrationKey;
 exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
@@ -683,6 +686,9 @@ exports.ssrAttribute = ssrAttribute;
 exports.ssrClassList = ssrClassList;
 exports.ssrElement = ssrElement;
 exports.ssrHydrationKey = ssrHydrationKey;
+exports.ssrSpread = ssrSpread;
 exports.ssrStyle = ssrStyle;
 exports.style = style;
 exports.template = template;
+exports.use = use;
+exports.useAssets = voidFn;

package/web/dist/web.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, sharedConfig, enableHydration, createSignal, onCleanup, splitProps, untrack } from 'solid-js';
+import { createMemo, createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, createSignal, onCleanup, splitProps } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
@@ -203,6 +203,9 @@ function dynamicProperty(props, key) {
 function innerHTML(parent, content) {
   !sharedConfig.context && (parent.innerHTML = content);
 }
+function use(fn, element, arg) {
+  return untrack(() => fn(element, arg));
+}
 function insert(parent, accessor, marker, initial) {
   if (marker !== undefined && !initial) initial = [];
   if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
@@ -410,6 +413,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       return () => current;
     }
     if (sharedConfig.context) {
+      if (!array.length) return current;
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
@@ -494,12 +498,10 @@ function getHydrationKey() {
   const hydrate = sharedConfig.context;
   return `${hydrate.id}${hydrate.count++}`;
 }
-function Assets() {
-  return;
-}
 function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;
 }
+function voidFn() {}
 
 function throwInBrowser(func) {
   const err = new Error(`${func.name} is not supported in the browser, returning undefined`);
@@ -522,7 +524,7 @@ function ssrAttribute(key, value) {}
 function ssrHydrationKey() {}
 function resolveSSRNode(node) {}
 function escape(html) {}
-function generateHydrationScript() {}
+function ssrSpread(props, isSVG, skipChildren) {}
 
 const isServer = false;
 const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
@@ -587,4 +589,4 @@ function Dynamic(props) {
   });
 }
 
-export { Aliases, Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, Assets as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, className, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, generateHydrationScript, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrStyle, style, template };
+export { Aliases, voidFn as Assets, ChildProperties, DOMElements, DelegatedEvents, Dynamic, voidFn as HydrationScript, NoHydration, Portal, PropAliases, Properties, SVGElements, SVGNamespace, addEventListener, assign, classList, className, clearDelegatedEvents, delegateEvents, dynamicProperty, escape, voidFn as generateHydrationScript, voidFn as getAssets, getHydrationKey, getNextElement, getNextMarker, getNextMatch, hydrate, innerHTML, insert, isServer, memo, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, runHydrationEvents, setAttribute, setAttributeNS, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, style, template, use, voidFn as useAssets };

package/web/types/client.d.ts

@@ -1,4 +1,4 @@
-import { JSX } from "./jsx";
+import { JSX } from "./jsx.js";
 export const Aliases: Record<string, string>;
 export const PropAliases: Record<string, string>;
 export const Properties: Set<string>;
@@ -62,6 +62,9 @@ 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 getAssets(): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function HydrationScript(): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
+export function getHydrationScript(): string;

package/web/types/core.d.ts

@@ -1,3 +1,3 @@
-import { createRoot, createRenderEffect, createComponent, getOwner, sharedConfig } from "solid-js";
+import { createRoot, createRenderEffect, createComponent, getOwner, sharedConfig, untrack } from "solid-js";
 declare function memo<T>(fn: () => T, equals: boolean): import("solid-js").Accessor<T>;
-export { getOwner, createComponent, createRoot as root, createRenderEffect as effect, memo, sharedConfig };
+export { getOwner, createComponent, createRoot as root, createRenderEffect as effect, memo, sharedConfig, untrack };

package/web/types/index.d.ts

@@ -1,8 +1,8 @@
-import { hydrate as hydrateCore } from "./client";
+import { hydrate as hydrateCore } from "./client.js";
 import { JSX, Accessor, ComponentProps, ValidComponent } from "solid-js";
-export * from "./client";
+export * from "./client.js";
 export { For, Show, Suspense, SuspenseList, Switch, Match, Index, ErrorBoundary, mergeProps } from "solid-js";
-export * from "./server-mock";
+export * from "./server-mock.js";
 export declare const isServer = false;
 export declare const hydrate: typeof hydrateCore;
 /**

package/web/types/jsx.d.ts

@@ -1 +1 @@
-export { JSX } from "../..";
+export type { JSX } from "../../types/jsx.js";

package/web/types/server-mock.d.ts

@@ -38,7 +38,10 @@ export declare function ssrAttribute(key: string, value: boolean): string;
 export declare function ssrHydrationKey(): string;
 export declare function resolveSSRNode(node: any): string;
 export declare function escape(html: string): string;
-export declare function generateHydrationScript(): string;
+/**
+ * @deprecated Replaced by ssrElement
+ */
+export declare function ssrSpread(props: any, isSVG: boolean, skipChildren: boolean): void;
 export declare type LegacyResults = {
     startWriting: () => void;
 };

package/web/types/server.d.ts

@@ -37,6 +37,8 @@ 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 getAssets(): string;
 export function getHydrationKey(): string;
 export function effect<T>(fn: (prev?: T) => T, init?: T): void;
 export function memo<T>(fn: () => T, equal: boolean): () => T;