@quilted/quilt 0.5.145 → 0.5.147

package/build/typescript/global.d.ts

@@ -1,2 +1,8 @@
-export {};
+import { type AsyncModulesGlobal } from '@quilted/async';
+export interface QuiltGlobal {
+    readonly AsyncModules: AsyncModulesGlobal;
+}
+declare const quilt: QuiltGlobal;
+export default quilt;
+export { quilt, quilt as global };
 //# sourceMappingURL=global.d.ts.map

package/build/typescript/global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../source/global.ts"],"names":[],"mappings":""}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../source/global.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;CAC3C;AAGD,QAAA,MAAM,KAAK,aAAuD,CAAC;AAanE,eAAe,KAAK,CAAC;AACrB,OAAO,EAAC,KAAK,EAAE,KAAK,IAAI,MAAM,EAAC,CAAC"}

package/build/typescript/server/request-router.d.ts

@@ -2,7 +2,7 @@ import { type ReactElement } from 'react';
 import { type AssetsCacheKey, type BrowserAssets, type BrowserAssetsEntry } from '@quilted/assets';
 import { AssetsManager } from '@quilted/react-assets/server';
 import { HttpManager } from '@quilted/react-http/server';
-import { HtmlManager } from '@quilted/react-html/server';
+import { HtmlManager, type HtmlProps } from '@quilted/react-html/server';
 import type { Options as ExtractOptions, ServerRenderRequestContext } from '@quilted/react-server-render/server';
 import type { EnhancedRequest, RequestHandler, RequestContext } from '@quilted/request-router';
 export interface ServerRenderOptions<Context = RequestContext, CacheKey = AssetsCacheKey> {
@@ -11,11 +11,17 @@ export interface ServerRenderOptions<Context = RequestContext, CacheKey = Assets
     extract?: Omit<ExtractOptions, 'context'> & {
         readonly context?: ServerRenderRequestContext | ((request: EnhancedRequest, context: Context) => ServerRenderRequestContext);
     };
-    renderHtml?(content: string | undefined, details: Pick<ServerRenderAppDetails, 'http' | 'html'> & {
+    html?: ServerRenderHtmlRender<Context> | {
+        readonly rootElement?: HtmlProps['rootElement'];
+    };
+}
+export interface ServerRenderHtmlRender<Context> {
+    (content: string | undefined, details: Pick<ServerRenderAppDetails, 'http' | 'html'> & {
         readonly request: EnhancedRequest;
         readonly context: Context;
         readonly assets?: BrowserAssetsEntry;
         readonly preloadAssets?: BrowserAssetsEntry;
+        readonly rootElement?: HtmlProps['rootElement'];
     }): ReactElement<any> | Promise<ReactElement<any>>;
 }
 export interface ServerRenderAppDetails<_Context = RequestContext, CacheKey = AssetsCacheKey> {
@@ -24,12 +30,13 @@ export interface ServerRenderAppDetails<_Context = RequestContext, CacheKey = As
     readonly assets: AssetsManager<CacheKey>;
     readonly rendered?: string;
 }
-export declare function createServerRender<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | ((request: EnhancedRequest, context: Context) => ReactElement<any> | Promise<ReactElement<any>>), { stream, ...options }?: ServerRenderOptions<Context, CacheKey>): RequestHandler<Context>;
-export declare function renderAppToResponse<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | (() => ReactElement<any> | Promise<ReactElement<any>>), { request, context, assets, extract, renderHtml, }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'renderHtml' | 'extract'> & {
+export declare function createServerRender<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | ((request: EnhancedRequest, context: Context) => ReactElement<any> | undefined | Promise<ReactElement<any> | undefined>), options?: ServerRenderOptions<Context, CacheKey>): RequestHandler<Context>;
+export declare function createServerRender<Context = RequestContext, CacheKey = AssetsCacheKey>(options?: ServerRenderOptions<Context, CacheKey>): RequestHandler<Context>;
+export declare function renderAppToResponse<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | (() => ReactElement<any> | undefined | Promise<ReactElement<any> | undefined>) | undefined, { request, context, assets, extract, html: htmlOptions, }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'html' | 'extract'> & {
     readonly request: EnhancedRequest;
     readonly context: Context;
 }): Promise<import("@quilted/request-router").EnhancedResponse>;
-export declare function renderAppToStreamedResponse<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | (() => ReactElement<any> | Promise<ReactElement<any>>), { request, context, assets, extract, renderHtml, }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'renderHtml' | 'extract'> & {
+export declare function renderAppToStreamedResponse<Context = RequestContext, CacheKey = AssetsCacheKey>(getApp: ReactElement<any> | (() => ReactElement<any> | undefined | Promise<ReactElement<any> | undefined>) | undefined, { request, context, assets, extract, html: htmlOptions, }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'html' | 'extract'> & {
     readonly request: EnhancedRequest;
     readonly context: Context;
 }): Promise<import("@quilted/request-router").EnhancedResponse>;

package/build/typescript/server/request-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,YAAY,EAAC,MAAM,OAAO,CAAC;AAElD,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAEL,WAAW,EAEZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,OAAO,IAAI,cAAc,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAI7C,OAAO,KAAK,EACV,eAAe,EACf,cAAc,EACd,cAAc,EACf,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,mBAAmB,CAClC,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc;IAEzB,MAAM,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IAC3B,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,GAAG;QAC1C,QAAQ,CAAC,OAAO,CAAC,EACb,0BAA0B,GAC1B,CAAC,CACC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,KACb,0BAA0B,CAAC,CAAC;KACtC,CAAC;IACF,UAAU,CAAC,CACT,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG;QACvD,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;QAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;QACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC;KAC7C,GACA,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,sBAAsB,CACrC,QAAQ,GAAG,cAAc,EACzB,QAAQ,GAAG,cAAc;IAEzB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,wBAAgB,kBAAkB,CAChC,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc,EAEzB,MAAM,EACF,YAAY,CAAC,GAAG,CAAC,GACjB,CAAC,CACC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,KACb,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EACxD,EAAC,MAAM,EAAE,GAAG,OAAO,EAAC,GAAE,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAM,GAChE,cAAc,CAAC,OAAO,CAAC,CA4BzB;AAED,wBAAsB,mBAAmB,CACvC,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc,EAEzB,MAAM,EACF,YAAY,CAAC,GAAG,CAAC,GACjB,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAC1D,EACE,OAAO,EACP,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,GACX,EAAE,IAAI,CACL,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EACtC,QAAQ,GAAG,YAAY,GAAG,SAAS,CACpC,GAAG;IAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAC,+DAmCnE;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc,EAEzB,MAAM,EACF,YAAY,CAAC,GAAG,CAAC,GACjB,CAAC,MAAM,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAC1D,EACE,OAAO,EACP,OAAO,EACP,MAAM,EACN,OAAO,EACP,UAAU,GACX,EAAE,IAAI,CACL,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EACtC,QAAQ,GAAG,YAAY,GAAG,SAAS,CACpC,GAAG;IAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAC,+DAqDnE"}
+{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/quilt",
   "type": "module",
-  "version": "0.5.145",
+  "version": "0.5.147",
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonmade/quilt.git",
@@ -258,7 +258,7 @@
     "@quilted/assets": "^0.0.3",
     "@quilted/async": "^0.3.34",
     "@quilted/events": "^0.1.0",
-    "@quilted/graphql": "^1.0.0",
+    "@quilted/graphql": "^1.1.0",
     "@quilted/polyfills": "^0.2.12",
     "@quilted/react": "^18.2.0",
     "@quilted/react-assets": "^0.0.4",

package/source/global.ts

@@ -1,3 +1,25 @@
-import {installAsyncAssetsGlobal} from '@quilted/async';
+import {
+  createAsyncModulesGlobal,
+  type AsyncModulesGlobal,
+} from '@quilted/async';
 
-installAsyncAssetsGlobal();
+export interface QuiltGlobal {
+  readonly AsyncModules: AsyncModulesGlobal;
+}
+
+const property = Symbol.for('quilt');
+const quilt = ((globalThis as any)[property] ?? {}) as QuiltGlobal;
+
+(quilt as any).AsyncModules = createAsyncModulesGlobal({
+  cache: quilt.AsyncModules,
+});
+
+Object.defineProperty(globalThis, property, {
+  value: quilt,
+  enumerable: false,
+  configurable: true,
+  writable: true,
+});
+
+export default quilt;
+export {quilt, quilt as global};

package/source/server/request-router.tsx

@@ -15,6 +15,7 @@ import {
   renderHtmlToString,
   HtmlManager,
   Html,
+  type HtmlProps,
 } from '@quilted/react-html/server';
 import type {
   Options as ExtractOptions,
@@ -45,13 +46,22 @@ export interface ServerRenderOptions<
           context: Context,
         ) => ServerRenderRequestContext);
   };
-  renderHtml?(
+  html?:
+    | ServerRenderHtmlRender<Context>
+    | {
+        readonly rootElement?: HtmlProps['rootElement'];
+      };
+}
+
+export interface ServerRenderHtmlRender<Context> {
+  (
     content: string | undefined,
     details: Pick<ServerRenderAppDetails, 'http' | 'html'> & {
       readonly request: EnhancedRequest;
       readonly context: Context;
       readonly assets?: BrowserAssetsEntry;
       readonly preloadAssets?: BrowserAssetsEntry;
+      readonly rootElement?: HtmlProps['rootElement'];
     },
   ): ReactElement<any> | Promise<ReactElement<any>>;
 }
@@ -75,9 +85,57 @@ export function createServerRender<
     | ((
         request: EnhancedRequest,
         context: Context,
-      ) => ReactElement<any> | Promise<ReactElement<any>>),
-  {stream, ...options}: ServerRenderOptions<Context, CacheKey> = {},
+      ) =>
+        | ReactElement<any>
+        | undefined
+        | Promise<ReactElement<any> | undefined>),
+  options?: ServerRenderOptions<Context, CacheKey>,
+): RequestHandler<Context>;
+export function createServerRender<
+  Context = RequestContext,
+  CacheKey = AssetsCacheKey,
+>(options?: ServerRenderOptions<Context, CacheKey>): RequestHandler<Context>;
+export function createServerRender<
+  Context = RequestContext,
+  CacheKey = AssetsCacheKey,
+>(
+  ...args: [
+    (
+      | ReactElement<any>
+      | ((
+          request: EnhancedRequest,
+          context: Context,
+        ) =>
+          | ReactElement<any>
+          | undefined
+          | Promise<ReactElement<any> | undefined>)
+      | ServerRenderOptions<Context, CacheKey>
+      | undefined
+    ),
+    ServerRenderOptions<Context, CacheKey>?,
+  ]
 ): RequestHandler<Context> {
+  let getApp:
+    | ReactElement<any>
+    | ((
+        request: EnhancedRequest,
+        context: Context,
+      ) =>
+        | ReactElement<any>
+        | undefined
+        | Promise<ReactElement<any> | undefined>)
+    | undefined;
+  let options: ServerRenderOptions<Context, CacheKey>;
+
+  if (args.length > 1) {
+    getApp = args[0] as any;
+    options = (args[1] ?? {}) as any;
+  } else {
+    options = (args[0] ?? {}) as any;
+  }
+
+  const stream = options.stream;
+
   return async (request, requestContext) => {
     const accepts = request.headers.get('Accept');
 
@@ -89,7 +147,7 @@ export function createServerRender<
 
     return renderResponse(
       typeof getApp === 'function'
-        ? () => getApp(request, requestContext)
+        ? () => (getApp as any)(request, requestContext)
         : getApp,
       {
         ...options,
@@ -113,16 +171,20 @@ export async function renderAppToResponse<
 >(
   getApp:
     | ReactElement<any>
-    | (() => ReactElement<any> | Promise<ReactElement<any>>),
+    | (() =>
+        | ReactElement<any>
+        | undefined
+        | Promise<ReactElement<any> | undefined>)
+    | undefined,
   {
     request,
     context,
     assets,
     extract,
-    renderHtml,
+    html: htmlOptions,
   }: Pick<
     ServerRenderOptions<Context, CacheKey>,
-    'assets' | 'renderHtml' | 'extract'
+    'assets' | 'html' | 'extract'
   > & {readonly request: EnhancedRequest; readonly context: Context},
 ) {
   const app = typeof getApp === 'function' ? await getApp() : getApp;
@@ -150,7 +212,7 @@ export async function renderAppToResponse<
       request,
       context,
       assets,
-      renderHtml,
+      html: htmlOptions,
     },
   );
 
@@ -166,16 +228,20 @@ export async function renderAppToStreamedResponse<
 >(
   getApp:
     | ReactElement<any>
-    | (() => ReactElement<any> | Promise<ReactElement<any>>),
+    | (() =>
+        | ReactElement<any>
+        | undefined
+        | Promise<ReactElement<any> | undefined>)
+    | undefined,
   {
     request,
     context,
     assets,
     extract,
-    renderHtml,
+    html: htmlOptions,
   }: Pick<
     ServerRenderOptions<Context, CacheKey>,
-    'assets' | 'renderHtml' | 'extract'
+    'assets' | 'html' | 'extract'
   > & {readonly request: EnhancedRequest; readonly context: Context},
 ) {
   const headers = new Headers();
@@ -220,7 +286,7 @@ export async function renderAppToStreamedResponse<
         request,
         context,
         assets,
-        renderHtml,
+        html: htmlOptions,
       },
     );
 
@@ -235,7 +301,7 @@ async function serverRenderDetailsForApp<
   Context = RequestContext,
   CacheKey = AssetsCacheKey,
 >(
-  app: ReactElement<any>,
+  app: ReactElement<any> | undefined,
   {
     url,
     headers,
@@ -255,16 +321,18 @@ async function serverRenderDetailsForApp<
 
   const {decorate, ...rest} = extractOptions ?? {};
 
-  const rendered = await extract(app, {
-    decorate(app) {
-      return (
-        <ServerContext http={http} html={html} url={url} assets={assets}>
-          {decorate?.(app) ?? app}
-        </ServerContext>
-      );
-    },
-    ...rest,
-  });
+  const rendered = app
+    ? await extract(app, {
+        decorate(app) {
+          return (
+            <ServerContext http={http} html={html} url={url} assets={assets}>
+              {decorate?.(app) ?? app}
+            </ServerContext>
+          );
+        },
+        ...rest,
+      })
+    : undefined;
 
   return {rendered, http, html, assets};
 }
@@ -278,8 +346,8 @@ async function renderAppDetailsToHtmlString<
     request,
     context,
     assets,
-    renderHtml = defaultRenderHtml,
-  }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'renderHtml'> & {
+    html: htmlOptions,
+  }: Pick<ServerRenderOptions<Context, CacheKey>, 'assets' | 'html'> & {
     readonly request: EnhancedRequest;
     readonly context: Context;
     readonly cacheKey?: Partial<CacheKey>;
@@ -299,6 +367,16 @@ async function renderAppDetailsToHtmlString<
       ])
     : [];
 
+  let renderHtml: ServerRenderHtmlRender<Context>;
+  let rootElement: HtmlProps['rootElement'];
+
+  if (typeof htmlOptions === 'function') {
+    renderHtml = htmlOptions;
+  } else {
+    rootElement = htmlOptions?.rootElement;
+    renderHtml = defaultRenderHtml;
+  }
+
   const htmlElement = await renderHtml(rendered, {
     request,
     context,
@@ -306,18 +384,23 @@ async function renderAppDetailsToHtmlString<
     http,
     assets: entryAssets,
     preloadAssets,
+    rootElement,
   });
 
   return renderHtmlToString(htmlElement);
 }
 
-const defaultRenderHtml: NonNullable<ServerRenderOptions<any>['renderHtml']> =
-  function defaultRenderHtml(content, {request, html, assets, preloadAssets}) {
+const defaultRenderHtml: ServerRenderHtmlRender<any> =
+  function defaultRenderHtml(
+    content,
+    {request, html, assets, preloadAssets, rootElement},
+  ) {
     const baseUrl = new URL(request.url);
 
     return (
       <Html
         manager={html}
+        rootElement={rootElement}
         headEndContent={
           <>
             {assets &&