@quilted/quilt 0.5.137 → 0.5.138

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @quilted/quilt
 
+## 0.5.138
+
+### Patch Changes
+
+- [#532](https://github.com/lemonmade/quilt/pull/532) [`70b042d2`](https://github.com/lemonmade/quilt/commit/70b042d256579ab88e4ac65b2f869f143332de56) Thanks [@lemonmade](https://github.com/lemonmade)! - Move asset manifest code into asset packages
+
+- Updated dependencies [[`70b042d2`](https://github.com/lemonmade/quilt/commit/70b042d256579ab88e4ac65b2f869f143332de56)]:
+  - @quilted/assets@0.0.2
+  - @quilted/react-assets@0.0.2
+
 ## 0.5.137
 
 ### Patch Changes

package/build/cjs/index.cjs

@@ -82,9 +82,13 @@ Object.defineProperty(exports, 'sleep', {
   enumerable: true,
   get: function () { return events.sleep; }
 });
-Object.defineProperty(exports, 'useUpdateCacheKey', {
+Object.defineProperty(exports, 'useAssetsCacheKey', {
   enumerable: true,
-  get: function () { return reactAssets.useUpdateCacheKey; }
+  get: function () { return reactAssets.useAssetsCacheKey; }
+});
+Object.defineProperty(exports, 'useModuleAssets', {
+  enumerable: true,
+  get: function () { return reactAssets.useModuleAssets; }
 });
 Object.defineProperty(exports, 'createAsyncComponent', {
   enumerable: true,

package/build/cjs/server/ServerContext.cjs

@@ -1,10 +1,9 @@
 'use strict';
 
-var server$3 = require('@quilted/react-assets/server');
+var server$2 = require('@quilted/react-assets/server');
 var reactRouter = require('@quilted/react-router');
-var server$2 = require('@quilted/react-html/server');
-var server = require('@quilted/react-async/server');
-var server$1 = require('@quilted/react-http/server');
+var server$1 = require('@quilted/react-html/server');
+var server = require('@quilted/react-http/server');
 var react = require('../utilities/react.cjs');
 
 function ServerContext({
@@ -12,11 +11,10 @@ function ServerContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return react.maybeWrapContext(server$3.AssetsContext, assets, react.maybeWrapContext(server.AsyncAssetContext, asyncAssets, react.maybeWrapContext(server$1.HttpServerContext, http, react.maybeWrapContext(server$2.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children)))));
+  return react.maybeWrapContext(server$2.AssetsContext, assets, react.maybeWrapContext(server.HttpServerContext, http, react.maybeWrapContext(server$1.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children))));
 }
 
 exports.ServerContext = ServerContext;

package/build/cjs/server/index.cjs

@@ -4,7 +4,6 @@ var server = require('@quilted/react-html/server');
 var server$1 = require('@quilted/react-server-render/server');
 var assets = require('@quilted/assets');
 var server$2 = require('@quilted/react-assets/server');
-var server$3 = require('@quilted/react-async/server');
 var requestRouter = require('@quilted/react-localize/request-router');
 var requestRouter$1 = require('@quilted/request-router');
 var reactLocalize = require('@quilted/react-localize');
@@ -94,21 +93,13 @@ Object.defineProperty(exports, 'AssetsManager', {
   enumerable: true,
   get: function () { return server$2.AssetsManager; }
 });
-Object.defineProperty(exports, 'useUpdateCacheKey', {
+Object.defineProperty(exports, 'useAssetsCacheKey', {
   enumerable: true,
-  get: function () { return server$2.useUpdateCacheKey; }
+  get: function () { return server$2.useAssetsCacheKey; }
 });
-Object.defineProperty(exports, 'ASYNC_ASSETS_SERVER_ACTION_ID', {
+Object.defineProperty(exports, 'useModuleAssets', {
   enumerable: true,
-  get: function () { return server$3.SERVER_ACTION_ID; }
-});
-Object.defineProperty(exports, 'AsyncAssetContext', {
-  enumerable: true,
-  get: function () { return server$3.AsyncAssetContext; }
-});
-Object.defineProperty(exports, 'AsyncAssetManager', {
-  enumerable: true,
-  get: function () { return server$3.AsyncAssetManager; }
+  get: function () { return server$2.useModuleAssets; }
 });
 Object.defineProperty(exports, 'createRequestRouterLocalization', {
   enumerable: true,

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

@@ -2,11 +2,10 @@
 
 var react = require('react');
 var assets = require('@quilted/assets');
-var server$3 = require('@quilted/react-assets/server');
-var server$1 = require('@quilted/react-async/server');
-var server$2 = require('@quilted/react-http/server');
+var server$2 = require('@quilted/react-assets/server');
+var server$1 = require('@quilted/react-http/server');
 var server = require('@quilted/react-html/server');
-var server$4 = require('@quilted/react-server-render/server');
+var server$3 = require('@quilted/react-server-render/server');
 var requestRouter = require('@quilted/request-router');
 var ServerContext = require('./ServerContext.cjs');
 var jsxRuntime = require('react/jsx-runtime');
@@ -120,21 +119,19 @@ async function serverRenderDetailsForApp(app, {
   extract: extractOptions
 } = {}) {
   const html = new server.HtmlManager();
-  const asyncAssets = new server$1.AsyncAssetManager();
-  const http = new server$2.HttpManager({
+  const http = new server$1.HttpManager({
     headers
   });
-  const assets = new server$3.AssetsManager({
+  const assets = new server$2.AssetsManager({
     cacheKey
   });
   const {
     decorate,
     ...rest
   } = extractOptions ?? {};
-  const rendered = await server$4.extract(app, {
+  const rendered = await server$3.extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsxRuntime.jsx(ServerContext.ServerContext, {
-        asyncAssets: asyncAssets,
         http: http,
         html: html,
         url: url,
@@ -148,7 +145,6 @@ async function serverRenderDetailsForApp(app, {
     rendered,
     http,
     html,
-    asyncAssets,
     assets
   };
 }
@@ -161,18 +157,17 @@ async function renderAppDetailsToHtmlString(details, {
   const {
     http,
     rendered,
-    asyncAssets,
     html: htmlManager,
     assets: assetsManager
   } = details;
-  const usedModules = asyncAssets.used({
+  const cacheKey = assetsManager.cacheKey;
+  const usedModules = assetsManager.usedModules({
     timing: 'load'
   });
-  const cacheKey = assetsManager.cacheKey;
   const [entryAssets, preloadAssets] = assets ? await Promise.all([assets.entry({
     modules: usedModules,
     cacheKey
-  }), assets.modules(asyncAssets.used({
+  }), assets.modules(assetsManager.usedModules({
     timing: 'preload'
   }), {
     cacheKey

package/build/cjs/static/StaticContext.cjs

@@ -1,10 +1,9 @@
 'use strict';
 
-var server$3 = require('@quilted/react-assets/server');
+var server$2 = require('@quilted/react-assets/server');
 var reactRouter = require('@quilted/react-router');
-var server$2 = require('@quilted/react-html/server');
-var server = require('@quilted/react-async/server');
-var server$1 = require('@quilted/react-http/server');
+var server$1 = require('@quilted/react-html/server');
+var server = require('@quilted/react-http/server');
 var react = require('../utilities/react.cjs');
 
 function StaticContext({
@@ -12,11 +11,10 @@ function StaticContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return react.maybeWrapContext(server$3.AssetsContext, assets, react.maybeWrapContext(server.AsyncAssetContext, asyncAssets, react.maybeWrapContext(server$1.HttpServerContext, http, react.maybeWrapContext(server$2.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children)))));
+  return react.maybeWrapContext(server$2.AssetsContext, assets, react.maybeWrapContext(server.HttpServerContext, http, react.maybeWrapContext(server$1.HtmlContext, html, react.maybeWrapContext(reactRouter.InitialUrlContext, normalizedUrl, children))));
 }
 
 exports.StaticContext = StaticContext;

package/build/cjs/static/index.cjs

@@ -165,8 +165,7 @@ async function renderStatic(App, {
       http,
       html: htmlManager,
       assets: assetsManager,
-      markup,
-      asyncAssets
+      markup
     } = await render.renderApp( /*#__PURE__*/jsxRuntime.jsx(App, {}), {
       url,
       cacheKey: initialCacheKey,
@@ -179,11 +178,11 @@ async function renderStatic(App, {
     });
     const cacheKey = assetsManager.cacheKey;
     const [mainAssets, preloadAssets] = await Promise.all([assets$1.entry({
-      modules: asyncAssets.used({
+      modules: assetsManager.usedModules({
         timing: 'load'
       }),
       cacheKey
-    }), assets$1.modules(asyncAssets.used({
+    }), assets$1.modules(assetsManager.usedModules({
       timing: 'preload'
     }), {
       cacheKey

package/build/cjs/static/render.cjs

@@ -1,10 +1,9 @@
 'use strict';
 
-var server$4 = require('@quilted/react-server-render/server');
+var server$3 = require('@quilted/react-server-render/server');
 var server = require('@quilted/react-html/server');
-var server$2 = require('@quilted/react-http/server');
-var server$1 = require('@quilted/react-async/server');
-var server$3 = require('@quilted/react-assets/server');
+var server$1 = require('@quilted/react-http/server');
+var server$2 = require('@quilted/react-assets/server');
 var StaticContext = require('./StaticContext.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -16,20 +15,19 @@ async function renderApp(app, {
   ...rest
 } = {}) {
   const html = new server.HtmlManager();
-  const asyncAssets = new server$1.AsyncAssetManager();
-  const http = new server$2.HttpManager({
+  const http = new server$1.HttpManager({
     headers
   });
-  const assets = new server$3.AssetsManager({
+  const assets = new server$2.AssetsManager({
     cacheKey
   });
-  const markup = await server$4.extract(app, {
+  const markup = await server$3.extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsxRuntime.jsx(StaticContext.StaticContext, {
-        asyncAssets: asyncAssets,
         html: html,
         http: http,
         url: url,
+        assets: assets,
         children: decorate?.(app) ?? app
       });
     },
@@ -39,8 +37,7 @@ async function renderApp(app, {
     markup,
     http,
     html,
-    assets,
-    asyncAssets
+    assets
   };
 }
 

package/build/esm/index.mjs

@@ -1,7 +1,7 @@
 export { createBrowserAssetsEntryFromManifest, createBrowserAssetsFromManifests, scriptAssetAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, styleAssetPreloadAttributes } from '@quilted/assets';
 export { createAsyncModule } from '@quilted/async';
 export { AbortError, NestedAbortController, TimedAbortController, anyAbortSignal, createEmitter, on, once, raceAgainstAbortSignal, sleep } from '@quilted/events';
-export { useUpdateCacheKey } from '@quilted/react-assets';
+export { useAssetsCacheKey, useModuleAssets } from '@quilted/react-assets';
 export { createAsyncComponent, useAsyncModule, useAsyncModulePreload, usePreload } from '@quilted/react-async';
 export { GraphQLContext, createGraphQLHttpFetch, useGraphQLFetch } from '@quilted/react-graphql';
 export { useIdleCallback } from '@quilted/react-idle';

package/build/esm/server/ServerContext.mjs

@@ -1,7 +1,6 @@
 import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HtmlContext } from '@quilted/react-html/server';
-import { AsyncAssetContext } from '@quilted/react-async/server';
 import { HttpServerContext } from '@quilted/react-http/server';
 import { maybeWrapContext } from '../utilities/react.mjs';
 
@@ -10,11 +9,10 @@ function ServerContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(AsyncAssetContext, asyncAssets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children)))));
+  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children))));
 }
 
 export { ServerContext };

package/build/esm/server/index.mjs

@@ -1,8 +1,7 @@
 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, useUpdateCacheKey } from '@quilted/react-assets/server';
-export { SERVER_ACTION_ID as ASYNC_ASSETS_SERVER_ACTION_ID, AsyncAssetContext, AsyncAssetManager } from '@quilted/react-async/server';
+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';

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

@@ -1,7 +1,6 @@
 import { Fragment as Fragment$1 } from 'react';
 import { styleAssetPreloadAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, scriptAssetAttributes } from '@quilted/assets';
 import { AssetsManager } from '@quilted/react-assets/server';
-import { AsyncAssetManager } from '@quilted/react-async/server';
 import { HttpManager } from '@quilted/react-http/server';
 import { HtmlManager, renderHtmlToString, Html } from '@quilted/react-html/server';
 import { extract } from '@quilted/react-server-render/server';
@@ -118,7 +117,6 @@ async function serverRenderDetailsForApp(app, {
   extract: extractOptions
 } = {}) {
   const html = new HtmlManager();
-  const asyncAssets = new AsyncAssetManager();
   const http = new HttpManager({
     headers
   });
@@ -132,7 +130,6 @@ async function serverRenderDetailsForApp(app, {
   const rendered = await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(ServerContext, {
-        asyncAssets: asyncAssets,
         http: http,
         html: html,
         url: url,
@@ -146,7 +143,6 @@ async function serverRenderDetailsForApp(app, {
     rendered,
     http,
     html,
-    asyncAssets,
     assets
   };
 }
@@ -159,18 +155,17 @@ async function renderAppDetailsToHtmlString(details, {
   const {
     http,
     rendered,
-    asyncAssets,
     html: htmlManager,
     assets: assetsManager
   } = details;
-  const usedModules = asyncAssets.used({
+  const cacheKey = assetsManager.cacheKey;
+  const usedModules = assetsManager.usedModules({
     timing: 'load'
   });
-  const cacheKey = assetsManager.cacheKey;
   const [entryAssets, preloadAssets] = assets ? await Promise.all([assets.entry({
     modules: usedModules,
     cacheKey
-  }), assets.modules(asyncAssets.used({
+  }), assets.modules(assetsManager.usedModules({
     timing: 'preload'
   }), {
     cacheKey

package/build/esm/static/StaticContext.mjs

@@ -1,7 +1,6 @@
 import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HtmlContext } from '@quilted/react-html/server';
-import { AsyncAssetContext } from '@quilted/react-async/server';
 import { HttpServerContext } from '@quilted/react-http/server';
 import { maybeWrapContext } from '../utilities/react.mjs';
 
@@ -10,11 +9,10 @@ function StaticContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(AsyncAssetContext, asyncAssets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children)))));
+  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children))));
 }
 
 export { StaticContext };

package/build/esm/static/index.mjs

@@ -163,8 +163,7 @@ async function renderStatic(App, {
       http,
       html: htmlManager,
       assets: assetsManager,
-      markup,
-      asyncAssets
+      markup
     } = await renderApp( /*#__PURE__*/jsx(App, {}), {
       url,
       cacheKey: initialCacheKey,
@@ -177,11 +176,11 @@ async function renderStatic(App, {
     });
     const cacheKey = assetsManager.cacheKey;
     const [mainAssets, preloadAssets] = await Promise.all([assets.entry({
-      modules: asyncAssets.used({
+      modules: assetsManager.usedModules({
         timing: 'load'
       }),
       cacheKey
-    }), assets.modules(asyncAssets.used({
+    }), assets.modules(assetsManager.usedModules({
       timing: 'preload'
     }), {
       cacheKey

package/build/esm/static/render.mjs

@@ -1,7 +1,6 @@
 import { extract } from '@quilted/react-server-render/server';
 import { HtmlManager } from '@quilted/react-html/server';
 import { HttpManager } from '@quilted/react-http/server';
-import { AsyncAssetManager } from '@quilted/react-async/server';
 import { AssetsManager } from '@quilted/react-assets/server';
 import { StaticContext } from './StaticContext.mjs';
 import { jsx } from 'react/jsx-runtime';
@@ -14,7 +13,6 @@ async function renderApp(app, {
   ...rest
 } = {}) {
   const html = new HtmlManager();
-  const asyncAssets = new AsyncAssetManager();
   const http = new HttpManager({
     headers
   });
@@ -24,10 +22,10 @@ async function renderApp(app, {
   const markup = await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(StaticContext, {
-        asyncAssets: asyncAssets,
         html: html,
         http: http,
         url: url,
+        assets: assets,
         children: decorate?.(app) ?? app
       });
     },
@@ -37,8 +35,7 @@ async function renderApp(app, {
     markup,
     http,
     html,
-    assets,
-    asyncAssets
+    assets
   };
 }
 

package/build/esnext/index.esnext

@@ -1,7 +1,7 @@
 export { createBrowserAssetsEntryFromManifest, createBrowserAssetsFromManifests, scriptAssetAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, styleAssetPreloadAttributes } from '@quilted/assets';
 export { createAsyncModule } from '@quilted/async';
 export { AbortError, NestedAbortController, TimedAbortController, anyAbortSignal, createEmitter, on, once, raceAgainstAbortSignal, sleep } from '@quilted/events';
-export { useUpdateCacheKey } from '@quilted/react-assets';
+export { useAssetsCacheKey, useModuleAssets } from '@quilted/react-assets';
 export { createAsyncComponent, useAsyncModule, useAsyncModulePreload, usePreload } from '@quilted/react-async';
 export { GraphQLContext, createGraphQLHttpFetch, useGraphQLFetch } from '@quilted/react-graphql';
 export { useIdleCallback } from '@quilted/react-idle';

package/build/esnext/server/ServerContext.esnext

@@ -1,7 +1,6 @@
 import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HtmlContext } from '@quilted/react-html/server';
-import { AsyncAssetContext } from '@quilted/react-async/server';
 import { HttpServerContext } from '@quilted/react-http/server';
 import { maybeWrapContext } from '../utilities/react.esnext';
 
@@ -10,11 +9,10 @@ function ServerContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(AsyncAssetContext, asyncAssets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children)))));
+  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children))));
 }
 
 export { ServerContext };

package/build/esnext/server/index.esnext

@@ -1,8 +1,7 @@
 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, useUpdateCacheKey } from '@quilted/react-assets/server';
-export { SERVER_ACTION_ID as ASYNC_ASSETS_SERVER_ACTION_ID, AsyncAssetContext, AsyncAssetManager } from '@quilted/react-async/server';
+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';

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

@@ -1,7 +1,6 @@
 import { Fragment as Fragment$1 } from 'react';
 import { styleAssetPreloadAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, scriptAssetAttributes } from '@quilted/assets';
 import { AssetsManager } from '@quilted/react-assets/server';
-import { AsyncAssetManager } from '@quilted/react-async/server';
 import { HttpManager } from '@quilted/react-http/server';
 import { HtmlManager, renderHtmlToString, Html } from '@quilted/react-html/server';
 import { extract } from '@quilted/react-server-render/server';
@@ -118,7 +117,6 @@ async function serverRenderDetailsForApp(app, {
   extract: extractOptions
 } = {}) {
   const html = new HtmlManager();
-  const asyncAssets = new AsyncAssetManager();
   const http = new HttpManager({
     headers
   });
@@ -132,7 +130,6 @@ async function serverRenderDetailsForApp(app, {
   const rendered = await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(ServerContext, {
-        asyncAssets: asyncAssets,
         http: http,
         html: html,
         url: url,
@@ -146,7 +143,6 @@ async function serverRenderDetailsForApp(app, {
     rendered,
     http,
     html,
-    asyncAssets,
     assets
   };
 }
@@ -159,18 +155,17 @@ async function renderAppDetailsToHtmlString(details, {
   const {
     http,
     rendered,
-    asyncAssets,
     html: htmlManager,
     assets: assetsManager
   } = details;
-  const usedModules = asyncAssets.used({
+  const cacheKey = assetsManager.cacheKey;
+  const usedModules = assetsManager.usedModules({
     timing: 'load'
   });
-  const cacheKey = assetsManager.cacheKey;
   const [entryAssets, preloadAssets] = assets ? await Promise.all([assets.entry({
     modules: usedModules,
     cacheKey
-  }), assets.modules(asyncAssets.used({
+  }), assets.modules(assetsManager.usedModules({
     timing: 'preload'
   }), {
     cacheKey

package/build/esnext/static/StaticContext.esnext

@@ -1,7 +1,6 @@
 import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HtmlContext } from '@quilted/react-html/server';
-import { AsyncAssetContext } from '@quilted/react-async/server';
 import { HttpServerContext } from '@quilted/react-http/server';
 import { maybeWrapContext } from '../utilities/react.esnext';
 
@@ -10,11 +9,10 @@ function StaticContext({
   html,
   http,
   assets,
-  asyncAssets,
   children
 }) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
-  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(AsyncAssetContext, asyncAssets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children)))));
+  return maybeWrapContext(AssetsContext, assets, maybeWrapContext(HttpServerContext, http, maybeWrapContext(HtmlContext, html, maybeWrapContext(InitialUrlContext, normalizedUrl, children))));
 }
 
 export { StaticContext };

package/build/esnext/static/index.esnext

@@ -163,8 +163,7 @@ async function renderStatic(App, {
       http,
       html: htmlManager,
       assets: assetsManager,
-      markup,
-      asyncAssets
+      markup
     } = await renderApp( /*#__PURE__*/jsx(App, {}), {
       url,
       cacheKey: initialCacheKey,
@@ -177,11 +176,11 @@ async function renderStatic(App, {
     });
     const cacheKey = assetsManager.cacheKey;
     const [mainAssets, preloadAssets] = await Promise.all([assets.entry({
-      modules: asyncAssets.used({
+      modules: assetsManager.usedModules({
         timing: 'load'
       }),
       cacheKey
-    }), assets.modules(asyncAssets.used({
+    }), assets.modules(assetsManager.usedModules({
       timing: 'preload'
     }), {
       cacheKey

package/build/esnext/static/render.esnext

@@ -1,7 +1,6 @@
 import { extract } from '@quilted/react-server-render/server';
 import { HtmlManager } from '@quilted/react-html/server';
 import { HttpManager } from '@quilted/react-http/server';
-import { AsyncAssetManager } from '@quilted/react-async/server';
 import { AssetsManager } from '@quilted/react-assets/server';
 import { StaticContext } from './StaticContext.esnext';
 import { jsx } from 'react/jsx-runtime';
@@ -14,7 +13,6 @@ async function renderApp(app, {
   ...rest
 } = {}) {
   const html = new HtmlManager();
-  const asyncAssets = new AsyncAssetManager();
   const http = new HttpManager({
     headers
   });
@@ -24,10 +22,10 @@ async function renderApp(app, {
   const markup = await extract(app, {
     decorate(app) {
       return /*#__PURE__*/jsx(StaticContext, {
-        asyncAssets: asyncAssets,
         html: html,
         http: http,
         url: url,
+        assets: assets,
         children: decorate?.(app) ?? app
       });
     },
@@ -37,8 +35,7 @@ async function renderApp(app, {
     markup,
     http,
     html,
-    assets,
-    asyncAssets
+    assets
   };
 }