@hyperframes/studio-server 0.8.120 → 0.8.122

package/dist/index.js

@@ -3276,8 +3276,8 @@ import { Readable } from "stream";
 import { join as join8, resolve as resolve4 } from "path";
 import { createHash } from "crypto";
 import {
+  AFTER_FONTS_SCRIPT_TYPE,
   addScenePartsManifest,
-  injectScriptsIntoHtml,
   insertBeforeCloseTag as insertBeforeCloseTag2,
   stripEmbeddedRuntimeScripts as stripEmbeddedRuntimeScripts2
 } from "@hyperframes/core/compiler";
@@ -3295,7 +3295,7 @@ import {
   rewriteCssAssetUrls,
   rewriteInlineStyleAssetUrls
 } from "@hyperframes/core";
-import { stripEmbeddedRuntimeScripts } from "@hyperframes/core/compiler";
+import { deferScriptsUntilFonts, stripEmbeddedRuntimeScripts } from "@hyperframes/core/compiler";
 import { isFullHtmlDocument } from "@hyperframes/core/compiler/html-document";
 import { gsapCdnDist } from "@hyperframes/core/gsap-cdn";
 function rewriteRelativePaths(root, compPath, projectDir) {
@@ -3430,6 +3430,11 @@ function buildSubCompositionHtml(projectDir, compPath, runtimeUrl, baseHref, raw
     rewrittenContent = contentDoc.body.innerHTML || rawComp;
   }
   rewrittenContent = stripEmbeddedRuntimeScripts(rewrittenContent);
+  const { document: scriptsDoc } = parseHTML3(
+    `<!DOCTYPE html><html><head></head><body>${rewrittenContent}</body></html>`
+  );
+  deferScriptsUntilFonts(scriptsDoc);
+  rewrittenContent = scriptsDoc.body.innerHTML;
   rewrittenContent = tagRootCompositionFile(rewrittenContent, compPath);
   const indexPath = join6(projectDir, "index.html");
   let headContent = "";
@@ -3658,7 +3663,8 @@ function injectMotionPathPluginIfNeeded(html) {
   const match = html.match(gsapScript);
   if (match) {
     const version = match[0].match(/gsap@([\d.]+)/)?.[1];
-    const pluginTag = `<script src="${motionPathPluginUrl(version)}"></script>`;
+    const gsapTagType = match[0].match(/\stype=("[^"]*"|'[^']*')/i)?.[0] ?? "";
+    const pluginTag = `<script${gsapTagType} src="${motionPathPluginUrl(version)}"></script>`;
     const end = html.indexOf(match[0]) + match[0].length;
     return html.slice(0, end) + "\n" + pluginTag + html.slice(end);
   }
@@ -3680,12 +3686,9 @@ function injectStudioMotionScript(html, projectDir, activeCompositionPath) {
     activeCompositionPath
   });
   if (!script) return html;
-  return injectScriptsIntoHtml(
-    injectStudioMotionDependencies(html, manifestContent),
-    [],
-    [script],
-    false
-  );
+  const withDependencies = injectStudioMotionDependencies(html, manifestContent);
+  const tag = `<script type="${AFTER_FONTS_SCRIPT_TYPE}">${script.replace(/<\/script/gi, "<\\/script")}</script>`;
+  return insertBeforeCloseTag2(withDependencies, "body", tag) ?? `${withDependencies}${tag}`;
 }
 var GSAP_FALLBACK_ATTR = "data-hf-gsap-fallback";
 var GSAP_CDN_FALLBACK_SCRIPT = `<script ${GSAP_FALLBACK_ATTR}>