Skip to content

Commit

Permalink
fix: use out.global instead of this (renderBody to dynamicTag migrato…
Browse files Browse the repository at this point in the history 
…r messes up this)
  • Loading branch information
@mlrawlings
mlrawlings committed Sep 7, 2023
1 parent 8b845ad commit 383ba6a
Show file tree
Hide file tree
Showing 17 changed files with 116 additions and 97 deletions.
11 changes: 6 additions & 5 deletions src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
11 changes: 6 additions & 5 deletions src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
11 changes: 6 additions & 5 deletions ..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
11 changes: 6 additions & 5 deletions ..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";

Expand Down
2 changes: 1 addition & 1 deletion ..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=${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 = "";

Expand Down
11 changes: 6 additions & 5 deletions src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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__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 = "";

Expand Down
33 changes: 18 additions & 15 deletions src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,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 = "";

Expand Down Expand Up @@ -325,15 +326,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 = "";

Expand Down Expand Up @@ -463,15 +465,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 = "";

Expand Down
Loading

0 comments on commit 383ba6a

Please sign in to comment.