@quilted/quilt 0.5.120 → 0.5.121

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @quilted/quilt
 
+## 0.5.121
+
+### Patch Changes
+
+- [`98c6aa4b`](https://github.com/lemonmade/quilt/commit/98c6aa4b9b5f45cc947f25446e1f05e2145d64a7) Thanks [@lemonmade](https://github.com/lemonmade)! - Improve HTML customization
+
+- [#447](https://github.com/lemonmade/quilt/pull/447) [`6ad741b2`](https://github.com/lemonmade/quilt/commit/6ad741b241027c8d7612e206497935ad938ea6c9) Thanks [@lemonmade](https://github.com/lemonmade)! - Simplify app templates
+
 ## 0.5.120
 
 ### Patch Changes

package/build/cjs/App.cjs

@@ -0,0 +1,77 @@
+'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 routesContent = routing !== false && routes ? /*#__PURE__*/jsxRuntime.jsx(StaticRoutes, {
+    routes: routes
+  }) : null;
+  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, routesContent, children]
+  });
+  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
+    children: content
+  }) : content : 'navigate' in routing ? /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
+    router: routing,
+    children: content
+  }) : /*#__PURE__*/jsxRuntime.jsx(reactRouter.Routing, {
+    ...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;
+}
+function StaticRoutes({
+  routes
+}) {
+  return reactRouter.useRoutes(routes);
+}
+
+exports.QuiltApp = QuiltApp;

package/build/cjs/TestApp.cjs

@@ -0,0 +1,20 @@
+'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/index.cjs

@@ -12,7 +12,7 @@ var reactRouter = require('@quilted/react-router');
 var reactHttp = require('@quilted/react-http');
 var reactUtilities = require('@quilted/react-utilities');
 var reactSignals = require('@quilted/react-signals');
-var AppContext = require('./AppContext.cjs');
+var App = require('./App.cjs');
 
 
 
@@ -100,9 +100,9 @@ Object.defineProperty(exports, 'LocalizedLink', {
   enumerable: true,
   get: function () { return reactLocalize.LocalizedLink; }
 });
-Object.defineProperty(exports, 'LocalizedRouter', {
+Object.defineProperty(exports, 'LocalizedRouting', {
   enumerable: true,
-  get: function () { return reactLocalize.LocalizedRouter; }
+  get: function () { return reactLocalize.LocalizedRouting; }
 });
 Object.defineProperty(exports, 'createRouteLocalization', {
   enumerable: true,
@@ -160,17 +160,17 @@ Object.defineProperty(exports, 'NavigationBlock', {
   enumerable: true,
   get: function () { return reactRouter.NavigationBlock; }
 });
-Object.defineProperty(exports, 'Preloader', {
-  enumerable: true,
-  get: function () { return reactRouter.Preloader; }
-});
 Object.defineProperty(exports, 'Redirect', {
   enumerable: true,
   get: function () { return reactRouter.Redirect; }
 });
-Object.defineProperty(exports, 'Router', {
+Object.defineProperty(exports, 'RoutePreloading', {
+  enumerable: true,
+  get: function () { return reactRouter.RoutePreloading; }
+});
+Object.defineProperty(exports, 'Routing', {
   enumerable: true,
-  get: function () { return reactRouter.Router; }
+  get: function () { return reactRouter.Routing; }
 });
 Object.defineProperty(exports, 'useCurrentUrl', {
   enumerable: true,
@@ -276,4 +276,4 @@ Object.defineProperty(exports, 'useSignalEffect', {
   enumerable: true,
   get: function () { return reactSignals.useSignalEffect; }
 });
-exports.AppContext = AppContext.AppContext;
+exports.QuiltApp = App.QuiltApp;

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

@@ -26,6 +26,7 @@ function createServerRenderingRequestHandler(render, {
 }
 async function renderToResponse(app, request, {
   assets,
+  renderHtml = defaultRenderHtml,
   ...options
 } = {}) {
   const accepts = request.headers.get('Accept');
@@ -67,17 +68,32 @@ async function renderToResponse(app, request, {
     timing: 'preload'
   }), {
     options: assetOptions
-  })]) : [];
-  return requestRouter.html(server.render( /*#__PURE__*/jsxRuntime.jsx(server.Html, {
+  })]) : [[], [], []];
+  const htmlElement = await renderHtml(markup, request, {
+    html: htmlManager,
+    http,
+    styles,
+    scripts,
+    preload
+  });
+  return requestRouter.html(server.render(htmlElement), {
+    headers,
+    status: statusCode
+  });
+}
+function defaultRenderHtml(content, request, {
+  html,
+  styles,
+  scripts,
+  preload
+}) {
+  return /*#__PURE__*/jsxRuntime.jsx(server.Html, {
     url: new URL(request.url),
-    manager: htmlManager,
+    manager: html,
     styles: styles,
     scripts: scripts,
     preloadAssets: preload,
-    children: markup
-  })), {
-    headers,
-    status: statusCode
+    children: content
   });
 }
 

package/build/cjs/testing.cjs

@@ -4,6 +4,7 @@ var testing$2 = require('@quilted/testing');
 var reactTesting = require('@quilted/react-testing');
 var testing = require('@quilted/react-router/testing');
 var testing$1 = require('@quilted/react-graphql/testing');
+var TestApp = require('./TestApp.cjs');
 
 
 
@@ -23,9 +24,9 @@ Object.defineProperty(exports, 'unmountAll', {
   enumerable: true,
   get: function () { return reactTesting.unmountAll; }
 });
-Object.defineProperty(exports, 'TestRouter', {
+Object.defineProperty(exports, 'TestRouting', {
   enumerable: true,
-  get: function () { return testing.TestRouter; }
+  get: function () { return testing.TestRouting; }
 });
 Object.defineProperty(exports, 'createTestRouter', {
   enumerable: true,
@@ -51,6 +52,7 @@ Object.defineProperty(exports, 'createSchema', {
   enumerable: true,
   get: function () { return testing$1.createSchema; }
 });
+exports.QuiltAppTesting = TestApp.QuiltAppTesting;
 Object.keys(testing$2).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
     enumerable: true,

package/build/esm/App.mjs

@@ -0,0 +1,75 @@
+import { HttpContext, CookieContext } from '@quilted/react-http';
+import { useHtmlUpdater } from '@quilted/react-html';
+import { Routing, useRoutes } 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 routesContent = routing !== false && routes ? /*#__PURE__*/jsx(StaticRoutes, {
+    routes: routes
+  }) : null;
+  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, routesContent, children]
+  });
+  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsx(Routing, {
+    children: content
+  }) : content : 'navigate' in routing ? /*#__PURE__*/jsx(Routing, {
+    router: routing,
+    children: content
+  }) : /*#__PURE__*/jsx(Routing, {
+    ...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;
+}
+function StaticRoutes({
+  routes
+}) {
+  return useRoutes(routes);
+}
+
+export { QuiltApp };

package/build/esm/TestApp.mjs

@@ -0,0 +1,18 @@
+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/index.mjs

@@ -4,10 +4,10 @@ export { createAsyncComponent, useAsync, useAsyncAsset, usePreload } from '@quil
 export { GraphQLContext, createGraphQLHttpFetch, useGraphQLFetch } from '@quilted/react-graphql';
 export { useIdleCallback } from '@quilted/react-idle';
 export { ServerAction, useServerAction, useServerContext } from '@quilted/react-server-render';
-export { Localization, LocalizedLink, LocalizedRouter, createRouteLocalization, createRoutePathLocalization, createRouteSubdomainLocalization, useLocale, useLocaleFromEnvironment, useLocalizedFormatting, useRouteLocalization } from '@quilted/react-localize';
+export { Localization, LocalizedLink, LocalizedRouting, createRouteLocalization, createRoutePathLocalization, createRouteSubdomainLocalization, useLocale, useLocaleFromEnvironment, useLocalizedFormatting, useRouteLocalization } from '@quilted/react-localize';
 export { PerformanceContext, createPerformance, usePerformance, usePerformanceNavigation, usePerformanceNavigationEvent } from '@quilted/react-performance';
-export { Link, NavigationBlock, Preloader, Redirect, Router, useCurrentUrl, useInitialUrl, useMatch, useNavigate, useNavigationBlock, useRedirect, useRouteChangeFocusRef, useRouter, useRoutes, useScrollRestoration } from '@quilted/react-router';
+export { Link, NavigationBlock, Redirect, RoutePreloading, Routing, useCurrentUrl, useInitialUrl, useMatch, useNavigate, useNavigationBlock, useRedirect, useRouteChangeFocusRef, useRouter, useRoutes, useScrollRestoration } from '@quilted/react-router';
 export { CookieContext, useCookie, useCookies } from '@quilted/react-http';
 export { createOptionalContext, createUseContextHook, createUseOptionalValueHook } from '@quilted/react-utilities';
 export { Signal, computed as computedSignal, isSignal, resolveSignalOrValue, signal, batch as signalBatch, effect as signalEffect, useComputed, useSignal, useSignalEffect } from '@quilted/react-signals';
-export { AppContext } from './AppContext.mjs';
+export { QuiltApp } from './App.mjs';

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

@@ -24,6 +24,7 @@ function createServerRenderingRequestHandler(render, {
 }
 async function renderToResponse(app, request, {
   assets,
+  renderHtml = defaultRenderHtml,
   ...options
 } = {}) {
   const accepts = request.headers.get('Accept');
@@ -65,17 +66,32 @@ async function renderToResponse(app, request, {
     timing: 'preload'
   }), {
     options: assetOptions
-  })]) : [];
-  return html(render( /*#__PURE__*/jsx(Html, {
+  })]) : [[], [], []];
+  const htmlElement = await renderHtml(markup, request, {
+    html: htmlManager,
+    http,
+    styles,
+    scripts,
+    preload
+  });
+  return html(render(htmlElement), {
+    headers,
+    status: statusCode
+  });
+}
+function defaultRenderHtml(content, request, {
+  html,
+  styles,
+  scripts,
+  preload
+}) {
+  return /*#__PURE__*/jsx(Html, {
     url: new URL(request.url),
-    manager: htmlManager,
+    manager: html,
     styles: styles,
     scripts: scripts,
     preloadAssets: preload,
-    children: markup
-  })), {
-    headers,
-    status: statusCode
+    children: content
   });
 }
 

package/build/esm/testing.mjs

@@ -1,4 +1,5 @@
 export * from '@quilted/testing';
 export { createMount, mount, mounted, unmountAll } from '@quilted/react-testing';
-export { TestRouter, createTestRouter } from '@quilted/react-router/testing';
+export { TestRouting, createTestRouter } from '@quilted/react-router/testing';
 export { GraphQLController, TestGraphQL, createFiller, createGraphQLController, createSchema } from '@quilted/react-graphql/testing';
+export { QuiltAppTesting } from './TestApp.mjs';

package/build/esnext/App.esnext

@@ -0,0 +1,75 @@
+import { HttpContext, CookieContext } from '@quilted/react-http';
+import { useHtmlUpdater } from '@quilted/react-html';
+import { Routing, useRoutes } 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 routesContent = routing !== false && routes ? /*#__PURE__*/jsx(StaticRoutes, {
+    routes: routes
+  }) : null;
+  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, routesContent, children]
+  });
+  const withMaybeRouting = typeof routing === 'boolean' ? routing ? /*#__PURE__*/jsx(Routing, {
+    children: content
+  }) : content : 'navigate' in routing ? /*#__PURE__*/jsx(Routing, {
+    router: routing,
+    children: content
+  }) : /*#__PURE__*/jsx(Routing, {
+    ...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;
+}
+function StaticRoutes({
+  routes
+}) {
+  return useRoutes(routes);
+}
+
+export { QuiltApp };

package/build/esnext/TestApp.esnext

@@ -0,0 +1,18 @@
+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/index.esnext

@@ -4,10 +4,10 @@ export { createAsyncComponent, useAsync, useAsyncAsset, usePreload } from '@quil
 export { GraphQLContext, createGraphQLHttpFetch, useGraphQLFetch } from '@quilted/react-graphql';
 export { useIdleCallback } from '@quilted/react-idle';
 export { ServerAction, useServerAction, useServerContext } from '@quilted/react-server-render';
-export { Localization, LocalizedLink, LocalizedRouter, createRouteLocalization, createRoutePathLocalization, createRouteSubdomainLocalization, useLocale, useLocaleFromEnvironment, useLocalizedFormatting, useRouteLocalization } from '@quilted/react-localize';
+export { Localization, LocalizedLink, LocalizedRouting, createRouteLocalization, createRoutePathLocalization, createRouteSubdomainLocalization, useLocale, useLocaleFromEnvironment, useLocalizedFormatting, useRouteLocalization } from '@quilted/react-localize';
 export { PerformanceContext, createPerformance, usePerformance, usePerformanceNavigation, usePerformanceNavigationEvent } from '@quilted/react-performance';
-export { Link, NavigationBlock, Preloader, Redirect, Router, useCurrentUrl, useInitialUrl, useMatch, useNavigate, useNavigationBlock, useRedirect, useRouteChangeFocusRef, useRouter, useRoutes, useScrollRestoration } from '@quilted/react-router';
+export { Link, NavigationBlock, Redirect, RoutePreloading, Routing, useCurrentUrl, useInitialUrl, useMatch, useNavigate, useNavigationBlock, useRedirect, useRouteChangeFocusRef, useRouter, useRoutes, useScrollRestoration } from '@quilted/react-router';
 export { CookieContext, useCookie, useCookies } from '@quilted/react-http';
 export { createOptionalContext, createUseContextHook, createUseOptionalValueHook } from '@quilted/react-utilities';
 export { Signal, computed as computedSignal, isSignal, resolveSignalOrValue, signal, batch as signalBatch, effect as signalEffect, useComputed, useSignal, useSignalEffect } from '@quilted/react-signals';
-export { AppContext } from './AppContext.esnext';
+export { QuiltApp } from './App.esnext';

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

@@ -24,6 +24,7 @@ function createServerRenderingRequestHandler(render, {
 }
 async function renderToResponse(app, request, {
   assets,
+  renderHtml = defaultRenderHtml,
   ...options
 } = {}) {
   const accepts = request.headers.get('Accept');
@@ -65,17 +66,32 @@ async function renderToResponse(app, request, {
     timing: 'preload'
   }), {
     options: assetOptions
-  })]) : [];
-  return html(render( /*#__PURE__*/jsx(Html, {
+  })]) : [[], [], []];
+  const htmlElement = await renderHtml(markup, request, {
+    html: htmlManager,
+    http,
+    styles,
+    scripts,
+    preload
+  });
+  return html(render(htmlElement), {
+    headers,
+    status: statusCode
+  });
+}
+function defaultRenderHtml(content, request, {
+  html,
+  styles,
+  scripts,
+  preload
+}) {
+  return /*#__PURE__*/jsx(Html, {
     url: new URL(request.url),
-    manager: htmlManager,
+    manager: html,
     styles: styles,
     scripts: scripts,
     preloadAssets: preload,
-    children: markup
-  })), {
-    headers,
-    status: statusCode
+    children: content
   });
 }
 

package/build/esnext/testing.esnext

@@ -1,4 +1,5 @@
 export * from '@quilted/testing';
 export { createMount, mount, mounted, unmountAll } from '@quilted/react-testing';
-export { TestRouter, createTestRouter } from '@quilted/react-router/testing';
+export { TestRouting, createTestRouter } from '@quilted/react-router/testing';
 export { GraphQLController, TestGraphQL, createFiller, createGraphQLController, createSchema } from '@quilted/react-graphql/testing';
+export { QuiltAppTesting } from './TestApp.esnext';