fix: avoid renderBody-like call to dynamic tag migration by using an …

…alias
marko-js · Sep 11, 2023 · 0a87e7f · 0a87e7f
1 parent c8937c6
commit 0a87e7f
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 21 deletions.
diff --git a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js
@@ -309,7 +309,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js
@@ -212,7 +212,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js b/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js
@@ -222,7 +222,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js b/..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js
@@ -122,7 +122,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js b/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js
diff --git a/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js b/..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js
@@ -221,7 +221,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js
@@ -122,7 +122,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js
@@ -209,7 +209,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 
@@ -378,7 +379,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 
@@ -517,7 +519,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack5/server--main.js
@@ -129,7 +129,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 
@@ -305,7 +306,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 
@@ -449,7 +451,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack4/server--main.js b/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack4/server--main.js
@@ -262,7 +262,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack5/server--main.js b/...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack5/server--main.js
@@ -165,7 +165,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack4/server--main.js
@@ -260,7 +260,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/webpack5/server--main.js
@@ -163,7 +163,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/with-public-path/__snapshots__/webpack4/server--main.js
@@ -220,7 +220,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/with-public-path/__snapshots__/webpack5/server--main.js
@@ -121,7 +121,8 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
 
   marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default()), {
     "renderBody": out => {
-      out.global.___renderAssets && out.global.___renderAssets(out);
+      const outAlias = out;
+      outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
     }
   }, out, _component, "0");
 

diff --git a/src/loader/get-asset-code.ts b/src/loader/get-asset-code.ts
@@ -75,7 +75,8 @@ $ {
 }
 
 <__flush_here_and_after__>
-   $ out.global.___renderAssets && out.global.___renderAssets(out);
+   $ const outAlias = out; // prevent compat layer from turning this into a dynamic tag
+   $ outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
 </__flush_here_and_after__>
 <\${template} ...input/>
 <init-components/>