fix(Deploy): fix deploy for runtime languages with code in custom scr…

…ipt block (use single file)
live-codes · Mar 22, 2024 · 6caf303 · 6caf303
1 parent c13944e
commit 6caf303
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/livecodes/UI/deploy.ts b/src/livecodes/UI/deploy.ts
@@ -2,7 +2,10 @@ import type { createEventsManager } from '../events';
 import type { createModal } from '../modal';
 import type { createNotifications } from '../notifications';
 import type { Config, ContentConfig, Cache, User } from '../models';
-import type { getLanguageExtension as getLanguageExtensionFn } from '../languages';
+import type {
+  getLanguageCompiler as getLanguageCompilerFn,
+  getLanguageExtension as getLanguageExtensionFn,
+} from '../languages';
 import { deployScreen, resultTemplate } from '../html';
 import { autoCompleteUrl } from '../vendors';
 import { deploy, deployFile, deployedConfirmation } from '../deploy';
@@ -84,6 +87,7 @@ export const createDeployUI = async ({
     getConfig: () => Config;
     getContentConfig: (config: Config | ContentConfig) => ContentConfig;
     getLanguageExtension: typeof getLanguageExtensionFn;
+    getLanguageCompiler: typeof getLanguageCompilerFn;
     setProjectDeployRepo: (repo: string) => Promise<void>;
   };
 }) => {
@@ -109,7 +113,8 @@ export const createDeployUI = async ({
     newRepo: boolean,
   ) => {
     const forExport = true;
-    const singleFile = false;
+    const scriptType = deps.getLanguageCompiler(deps.getConfig().script.language)?.scriptType;
+    const singleFile = scriptType != null && scriptType !== 'module';
     newRepoNameError.innerHTML = '';
 
     const resultHtml = await deps.getResultPage({

diff --git a/src/livecodes/core.ts b/src/livecodes/core.ts
@@ -914,6 +914,10 @@ const getResultPage = async ({
     },
   };
 
+  if (scriptType != null && scriptType !== 'module') {
+    singleFile = true;
+  }
+
   const result = await createResultPage({
     code: compiledCode,
     config,
@@ -2764,6 +2768,7 @@ const handleDeploy = () => {
         getConfig,
         getContentConfig,
         getLanguageExtension,
+        getLanguageCompiler,
         setProjectDeployRepo,
       },
     });

diff --git a/src/livecodes/result/result-page.ts b/src/livecodes/result/result-page.ts
@@ -54,6 +54,9 @@ export const createResultPage = async ({
   // if export => clean, else => add utils
   if (forExport) {
     dom.querySelector('script')?.remove();
+    const utilsScript = dom.createElement('script');
+    utilsScript.innerHTML = 'window.livecodes = window.livecodes || {};';
+    dom.head.appendChild(utilsScript);
   } else {
     const utilsScript = dom.createElement('script');
     utilsScript.src = absoluteBaseUrl + '{{hash:result-utils.js}}';