@quilted/quilt 0.5.152 → 0.5.154

package/source/{server/index.ts → server.ts}

@@ -1,17 +1,14 @@
 export {
-  Html,
+  Head,
   Serialize,
-  HtmlManager,
-  HtmlContext,
-  renderHtmlToString,
+  HTMLManager,
+  HTMLContext,
   SERVER_ACTION_ID as HTML_SERVER_ACTION_ID,
 } from '@quilted/react-html/server';
 export {
-  ServerAction,
-  useServerAction,
+  extract,
   ServerRenderManager,
   ServerRenderManagerContext,
-  extract,
 } from '@quilted/react-server-render/server';
 
 export {
@@ -19,7 +16,7 @@ export {
   styleAssetPreloadAttributes,
   scriptAssetAttributes,
   scriptAssetPreloadAttributes,
-  createBrowserAssetsFromManifests,
+  BrowserAssetsFromManifests,
   createBrowserAssetsEntryFromManifest,
 } from '@quilted/assets';
 export type {
@@ -39,48 +36,25 @@ export {
   AssetsManager,
   SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID,
 } from '@quilted/react-assets/server';
+export type {HttpState} from '@quilted/react-http/server';
+export {parseAcceptLanguageHeader} from '@quilted/react-localize';
+export {createRequestRouterLocalization} from '@quilted/react-localize/request-router';
+export {
+  ServerAction,
+  useServerAction,
+  useServerContext,
+} from '@quilted/react-server-render';
 export type {
   ServerActionKind,
   ServerActionOptions,
   ServerActionPerform,
   ServerRenderPass,
-} from '@quilted/react-server-render/server';
-export type {HttpState} from '@quilted/react-http/server';
-export {createRequestRouterLocalization} from '@quilted/react-localize/request-router';
-export type {
-  RequestRouterLocalization,
-  RouteLocalization,
-  ResolvedRouteLocalization,
-} from '@quilted/react-localize/request-router';
-export {
-  Request,
-  Response,
-  EnhancedRequest,
-  EnhancedResponse,
-  createRequestRouter,
-  createHeaders,
-} from '@quilted/request-router';
-export type {
-  Headers,
-  BodyInit,
-  ResponseInit,
-  RequestInit,
-  Cookies,
-  CookieOptions,
-  RequestRouter,
-  RequestContext,
-  RequestHandler,
-  ResponseOrEnhancedResponse,
-  CookieDefinition,
-  RequestRegistration,
-  RequestRegistrationOptions,
-} from '@quilted/request-router';
-export {parseAcceptLanguageHeader} from '@quilted/react-localize';
+  ServerRenderRequestContext,
+} from '@quilted/react-server-render';
 
-export {ServerContext} from './ServerContext.tsx';
+export {ServerContext} from './server/ServerContext.tsx';
+export {renderToResponse} from './server/request-router.tsx';
 export {
-  createServerRender,
-  renderAppToResponse,
-  renderAppToStreamedResponse,
-} from './request-router.tsx';
-export {createAssetPreloader, type AssetPreloadOptions} from './preload.ts';
+  createAssetPreloader,
+  type AssetPreloadOptions,
+} from './server/preload.ts';

package/source/signals.ts

@@ -0,0 +1,12 @@
+export {
+  signal,
+  Signal,
+  batch,
+  computed,
+  effect,
+  isSignal,
+  resolveSignalOrValue,
+  signalToIterator,
+  type SignalOrValue,
+} from '@quilted/signals';
+export {useSignal, useComputed, useSignalEffect} from '@quilted/react-signals';

package/source/static/StaticContext.tsx

@@ -2,14 +2,14 @@ import type {PropsWithChildren} from 'react';
 
 import {AssetsContext, type AssetsManager} from '@quilted/react-assets/server';
 import {InitialUrlContext} from '@quilted/react-router';
-import {HtmlContext, type HtmlManager} from '@quilted/react-html/server';
+import {HTMLContext, type HTMLManager} from '@quilted/react-html/server';
 import {HttpServerContext, type HttpManager} from '@quilted/react-http/server';
 
 import {maybeWrapContext} from '../utilities/react.tsx';
 
 interface Props {
   url?: string | URL;
-  html?: HtmlManager;
+  html?: HTMLManager;
   http?: HttpManager;
   assets?: AssetsManager;
 }
@@ -30,7 +30,7 @@ export function StaticContext({
       HttpServerContext,
       http,
       maybeWrapContext(
-        HtmlContext,
+        HTMLContext,
         html,
         maybeWrapContext(InitialUrlContext, normalizedUrl, children),
       ),

package/source/static/index.tsx

@@ -1,13 +1,14 @@
-import {Fragment, type ComponentType} from 'react';
+import {type ComponentType} from 'react';
+import {renderToStaticMarkup} from 'react-dom/server';
 
+import {type BrowserAssets} from '@quilted/assets';
 import {
-  styleAssetAttributes,
-  styleAssetPreloadAttributes,
-  scriptAssetAttributes,
-  scriptAssetPreloadAttributes,
-  type BrowserAssets,
-} from '@quilted/assets';
-import {renderHtmlToString, Html} from '@quilted/react-html/server';
+  Head,
+  Script,
+  ScriptPreload,
+  Style,
+  StylePreload,
+} from '@quilted/react-html/server';
 import type {RouteDefinition} from '@quilted/react-router';
 import {
   StaticRenderer,
@@ -243,54 +244,37 @@ export async function renderStatic(
       }),
     ]);
 
-    const minifiedHtml = renderHtmlToString(
-      <Html
-        manager={htmlManager}
-        headEndContent={
-          <>
-            {[...mainAssets.styles].map((style) => {
-              const attributes = styleAssetAttributes(style, {baseUrl: url});
-              return <link key={style.source} {...(attributes as any)} />;
-            })}
-
-            {[...mainAssets.scripts].map((script) => {
-              const attributes = scriptAssetAttributes(script, {
-                baseUrl: url,
-              });
-
-              return attributes.type === 'module' ? (
-                <Fragment key={script.source}>
-                  <link {...(scriptAssetPreloadAttributes(script) as any)} />
-                  <script {...(attributes as any)} async />
-                </Fragment>
-              ) : (
-                <script key={script.source} {...(attributes as any)} defer />
-              );
-            })}
-
-            {[...preloadAssets.styles].map((style) => {
-              const attributes = styleAssetPreloadAttributes(style, {
-                baseUrl: url,
-              });
-
-              return <link key={style.source} {...(attributes as any)} />;
-            })}
-
-            {[...preloadAssets.scripts].map((script) => {
-              const attributes = scriptAssetPreloadAttributes(script, {
-                baseUrl: url,
-              });
-
-              return <link key={script.source} {...(attributes as any)} />;
-            })}
-          </>
-        }
-      >
-        {markup}
-      </Html>,
-    );
+    const {htmlAttributes, bodyAttributes, ...headProps} = htmlManager.state;
+    const minifiedHTML =
+      '<!DOCTYPE html>' +
+      renderToStaticMarkup(
+        // eslint-disable-next-line jsx-a11y/html-has-lang
+        <html {...htmlAttributes}>
+          <head>
+            <Head {...headProps} />
+            {mainAssets?.scripts.map((script) => (
+              <Script key={script.source} asset={script} baseUrl={url} />
+            ))}
+            {mainAssets?.styles.map((style) => (
+              <Style key={style.source} asset={style} baseUrl={url} />
+            ))}
+            {preloadAssets?.styles.map((style) => (
+              <StylePreload key={style.source} asset={style} baseUrl={url} />
+            ))}
+            {preloadAssets?.scripts.map((script) => (
+              <ScriptPreload key={script.source} asset={script} baseUrl={url} />
+            ))}
+          </head>
+          <body {...bodyAttributes}>
+            <div
+              id="app"
+              dangerouslySetInnerHTML={{__html: markup ?? ''}}
+            ></div>
+          </body>
+        </html>,
+      );
 
-    const html = prettify ? await prettifyHtml(minifiedHtml) : minifiedHtml;
+    const html = prettify ? await prettifyHTML(minifiedHTML) : minifiedHTML;
 
     return {
       html,
@@ -300,7 +284,7 @@ export async function renderStatic(
   }
 }
 
-async function prettifyHtml(html: string) {
+async function prettifyHTML(html: string) {
   try {
     const {default: prettier} = await import('prettier');
     return prettier.format(html, {parser: 'html'});

package/source/static/render.tsx

@@ -2,7 +2,7 @@ import type {ReactElement} from 'react';
 
 import {extract} from '@quilted/react-server-render/server';
 import type {Options as ExtractOptions} from '@quilted/react-server-render/server';
-import {HtmlManager} from '@quilted/react-html/server';
+import {HTMLManager} from '@quilted/react-html/server';
 import {HttpManager} from '@quilted/react-http/server';
 import {AssetsManager} from '@quilted/react-assets/server';
 import type {AssetsCacheKey} from '@quilted/assets';
@@ -21,7 +21,7 @@ export async function renderApp<CacheKey = AssetsCacheKey>(
   app: ReactElement<any>,
   {decorate, url, headers, cacheKey, ...rest}: Options<CacheKey> = {},
 ) {
-  const html = new HtmlManager();
+  const html = new HTMLManager();
   const http = new HttpManager({headers});
   const assets = new AssetsManager<CacheKey>({cacheKey});
 

package/source/testing.ts

@@ -1,30 +1 @@
 export * from '@quilted/testing';
-export {
-  render,
-  createRender,
-  rendered,
-  destroyAll,
-} from '@quilted/react-testing';
-export type {
-  CustomRender,
-  CustomRenderResult,
-  CustomRenderOptions,
-  CustomRenderExtendOptions,
-  HookRunner,
-  Environment,
-  EnvironmentOptions,
-  ContextOption,
-  RenderOption,
-  ActionsOption,
-  Node,
-  NodeApi,
-  Root,
-  RootApi,
-  DebugOptions,
-  EmptyObject,
-  PlainObject,
-  Predicate,
-} from '@quilted/react-testing';
-export {TestRouting, createTestRouter} from '@quilted/react-router/testing';
-
-export {QuiltAppTesting} from './TestApp.tsx';

package/build/cjs/App.cjs

@@ -1,72 +0,0 @@
-'use strict';
-
-var reactHttp = require('@quilted/react-http');
-var reactHtml = require('@quilted/react-html');
-var reactRouter = require('@quilted/react-router');
-var reactPerformance = require('@quilted/react-performance');
-var reactLocalize = require('@quilted/react-localize');
-var jsxRuntime = require('react/jsx-runtime');
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltApp({
-  http = true,
-  html = true,
-  routes,
-  routing = true,
-  localization = true,
-  children,
-  performance = true
-}) {
-  const htmlContent = typeof html === 'boolean' ? html ? /*#__PURE__*/jsxRuntime.jsx(HtmlUpdater, {}) : null : /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/jsxRuntime.jsx(HtmlUpdater, {}), html]
-  });
-  const httpContent = typeof http === 'boolean' ? null : http;
-  const content = /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-    children: [httpContent, htmlContent, children]
-  });
-  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
-    routes: routes,
-    children: content
-  }) : content : 'navigate' in routing ? /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
-    routes: routes,
-    router: routing,
-    children: content
-  }) : /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
-    routes: routes,
-    ...routing,
-    children: content
-  });
-  const withMaybePerformance = typeof performance === 'boolean' ? performance ? /*#__PURE__*/jsxRuntime.jsx(reactPerformance.PerformanceContext, {
-    children: withMaybeRouting
-  }) : withMaybeRouting : /*#__PURE__*/jsxRuntime.jsx(reactPerformance.PerformanceContext, {
-    performance: performance,
-    children: withMaybeRouting
-  });
-  const withMaybeHttp = typeof http === 'boolean' ? http ? /*#__PURE__*/jsxRuntime.jsx(reactHttp.HttpContext, {
-    children: /*#__PURE__*/jsxRuntime.jsx(reactHttp.CookieContext, {
-      children: withMaybePerformance
-    })
-  }) : withMaybePerformance : /*#__PURE__*/jsxRuntime.jsx(reactHttp.HttpContext, {
-    children: /*#__PURE__*/jsxRuntime.jsx(reactHttp.CookieContext, {
-      children: withMaybePerformance
-    })
-  });
-  const withMaybeLocalization = typeof localization === 'boolean' ? localization ? /*#__PURE__*/jsxRuntime.jsx(reactLocalize.Localization, {
-    locale: "en",
-    children: withMaybeHttp
-  }) : withMaybeHttp : typeof localization === 'string' ? /*#__PURE__*/jsxRuntime.jsx(reactLocalize.Localization, {
-    locale: localization,
-    children: withMaybeHttp
-  }) : /*#__PURE__*/jsxRuntime.jsx(reactLocalize.Localization, {
-    ...localization,
-    children: withMaybeHttp
-  });
-  return withMaybeLocalization;
-}
-function HtmlUpdater() {
-  reactHtml.useHtmlUpdater();
-  return null;
-}
-
-exports.QuiltApp = QuiltApp;

package/build/cjs/TestApp.cjs

@@ -1,20 +0,0 @@
-'use strict';
-
-var App = require('./App.cjs');
-var jsxRuntime = require('react/jsx-runtime');
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltAppTesting({
-  routing = true,
-  localization = true,
-  children
-}) {
-  return /*#__PURE__*/jsxRuntime.jsx(App.QuiltApp, {
-    routing: routing,
-    localization: localization,
-    children: children
-  });
-}
-
-exports.QuiltAppTesting = QuiltAppTesting;

package/build/cjs/matchers.cjs

@@ -1,4 +0,0 @@
-'use strict';
-
-require('@quilted/react-testing/matchers');
-

package/build/esm/App.mjs

@@ -1,70 +0,0 @@
-import { HttpContext, CookieContext } from '@quilted/react-http';
-import { useHtmlUpdater } from '@quilted/react-html';
-import { Routing } from '@quilted/react-router';
-import { PerformanceContext } from '@quilted/react-performance';
-import { Localization } from '@quilted/react-localize';
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltApp({
-  http = true,
-  html = true,
-  routes,
-  routing = true,
-  localization = true,
-  children,
-  performance = true
-}) {
-  const htmlContent = typeof html === 'boolean' ? html ? /*#__PURE__*/jsx(HtmlUpdater, {}) : null : /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsx(HtmlUpdater, {}), html]
-  });
-  const httpContent = typeof http === 'boolean' ? null : http;
-  const content = /*#__PURE__*/jsxs(Fragment, {
-    children: [httpContent, htmlContent, children]
-  });
-  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    children: content
-  }) : content : 'navigate' in routing ? /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    router: routing,
-    children: content
-  }) : /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    ...routing,
-    children: content
-  });
-  const withMaybePerformance = typeof performance === 'boolean' ? performance ? /*#__PURE__*/jsx(PerformanceContext, {
-    children: withMaybeRouting
-  }) : withMaybeRouting : /*#__PURE__*/jsx(PerformanceContext, {
-    performance: performance,
-    children: withMaybeRouting
-  });
-  const withMaybeHttp = typeof http === 'boolean' ? http ? /*#__PURE__*/jsx(HttpContext, {
-    children: /*#__PURE__*/jsx(CookieContext, {
-      children: withMaybePerformance
-    })
-  }) : withMaybePerformance : /*#__PURE__*/jsx(HttpContext, {
-    children: /*#__PURE__*/jsx(CookieContext, {
-      children: withMaybePerformance
-    })
-  });
-  const withMaybeLocalization = typeof localization === 'boolean' ? localization ? /*#__PURE__*/jsx(Localization, {
-    locale: "en",
-    children: withMaybeHttp
-  }) : withMaybeHttp : typeof localization === 'string' ? /*#__PURE__*/jsx(Localization, {
-    locale: localization,
-    children: withMaybeHttp
-  }) : /*#__PURE__*/jsx(Localization, {
-    ...localization,
-    children: withMaybeHttp
-  });
-  return withMaybeLocalization;
-}
-function HtmlUpdater() {
-  useHtmlUpdater();
-  return null;
-}
-
-export { QuiltApp };

package/build/esm/TestApp.mjs

@@ -1,18 +0,0 @@
-import { QuiltApp } from './App.mjs';
-import { jsx } from 'react/jsx-runtime';
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltAppTesting({
-  routing = true,
-  localization = true,
-  children
-}) {
-  return /*#__PURE__*/jsx(QuiltApp, {
-    routing: routing,
-    localization: localization,
-    children: children
-  });
-}
-
-export { QuiltAppTesting };

package/build/esm/matchers.mjs

@@ -1 +0,0 @@
-import '@quilted/react-testing/matchers';

package/build/esm/server/index.mjs

@@ -1,10 +0,0 @@
-export { SERVER_ACTION_ID as HTML_SERVER_ACTION_ID, Html, HtmlContext, HtmlManager, Serialize, renderHtmlToString } from '@quilted/react-html/server';
-export { ServerAction, ServerRenderManager, ServerRenderManagerContext, extract, useServerAction } from '@quilted/react-server-render/server';
-export { createBrowserAssetsEntryFromManifest, createBrowserAssetsFromManifests, scriptAssetAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, styleAssetPreloadAttributes } from '@quilted/assets';
-export { SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID, AssetsContext, AssetsManager, useAssetsCacheKey, useModuleAssets } from '@quilted/react-assets/server';
-export { createRequestRouterLocalization } from '@quilted/react-localize/request-router';
-export { EnhancedRequest, EnhancedResponse, Request, Response, createHeaders, createRequestRouter } from '@quilted/request-router';
-export { parseAcceptLanguageHeader } from '@quilted/react-localize';
-export { ServerContext } from './ServerContext.mjs';
-export { createServerRender, renderAppToResponse, renderAppToStreamedResponse } from './request-router.mjs';
-export { createAssetPreloader } from './preload.mjs';

package/build/esnext/App.esnext

@@ -1,70 +0,0 @@
-import { HttpContext, CookieContext } from '@quilted/react-http';
-import { useHtmlUpdater } from '@quilted/react-html';
-import { Routing } from '@quilted/react-router';
-import { PerformanceContext } from '@quilted/react-performance';
-import { Localization } from '@quilted/react-localize';
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltApp({
-  http = true,
-  html = true,
-  routes,
-  routing = true,
-  localization = true,
-  children,
-  performance = true
-}) {
-  const htmlContent = typeof html === 'boolean' ? html ? /*#__PURE__*/jsx(HtmlUpdater, {}) : null : /*#__PURE__*/jsxs(Fragment, {
-    children: [/*#__PURE__*/jsx(HtmlUpdater, {}), html]
-  });
-  const httpContent = typeof http === 'boolean' ? null : http;
-  const content = /*#__PURE__*/jsxs(Fragment, {
-    children: [httpContent, htmlContent, children]
-  });
-  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    children: content
-  }) : content : 'navigate' in routing ? /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    router: routing,
-    children: content
-  }) : /*#__PURE__*/jsx(Routing, {
-    routes: routes,
-    ...routing,
-    children: content
-  });
-  const withMaybePerformance = typeof performance === 'boolean' ? performance ? /*#__PURE__*/jsx(PerformanceContext, {
-    children: withMaybeRouting
-  }) : withMaybeRouting : /*#__PURE__*/jsx(PerformanceContext, {
-    performance: performance,
-    children: withMaybeRouting
-  });
-  const withMaybeHttp = typeof http === 'boolean' ? http ? /*#__PURE__*/jsx(HttpContext, {
-    children: /*#__PURE__*/jsx(CookieContext, {
-      children: withMaybePerformance
-    })
-  }) : withMaybePerformance : /*#__PURE__*/jsx(HttpContext, {
-    children: /*#__PURE__*/jsx(CookieContext, {
-      children: withMaybePerformance
-    })
-  });
-  const withMaybeLocalization = typeof localization === 'boolean' ? localization ? /*#__PURE__*/jsx(Localization, {
-    locale: "en",
-    children: withMaybeHttp
-  }) : withMaybeHttp : typeof localization === 'string' ? /*#__PURE__*/jsx(Localization, {
-    locale: localization,
-    children: withMaybeHttp
-  }) : /*#__PURE__*/jsx(Localization, {
-    ...localization,
-    children: withMaybeHttp
-  });
-  return withMaybeLocalization;
-}
-function HtmlUpdater() {
-  useHtmlUpdater();
-  return null;
-}
-
-export { QuiltApp };

package/build/esnext/TestApp.esnext

@@ -1,18 +0,0 @@
-import { QuiltApp } from './App.esnext';
-import { jsx } from 'react/jsx-runtime';
-
-// TODO: have craft options to remove the bundle impact of parts of this that are
-// unused.
-function QuiltAppTesting({
-  routing = true,
-  localization = true,
-  children
-}) {
-  return /*#__PURE__*/jsx(QuiltApp, {
-    routing: routing,
-    localization: localization,
-    children: children
-  });
-}
-
-export { QuiltAppTesting };

package/build/esnext/matchers.esnext

@@ -1 +0,0 @@
-import '@quilted/react-testing/matchers';

package/build/esnext/server/index.esnext

@@ -1,10 +0,0 @@
-export { SERVER_ACTION_ID as HTML_SERVER_ACTION_ID, Html, HtmlContext, HtmlManager, Serialize, renderHtmlToString } from '@quilted/react-html/server';
-export { ServerAction, ServerRenderManager, ServerRenderManagerContext, extract, useServerAction } from '@quilted/react-server-render/server';
-export { createBrowserAssetsEntryFromManifest, createBrowserAssetsFromManifests, scriptAssetAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, styleAssetPreloadAttributes } from '@quilted/assets';
-export { SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID, AssetsContext, AssetsManager, useAssetsCacheKey, useModuleAssets } from '@quilted/react-assets/server';
-export { createRequestRouterLocalization } from '@quilted/react-localize/request-router';
-export { EnhancedRequest, EnhancedResponse, Request, Response, createHeaders, createRequestRouter } from '@quilted/request-router';
-export { parseAcceptLanguageHeader } from '@quilted/react-localize';
-export { ServerContext } from './ServerContext.esnext';
-export { createServerRender, renderAppToResponse, renderAppToStreamedResponse } from './request-router.esnext';
-export { createAssetPreloader } from './preload.esnext';