@quilted/quilt 0.5.65 → 0.5.68

package/build/typescript/polyfills/crypto.d.ts

@@ -0,0 +1,2 @@
+import '@quilted/polyfills/crypto';
+//# sourceMappingURL=crypto.d.ts.map

package/build/typescript/polyfills/crypto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../../../src/polyfills/crypto.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC"}

package/build/typescript/server/http-handler.d.ts

@@ -1,13 +1,15 @@
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactElement } from 'react';
 import type { AssetLoader } from '@quilted/async/server';
-import type { Request, HttpHandler, RequestHandler, HttpHandlerOptions } from '@quilted/http-handlers';
-export interface Options<Props = Record<string, never>> extends Pick<HttpHandlerOptions, 'before'> {
-    assets: AssetLoader<unknown>;
+import type { Options as ExtractOptions } from '@quilted/react-server-render/server';
+import type { Request, HttpHandler, RequestHandler } from '@quilted/http-handlers';
+export interface Options<Props = Record<string, never>> extends ExtractOptions {
+    assets?: AssetLoader<unknown>;
     handler?: HttpHandler;
     renderProps?(options: {
         request: Request;
     }): Props;
 }
-export declare function createServerRenderingRequestHandler<Props>(App: ComponentType<Props>, { assets, renderProps, }: Pick<Options<Props>, 'assets' | 'renderProps'>): RequestHandler;
-export declare function createServerRenderingHttpHandler<Props>(App: ComponentType<Props>, { assets, before, renderProps, handler, }: Options<Props>): HttpHandler;
+export declare function createServerRenderingHttpHandler<Props>(App: ComponentType<Props>, { handler, ...options }: Options<Props>): HttpHandler;
+export declare function createServerRenderingRequestHandler<Props>(App: ComponentType<Props>, { renderProps, ...options }?: Omit<Options<Props>, 'handler'>): RequestHandler;
+export declare function renderToResponse<Props>(element: ReactElement<Props>, request: Request, { assets, ...options }?: Omit<Options<Props>, 'handler' | 'renderProps'>): Promise<import("@quilted/http-handlers").Response | undefined>;
 //# sourceMappingURL=http-handler.d.ts.map

package/build/typescript/server/http-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../../../src/server/http-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAEzC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAIvD,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,cAAc,EACd,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CACpD,SAAQ,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IAC1C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC,GAAG,KAAK,CAAC;CAClD;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EACvD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EACE,MAAM,EACN,WAA+B,GAChC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC,GAChD,cAAc,CAqDhB;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EACpD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EACE,MAAM,EACN,MAAM,EACN,WAAW,EACX,OAAqC,GACtC,EAAE,OAAO,CAAC,KAAK,CAAC,eAIlB"}
+{"version":3,"file":"http-handler.d.ts","sourceRoot":"","sources":["../../../src/server/http-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,qCAAqC,CAAC;AAGnF,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,cAAc,EACf,MAAM,wBAAwB,CAAC;AAIhC,MAAM,WAAW,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAE,SAAQ,cAAc;IAC5E,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,OAAO,CAAA;KAAC,GAAG,KAAK,CAAC;CAClD;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EACpD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,OAA6B,EAAE,GAAG,OAAO,EAAC,EAAE,OAAO,CAAC,KAAK,CAAC,eAI5D;AAED,wBAAgB,mCAAmC,CAAC,KAAK,EACvD,GAAG,EAAE,aAAa,CAAC,KAAK,CAAC,EACzB,EAAC,WAAW,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,CAAM,GAC9D,cAAc,CAQhB;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAC1C,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAC5B,OAAO,EAAE,OAAO,EAChB,EAAC,MAAM,EAAE,GAAG,OAAO,EAAC,GAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,aAAa,CAAM,kEAuD3E"}

package/build/typescript/server/index.d.ts

@@ -9,5 +9,5 @@ export type { HttpState } from '@quilted/react-http/server';
 export { createHttpHandler } from '@quilted/http-handlers';
 export { renderApp } from './render';
 export { ServerContext } from './ServerContext';
-export { createServerRenderingRequestHandler, createServerRenderingHttpHandler, } from './http-handler';
+export { createServerRenderingRequestHandler, createServerRenderingHttpHandler, renderToResponse, } from './http-handler';
 //# sourceMappingURL=index.d.ts.map

package/build/typescript/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,OAAO,GACR,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,YAAY,EACV,KAAK,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,IAAI,6BAA6B,GAClD,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,YAAY,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,mCAAmC,EACnC,gCAAgC,GACjC,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,OAAO,GACR,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,YAAY,EACV,KAAK,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,IAAI,6BAA6B,GAClD,MAAM,6BAA6B,CAAC;AACrC,YAAY,EAAC,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,YAAY,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,mCAAmC,EACnC,gCAAgC,EAChC,gBAAgB,GACjB,MAAM,gBAAgB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/quilt",
   "type": "module",
-  "version": "0.5.65",
+  "version": "0.5.68",
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonmade/quilt.git",
@@ -103,6 +103,12 @@
       "import": "./build/esm/polyfills/base.mjs",
       "require": "./build/cjs/polyfills/base.cjs"
     },
+    "./polyfills/crypto": {
+      "quilt:from-source": "./src/polyfills/crypto.ts",
+      "quilt:esnext": "./build/esnext/polyfills/crypto.esnext",
+      "import": "./build/esm/polyfills/crypto.mjs",
+      "require": "./build/cjs/polyfills/crypto.cjs"
+    },
     "./polyfills/fetch": {
       "quilt:from-source": "./src/polyfills/fetch.ts",
       "quilt:esnext": "./build/esnext/polyfills/fetch.esnext",
@@ -167,6 +173,9 @@
       "polyfills/fetch": [
         "./build/typescript/polyfills/fetch.d.ts"
       ],
+      "polyfills/crypto": [
+        "./build/typescript/polyfills/crypto.d.ts"
+      ],
       "polyfills/noop": [
         "./build/typescript/polyfills/noop.d.ts"
       ],

package/src/polyfills/crypto.ts

@@ -0,0 +1 @@
+import '@quilted/polyfills/crypto';

package/src/server/http-handler.tsx

@@ -1,95 +1,101 @@
-import type {ComponentType} from 'react';
+import type {ComponentType, ReactElement} from 'react';
 
 import type {AssetLoader} from '@quilted/async/server';
 import {render as renderToString, Html} from '@quilted/react-html/server';
+import type {Options as ExtractOptions} from '@quilted/react-server-render/server';
 
 import {createHttpHandler, html, redirect} from '@quilted/http-handlers';
 import type {
   Request,
   HttpHandler,
   RequestHandler,
-  HttpHandlerOptions,
 } from '@quilted/http-handlers';
 
 import {renderApp} from './render';
 
-export interface Options<Props = Record<string, never>>
-  extends Pick<HttpHandlerOptions, 'before'> {
-  assets: AssetLoader<unknown>;
+export interface Options<Props = Record<string, never>> extends ExtractOptions {
+  assets?: AssetLoader<unknown>;
   handler?: HttpHandler;
   renderProps?(options: {request: Request}): Props;
 }
 
+export function createServerRenderingHttpHandler<Props>(
+  App: ComponentType<Props>,
+  {handler = createHttpHandler(), ...options}: Options<Props>,
+) {
+  handler.get(createServerRenderingRequestHandler(App, options));
+  return handler;
+}
+
 export function createServerRenderingRequestHandler<Props>(
   App: ComponentType<Props>,
-  {
-    assets,
-    renderProps = () => ({} as any),
-  }: Pick<Options<Props>, 'assets' | 'renderProps'>,
+  {renderProps, ...options}: Omit<Options<Props>, 'handler'> = {},
 ): RequestHandler {
-  return async (request) => {
-    const accepts = request.headers.get('Accept');
+  return (request) => {
+    return renderToResponse(
+      <App {...(renderProps?.({request}) as any)} />,
+      request,
+      options,
+    );
+  };
+}
 
-    if (accepts != null && !accepts.includes('text/html')) return;
+export async function renderToResponse<Props>(
+  element: ReactElement<Props>,
+  request: Request,
+  {assets, ...options}: Omit<Options<Props>, 'handler' | 'renderProps'> = {},
+) {
+  const accepts = request.headers.get('Accept');
 
-    const {
-      html: htmlManager,
-      http,
-      markup,
-      asyncAssets,
-    } = await renderApp(<App {...renderProps?.({request})} />, {
-      url: request.url,
-      headers: request.headers,
-    });
+  if (accepts != null && !accepts.includes('text/html')) return;
 
-    const {headers, statusCode = 200, redirectUrl} = http.state;
+  const {
+    html: htmlManager,
+    http,
+    markup,
+    asyncAssets,
+  } = await renderApp(element, {
+    ...options,
+    url: request.url,
+    headers: request.headers,
+  });
 
-    if (redirectUrl) {
-      return redirect(redirectUrl, {
-        status: statusCode as 301,
-        headers,
-      });
-    }
+  const {headers, statusCode = 200, redirectUrl} = http.state;
 
-    const usedAssets = asyncAssets.used({timing: 'load'});
-    const assetOptions = {userAgent: request.headers.get('User-Agent')};
+  if (redirectUrl) {
+    return redirect(redirectUrl, {
+      status: statusCode as 301,
+      headers,
+    });
+  }
 
-    const [styles, scripts, preload] = await Promise.all([
-      assets.styles({async: usedAssets, options: assetOptions}),
-      assets.scripts({async: usedAssets, options: assetOptions}),
-      assets.asyncAssets(asyncAssets.used({timing: 'preload'}), {
-        options: assetOptions,
-      }),
-    ]);
+  const usedAssets = asyncAssets.used({timing: 'load'});
+  const assetOptions = {userAgent: request.headers.get('User-Agent')};
 
-    return html(
-      renderToString(
-        <Html
-          manager={htmlManager}
-          styles={styles}
-          scripts={scripts}
-          preloadAssets={preload}
-        >
-          {markup}
-        </Html>,
-      ),
-      {
-        headers,
-        status: statusCode,
-      },
-    );
-  };
-}
+  const [styles, scripts, preload] = assets
+    ? await Promise.all([
+        assets.styles({async: usedAssets, options: assetOptions}),
+        assets.scripts({async: usedAssets, options: assetOptions}),
+        assets.asyncAssets(asyncAssets.used({timing: 'preload'}), {
+          options: assetOptions,
+        }),
+      ])
+    : [];
 
-export function createServerRenderingHttpHandler<Props>(
-  App: ComponentType<Props>,
-  {
-    assets,
-    before,
-    renderProps,
-    handler = createHttpHandler({before}),
-  }: Options<Props>,
-) {
-  handler.get(createServerRenderingRequestHandler(App, {assets, renderProps}));
-  return handler;
+  return html(
+    renderToString(
+      <Html
+        manager={htmlManager}
+        styles={styles}
+        scripts={scripts}
+        preloadAssets={preload}
+      >
+        {markup}
+      </Html>,
+    ),
+    {
+      headers,
+      status: statusCode,
+    },
+  );
 }

package/src/server/index.ts

@@ -36,4 +36,5 @@ export {ServerContext} from './ServerContext';
 export {
   createServerRenderingRequestHandler,
   createServerRenderingHttpHandler,
+  renderToResponse,
 } from './http-handler';