@quilted/quilt 0.5.130 → 0.5.132

package/build/esnext/static/index.esnext

@@ -1,7 +1,8 @@
+import { styleAssetAttributes, scriptAssetAttributes, styleAssetPreloadAttributes, scriptAssetPreloadAttributes } from '@quilted/async/server';
 import { renderHtmlToString, Html } from '@quilted/react-html/server';
 import { StaticRenderer, StaticRendererContext } from '@quilted/react-router/static';
 import { renderApp } from './render.esnext';
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
 const BASE_URL = 'http://localhost:3000';
 async function renderStatic(App, {
@@ -173,30 +174,20 @@ async function renderStatic(App, {
     const usedAssets = asyncAssets.used({
       timing: 'load'
     });
-    const [moduleStyles, moduleScripts, modulePreload, nomoduleStyles, nomoduleScripts] = await Promise.all([assets.styles({
+    const [moduleAssets, modulePreload, nomoduleAssets] = await Promise.all([assets.assets({
       async: usedAssets,
-      options: {
-        modules: true
-      }
-    }), assets.scripts({
-      async: usedAssets,
-      options: {
+      context: {
         modules: true
       }
     }), assets.asyncAssets(asyncAssets.used({
       timing: 'preload'
     }), {
-      options: {
+      context: {
         modules: true
       }
-    }), assets.styles({
-      async: usedAssets,
-      options: {
-        modules: false
-      }
-    }), assets.scripts({
+    }), assets.assets({
       async: usedAssets,
-      options: {
+      context: {
         modules: false
       }
     })]);
@@ -204,22 +195,49 @@ async function renderStatic(App, {
     // We don’t want to load styles from both bundles, so we only use module styles,
     // since modules are intended to be the default and CSS (usually) doesn’t
     // have features that meaningfully break older user agents.
-    const styles = moduleStyles.length > 0 ? moduleStyles : nomoduleStyles;
-
-    // If there are nomodule scripts, we can’t really do preloading, because we can’t
-    // prevent the nomodule scripts from being preloaded in module browsers. If there
-    // are only module scripts, we can preload those.
-    const preload = nomoduleScripts.length > 0 ? [] : modulePreload;
-    const scripts = [...moduleScripts, ...nomoduleScripts.map(script => ({
-      ...script,
-      nomodule: true
-    }))];
+    const styles = moduleAssets.styles.length > 0 ? moduleAssets.styles : nomoduleAssets.styles;
     const minifiedHtml = renderHtmlToString( /*#__PURE__*/jsx(Html, {
-      url: url,
       manager: htmlManager,
-      styles: styles,
-      scripts: scripts,
-      preloadAssets: preload,
+      headEndContent: /*#__PURE__*/jsxs(Fragment, {
+        children: [[...styles].map(style => {
+          const attributes = styleAssetAttributes(style, {
+            baseUrl: url
+          });
+          return /*#__PURE__*/jsx("link", {
+            ...attributes
+          }, style.source);
+        }), [...moduleAssets.scripts].map(script => {
+          const attributes = scriptAssetAttributes(script, {
+            baseUrl: url
+          });
+          return /*#__PURE__*/jsx("script", {
+            ...attributes
+          }, script.source);
+        }), [...nomoduleAssets.scripts].map(script => {
+          const attributes = scriptAssetAttributes(script, {
+            baseUrl: url
+          });
+          return /*#__PURE__*/jsx("script", {
+            ...attributes,
+            // @ts-expect-error Rendering to HTML, so using the lowercase name
+            nomodule: moduleAssets.scripts.length > 0 ? true : undefined
+          }, script.source);
+        }), [...modulePreload.styles].map(style => {
+          const attributes = styleAssetPreloadAttributes(style, {
+            baseUrl: url
+          });
+          return /*#__PURE__*/jsx("link", {
+            ...attributes
+          }, style.source);
+        }), [...modulePreload.scripts].map(script => {
+          const attributes = scriptAssetPreloadAttributes(script, {
+            baseUrl: url
+          });
+          return /*#__PURE__*/jsx("link", {
+            ...attributes
+          }, script.source);
+        })]
+      }),
       children: markup
     }));
     const html = prettify ? await prettifyHtml(minifiedHtml) : minifiedHtml;