fix: avoid using variable in template (#46)

marko-js · Mar 8, 2023 · 7808941 · 7808941
1 parent 4c0621d
commit 7808941
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.changeset/stale-years-stare.md b/.changeset/stale-years-stare.md
@@ -0,0 +1,5 @@
+---
+"@marko/vite": patch
+---
+
+Avoid using $global in internal templates.
diff --git a/src/components/vite.marko b/src/components/vite.marko
@@ -21,14 +21,13 @@ static function renderAssets(slot) {
 
   return html;
 }
-$ const $global = out.global;
-$ if (!$global.___viteRenderAssets) {
-  $global.___viteInjectAttrs = $global.cspNonce
-    ? ` nonce="${$global.cspNonce.replace(/"/g, "&#39;")}"`
+$ if (!out.global.___viteRenderAssets) {
+  out.global.___viteInjectAttrs = out.global.cspNonce
+    ? ` nonce="${out.global.cspNonce.replace(/"/g, "&#39;")}"`
     : "";
-  $global.___viteRenderAssets = renderAssets;
+  out.global.___viteRenderAssets = renderAssets;
 }
 
 <__flush_here_and_after__>
-  $!{$global.___viteRenderAssets(input.slot)}
+  $!{out.global.___viteRenderAssets(input.slot)}
 </__flush_here_and_after__>
diff --git a/src/server-entry-template.ts b/src/server-entry-template.ts
@@ -7,12 +7,11 @@ export default async (opts: {
   const fileNameStr = JSON.stringify(`./${path.basename(opts.fileName)}`);
   return `import template from ${fileNameStr};
 export * from ${fileNameStr};
-$ const $global = out.global;
 ${
   opts.runtimeId
-    ? `$ $global.runtimeId = ${JSON.stringify(opts.runtimeId)};\n`
+    ? `$ out.global.runtimeId = ${JSON.stringify(opts.runtimeId)};\n`
     : ""
-}$ ($global.___viteEntries || ($global.___viteEntries = [])).push(${
+}$ (out.global.___viteEntries || (out.global.___viteEntries = [])).push(${
     opts.entryData
   });
 <_vite slot="head-prepend"/>