move hydration script to head, make main module async

solidjs · Dec 21, 2023 · 51a1db2 · 51a1db2
1 parent 820f570
commit 51a1db2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/start/server/StartServer.tsx b/packages/start/server/StartServer.tsx
@@ -49,13 +49,18 @@ export function StartServer(props: { document: Component<DocumentComponentProps>
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
-        scripts={
+        assets={
           <>
             <HydrationScript />
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
+        scripts={
+          <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
             <script
               type="module"
+              async
               src={
                 import.meta.env.MANIFEST["client"].inputs[
                   import.meta.env.MANIFEST["client"].handler

diff --git a/packages/start/server/spa/StartServer.tsx b/packages/start/server/spa/StartServer.tsx
@@ -10,11 +10,15 @@ export function StartServer(props) {
     <NoHydration>
       {docType as unknown as any}
       <props.document
-        assets={<>{context.assets.map(m => renderAsset(m))}</>}
+        assets={
+          <>
+            <script>$R = [];</script>
+            {context.assets.map(m => renderAsset(m))}
+          </>
+        }
         scripts={
           <>
             <script innerHTML={`window.manifest = ${JSON.stringify(context.manifest)}`} />
-            <script>$R = [];</script>
             <script
               type="module"
               src={