Skip to content

Commit

Permalink
fix: regression with asset writing code
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey committed Apr 17, 2021
1 parent fd09bb8 commit 7a4f049
Show file tree
Hide file tree
Showing 18 changed files with 172 additions and 172 deletions.
18 changes: 9 additions & 9 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 @@ -255,16 +255,16 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -290,7 +290,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -307,7 +307,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

Expand Down
18 changes: 9 additions & 9 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 @@ -157,16 +157,16 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -192,7 +192,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -209,7 +209,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

Expand Down
18 changes: 9 additions & 9 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 @@ -167,16 +167,16 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -202,7 +202,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -220,7 +220,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

Expand Down
18 changes: 9 additions & 9 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 @@ -67,16 +67,16 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -102,7 +102,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -120,7 +120,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

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.

18 changes: 9 additions & 9 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 @@ -167,16 +167,16 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -202,7 +202,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -219,7 +219,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

Expand Down
18 changes: 9 additions & 9 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 @@ -67,16 +67,16 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



function renderAssets() {
const entries = this.global.___entries;
this.global.___entries = undefined;
function renderAssets(out) {
const entries = this.___entries;
this.___entries = undefined;

if (entries) {
__webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.global.buildName;
const nonce = this.global.cspNonce;
__webpack_require__.p && out.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
const buildName = this.buildName;
const nonce = this.cspNonce;
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
const written = this.global.___writtenAssets || (this.global.___writtenAssets = new Set());
const written = this.___writtenAssets || (this.___writtenAssets = new Set());
let scripts = "";
let styles = "";

Expand All @@ -102,7 +102,7 @@ function renderAssets() {
}
}

this.write(scripts + styles);
out.write(scripts + styles);
}
}

Expand All @@ -119,7 +119,7 @@ _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.global.___renderAssets && out.global.___renderAssets(out);
}
}, out, _component, "0");

Expand Down
Loading

0 comments on commit 7a4f049

Please sign in to comment.