@quilted/quilt 0.5.145 → 0.5.147

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @quilted/quilt
 
+## 0.5.147
+
+### Patch Changes
+
+- [`93facb53`](https://github.com/lemonmade/quilt/commit/93facb530324894667817a6d2f78baea19a3b622) Thanks [@lemonmade](https://github.com/lemonmade)! - Allow omitting React element from server renderer
+
+## 0.5.146
+
+### Patch Changes
+
+- [#582](https://github.com/lemonmade/quilt/pull/582) [`6dca6fcf`](https://github.com/lemonmade/quilt/commit/6dca6fcf62fbed7600400b619e5509c7d7f7fb45) Thanks [@lemonmade](https://github.com/lemonmade)! - Allow async module global to be lazy initialized
+
+- Updated dependencies [[`e121e639`](https://github.com/lemonmade/quilt/commit/e121e639fb656ddf14e3e47de87d347f38edae7f)]:
+  - @quilted/graphql@1.1.0
+
 ## 0.5.145
 
 ### Patch Changes

package/build/cjs/global.cjs

@@ -1,5 +1,21 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var async = require('@quilted/async');
 
-async.installAsyncAssetsGlobal();
+const property = Symbol.for('quilt');
+const quilt = globalThis[property] ?? {};
+quilt.AsyncModules = async.createAsyncModulesGlobal({
+  cache: quilt.AsyncModules
+});
+Object.defineProperty(globalThis, property, {
+  value: quilt,
+  enumerable: false,
+  configurable: true,
+  writable: true
+});
+
+exports["default"] = quilt;
+exports.global = quilt;
+exports.quilt = quilt;

package/build/cjs/server/request-router.cjs

@@ -10,10 +10,16 @@ var requestRouter = require('@quilted/request-router');
 var ServerContext = require('./ServerContext.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 
-function createServerRender(getApp, {
-  stream,
-  ...options
-} = {}) {
+function createServerRender(...args) {
+  let getApp;
+  let options;
+  if (args.length > 1) {
+    getApp = args[0];
+    options = args[1] ?? {};
+  } else {
+    options = args[0] ?? {};
+  }
+  const stream = options.stream;
   return async (request, requestContext) => {
     const accepts = request.headers.get('Accept');
     if (accepts != null && !accepts.includes('text/html')) return;
@@ -34,7 +40,7 @@ async function renderAppToResponse(getApp, {
   context,
   assets,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const app = typeof getApp === 'function' ? await getApp() : getApp;
   const cacheKey = await assets?.cacheKey?.(request);
@@ -59,7 +65,7 @@ async function renderAppToResponse(getApp, {
     request,
     context,
     assets,
-    renderHtml
+    html: htmlOptions
   });
   return requestRouter.html(content, {
     headers,
@@ -71,7 +77,7 @@ async function renderAppToStreamedResponse(getApp, {
   context,
   assets: assets$1,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const headers = new Headers();
   const stream = new TransformStream();
@@ -104,7 +110,7 @@ async function renderAppToStreamedResponse(getApp, {
       request,
       context,
       assets: assets$1,
-      renderHtml
+      html: htmlOptions
     });
     const encoder = new TextEncoder();
     const writer = stream.writable.getWriter();
@@ -129,7 +135,7 @@ async function serverRenderDetailsForApp(app, {
     decorate,
     ...rest
   } = extractOptions ?? {};
-  const rendered = await server$3.extract(app, {
+  const rendered = app ? await server$3.extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsxRuntime.jsx(ServerContext.ServerContext, {
         http: http,
@@ -140,7 +146,7 @@ async function serverRenderDetailsForApp(app, {
       });
     },
     ...rest
-  });
+  }) : undefined;
   return {
     rendered,
     http,
@@ -152,7 +158,7 @@ async function renderAppDetailsToHtmlString(details, {
   request,
   context,
   assets,
-  renderHtml = defaultRenderHtml
+  html: htmlOptions
 }) {
   const {
     http,
@@ -172,13 +178,22 @@ async function renderAppDetailsToHtmlString(details, {
   }), {
     cacheKey
   })]) : [];
+  let renderHtml;
+  let rootElement;
+  if (typeof htmlOptions === 'function') {
+    renderHtml = htmlOptions;
+  } else {
+    rootElement = htmlOptions?.rootElement;
+    renderHtml = defaultRenderHtml;
+  }
   const htmlElement = await renderHtml(rendered, {
     request,
     context,
     html: htmlManager,
     http,
     assets: entryAssets,
-    preloadAssets
+    preloadAssets,
+    rootElement
   });
   return server.renderHtmlToString(htmlElement);
 }
@@ -186,11 +201,13 @@ const defaultRenderHtml = function defaultRenderHtml(content, {
   request,
   html,
   assets: assets$1,
-  preloadAssets
+  preloadAssets,
+  rootElement
 }) {
   const baseUrl = new URL(request.url);
   return /*#__PURE__*/jsxRuntime.jsx(server.Html, {
     manager: html,
+    rootElement: rootElement,
     headEndContent: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [assets$1 && assets$1.styles.map(style => {
         const attributes = assets.styleAssetAttributes(style, {

package/build/esm/global.mjs

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

package/build/esm/server/request-router.mjs

@@ -8,10 +8,16 @@ import { redirect, html } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.mjs';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
-function createServerRender(getApp, {
-  stream,
-  ...options
-} = {}) {
+function createServerRender(...args) {
+  let getApp;
+  let options;
+  if (args.length > 1) {
+    getApp = args[0];
+    options = args[1] ?? {};
+  } else {
+    options = args[0] ?? {};
+  }
+  const stream = options.stream;
   return async (request, requestContext) => {
     const accepts = request.headers.get('Accept');
     if (accepts != null && !accepts.includes('text/html')) return;
@@ -32,7 +38,7 @@ async function renderAppToResponse(getApp, {
   context,
   assets,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const app = typeof getApp === 'function' ? await getApp() : getApp;
   const cacheKey = await assets?.cacheKey?.(request);
@@ -57,7 +63,7 @@ async function renderAppToResponse(getApp, {
     request,
     context,
     assets,
-    renderHtml
+    html: htmlOptions
   });
   return html(content, {
     headers,
@@ -69,7 +75,7 @@ async function renderAppToStreamedResponse(getApp, {
   context,
   assets,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const headers = new Headers();
   const stream = new TransformStream();
@@ -102,7 +108,7 @@ async function renderAppToStreamedResponse(getApp, {
       request,
       context,
       assets,
-      renderHtml
+      html: htmlOptions
     });
     const encoder = new TextEncoder();
     const writer = stream.writable.getWriter();
@@ -127,7 +133,7 @@ async function serverRenderDetailsForApp(app, {
     decorate,
     ...rest
   } = extractOptions ?? {};
-  const rendered = await extract(app, {
+  const rendered = app ? await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(ServerContext, {
         http: http,
@@ -138,7 +144,7 @@ async function serverRenderDetailsForApp(app, {
       });
     },
     ...rest
-  });
+  }) : undefined;
   return {
     rendered,
     http,
@@ -150,7 +156,7 @@ async function renderAppDetailsToHtmlString(details, {
   request,
   context,
   assets,
-  renderHtml = defaultRenderHtml
+  html: htmlOptions
 }) {
   const {
     http,
@@ -170,13 +176,22 @@ async function renderAppDetailsToHtmlString(details, {
   }), {
     cacheKey
   })]) : [];
+  let renderHtml;
+  let rootElement;
+  if (typeof htmlOptions === 'function') {
+    renderHtml = htmlOptions;
+  } else {
+    rootElement = htmlOptions?.rootElement;
+    renderHtml = defaultRenderHtml;
+  }
   const htmlElement = await renderHtml(rendered, {
     request,
     context,
     html: htmlManager,
     http,
     assets: entryAssets,
-    preloadAssets
+    preloadAssets,
+    rootElement
   });
   return renderHtmlToString(htmlElement);
 }
@@ -184,11 +199,13 @@ const defaultRenderHtml = function defaultRenderHtml(content, {
   request,
   html,
   assets,
-  preloadAssets
+  preloadAssets,
+  rootElement
 }) {
   const baseUrl = new URL(request.url);
   return /*#__PURE__*/jsx(Html, {
     manager: html,
+    rootElement: rootElement,
     headEndContent: /*#__PURE__*/jsxs(Fragment, {
       children: [assets && assets.styles.map(style => {
         const attributes = styleAssetAttributes(style, {

package/build/esnext/global.esnext

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

package/build/esnext/server/request-router.esnext

@@ -8,10 +8,16 @@ import { redirect, html } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.esnext';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
-function createServerRender(getApp, {
-  stream,
-  ...options
-} = {}) {
+function createServerRender(...args) {
+  let getApp;
+  let options;
+  if (args.length > 1) {
+    getApp = args[0];
+    options = args[1] ?? {};
+  } else {
+    options = args[0] ?? {};
+  }
+  const stream = options.stream;
   return async (request, requestContext) => {
     const accepts = request.headers.get('Accept');
     if (accepts != null && !accepts.includes('text/html')) return;
@@ -32,7 +38,7 @@ async function renderAppToResponse(getApp, {
   context,
   assets,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const app = typeof getApp === 'function' ? await getApp() : getApp;
   const cacheKey = await assets?.cacheKey?.(request);
@@ -57,7 +63,7 @@ async function renderAppToResponse(getApp, {
     request,
     context,
     assets,
-    renderHtml
+    html: htmlOptions
   });
   return html(content, {
     headers,
@@ -69,7 +75,7 @@ async function renderAppToStreamedResponse(getApp, {
   context,
   assets,
   extract,
-  renderHtml
+  html: htmlOptions
 }) {
   const headers = new Headers();
   const stream = new TransformStream();
@@ -102,7 +108,7 @@ async function renderAppToStreamedResponse(getApp, {
       request,
       context,
       assets,
-      renderHtml
+      html: htmlOptions
     });
     const encoder = new TextEncoder();
     const writer = stream.writable.getWriter();
@@ -127,7 +133,7 @@ async function serverRenderDetailsForApp(app, {
     decorate,
     ...rest
   } = extractOptions ?? {};
-  const rendered = await extract(app, {
+  const rendered = app ? await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(ServerContext, {
         http: http,
@@ -138,7 +144,7 @@ async function serverRenderDetailsForApp(app, {
       });
     },
     ...rest
-  });
+  }) : undefined;
   return {
     rendered,
     http,
@@ -150,7 +156,7 @@ async function renderAppDetailsToHtmlString(details, {
   request,
   context,
   assets,
-  renderHtml = defaultRenderHtml
+  html: htmlOptions
 }) {
   const {
     http,
@@ -170,13 +176,22 @@ async function renderAppDetailsToHtmlString(details, {
   }), {
     cacheKey
   })]) : [];
+  let renderHtml;
+  let rootElement;
+  if (typeof htmlOptions === 'function') {
+    renderHtml = htmlOptions;
+  } else {
+    rootElement = htmlOptions?.rootElement;
+    renderHtml = defaultRenderHtml;
+  }
   const htmlElement = await renderHtml(rendered, {
     request,
     context,
     html: htmlManager,
     http,
     assets: entryAssets,
-    preloadAssets
+    preloadAssets,
+    rootElement
   });
   return renderHtmlToString(htmlElement);
 }
@@ -184,11 +199,13 @@ const defaultRenderHtml = function defaultRenderHtml(content, {
   request,
   html,
   assets,
-  preloadAssets
+  preloadAssets,
+  rootElement
 }) {
   const baseUrl = new URL(request.url);
   return /*#__PURE__*/jsx(Html, {
     manager: html,
+    rootElement: rootElement,
     headEndContent: /*#__PURE__*/jsxs(Fragment, {
       children: [assets && assets.styles.map(style => {
         const attributes = styleAssetAttributes(style, {