From 383ba6a139a1212a7380da33b6633023200290a1 Mon Sep 17 00:00:00 2001 From: Michael Rawlings Date: Thu, 7 Sep 2023 11:50:56 -0400 Subject: [PATCH] fix: use out.global instead of this (renderBody to dynamicTag migrator messes up this) --- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- .../__snapshots__/webpack4/server--main.js | 2 +- .../__snapshots__/webpack5/server--main.js | 2 +- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- .../__snapshots__/webpack4/server--main.js | 33 ++++++++++--------- .../__snapshots__/webpack5/server--main.js | 33 ++++++++++--------- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- .../__snapshots__/webpack4/server--main.js | 11 ++++--- .../__snapshots__/webpack5/server--main.js | 11 ++++--- src/loader/get-asset-code.ts | 11 ++++--- 17 files changed, 116 insertions(+), 97 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 index 1ff7862..75dbc6d 100644 --- a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js +++ b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js @@ -257,15 +257,16 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_ const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin"; function renderAssets(out) { - const entries = this.___entries; - this.___entries = undefined; + const $global = out.global; + const entries = $global.___entries; + $global.___entries = undefined; if (entries) { __webpack_require__.p && out.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`); - const buildName = this.buildName; - const nonce = this.cspNonce; + const buildName = $global.buildName; + const nonce = $global.cspNonce; const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : ""; - const written = this.___writtenAssets || (this.___writtenAssets = new Set()); + const written = $global.___writtenAssets || ($global.___writtenAssets = new Set()); let scripts = ""; let styles = ""; diff --git a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js index 88eb768..bc270a3 100644 --- a/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js +++ b/src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js @@ -159,15 +159,16 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__. const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin"; function renderAssets(out) { - const entries = this.___entries; - this.___entries = undefined; + const $global = out.global; + const entries = $global.___entries; + $global.___entries = undefined; if (entries) { __webpack_require__.p && out.script(`$mwp__marko_webpack=${JSON.stringify(__webpack_require__.p)}`); - const buildName = this.buildName; - const nonce = this.cspNonce; + const buildName = $global.buildName; + const nonce = $global.cspNonce; const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : ""; - const written = this.___writtenAssets || (this.___writtenAssets = new Set()); + const written = $global.___writtenAssets || ($global.___writtenAssets = new Set()); let scripts = ""; let styles = ""; diff --git a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js index 1d285dd..7eb6c40 100644 --- a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js +++ b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js @@ -169,15 +169,16 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_ const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin"; function renderAssets(out) { - const entries = this.___entries; - this.___entries = undefined; + const $global = out.global; + const entries = $global.___entries; + $global.___entries = undefined; if (entries) { __webpack_require__.p && out.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`); - const buildName = this.buildName; - const nonce = this.cspNonce; + const buildName = $global.buildName; + const nonce = $global.cspNonce; const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : ""; - const written = this.___writtenAssets || (this.___writtenAssets = new Set()); + const written = $global.___writtenAssets || ($global.___writtenAssets = new Set()); let scripts = ""; let styles = ""; diff --git a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js index 998a4b7..713e09e 100644 --- a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js +++ b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js @@ -69,15 +69,16 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__. const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin"; function renderAssets(out) { - const entries = this.___entries; - this.___entries = undefined; + const $global = out.global; + const entries = $global.___entries; + $global.___entries = undefined; if (entries) { __webpack_require__.p && out.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`); - const buildName = this.buildName; - const nonce = this.cspNonce; + const buildName = $global.buildName; + const nonce = $global.cspNonce; const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : ""; - const written = this.___writtenAssets || (this.___writtenAssets = new Set()); + const written = $global.___writtenAssets || ($global.___writtenAssets = new Set()); let scripts = ""; let styles = ""; diff --git a/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js b/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js index fb30a65..1269385 100644 --- a/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js +++ b/src/__tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js @@ -1 +1 @@ -!function(e){var t={};function r(n){if(t[n])return t[n].exports;var s=t[n]={i:n,l:!1,exports:{}};return e[n].call(s.exports,s,s.exports,r),s.l=!0,s.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)r.d(n,s,function(t){return e[t]}.bind(null,s));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=6)}([function(e,t){e.exports=require("marko/dist/runtime/helpers/render-tag")},function(e,t){e.exports=require("marko/dist/runtime/html")},function(e,t){e.exports=require("marko/dist/runtime/components/renderer")},function(e,t){e.exports=require("marko/dist/core-tags/core/__flush_here_and_after__.js")},function(e,t){e.exports=require("marko/dist/core-tags/components/init-components-tag.js")},function(e,t){e.exports=require("marko/dist/core-tags/core/await/reorderer-renderer.js")},function(e,t,r){const n=r(7),s=r(8);n.createServer((e,t)=>{s.render({},t)}).listen(0)},function(e,t){e.exports=require("http")},function(e,t,r){"use strict";r.r(t);var n=r(1),s=r(2),o=r.n(s);const i=Object(n.t)();var c=i;i._=o()((function(e,t,r,n,s){t.w("

Hello World

")}),{t:"7Fk+kAfP",i:!0},{});var u={getAssets(e){return this.build[e]},build:{"test_7Fk-":{js:["test_7Fk-.js"]}}},f=r(3),a=r.n(f),l=r(0),_=r.n(l),d=r(4),p=r.n(d),b=r(5),g=r.n(b);const m=Object(n.t)();t.default=m;const h="file:"===new URL(r.p,"file:").protocol?"":" crossorigin";function y(e){const t=this.___entries;if(this.___entries=void 0,t){r.p&&e.script("$mwp="+JSON.stringify(r.p));const n=this.buildName,s=this.cspNonce,o=s?" nonce="+JSON.stringify(s):"",i=this.___writtenAssets||(this.___writtenAssets=new Set);let c="",f="";for(const e of t){const t=u.getAssets(e,n);if(t.js)for(const e of t.js)i.has(e)||(i.add(e),c+=`