Skip to content

Commit

Permalink
fix: avoid mutating asset manifest, ensure assets only sent once
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey committed Mar 8, 2021
1 parent cb4b6c0 commit 79c08cd
Show file tree
Hide file tree
Showing 15 changed files with 498 additions and 669 deletions.
61 changes: 26 additions & 35 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 @@ -242,26 +242,39 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_

function renderAssets() {
const assets = this.___assets;
const nonce = this.global.cspNonce;
this.___renderAssets = this.___assets = undefined;
this.flush = this.___flush;
this.end = this.___end;

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

if (assets.js) {
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
assets.js.forEach(js => {
this.write(`<script src=${JSON.stringify(__webpack_require__.p + js)}${nonceAttr} async></script>`);
});
}
for (const curAssets of assets) {
if (curAssets.js) {
for (const href of curAssets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
}
}
}

if (assets.css) {
assets.css.forEach(css => {
this.write(`<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + css)}>`);
});
if (curAssets.css) {
for (const href of curAssets.css) {
if (!written.has(href)) {
written.add(href);
styles += `<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + href)}>`;
}
}
}
}

this.write(scripts + styles);
}
}

Expand Down Expand Up @@ -289,34 +302,12 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_wUwF", out.global.buildName);

if (curAssets) {
if (newAssets.js) {
if (curAssets.js) {
for (const js of newAssets.js) {
if (!curAssets.js.includes(js)) {
curAssets.js.push(js);
}
}
} else {
curAssets.js = newAssets.js;
}
}

if (newAssets.css) {
if (curAssets.css) {
for (const css of newAssets.css) {
if (!curAssets.css.includes(css)) {
curAssets.css.push(css);
}
}
} else {
curAssets.css = newAssets.css;
}
}
curAssets.push(newAssets);
} else {
out.___assets = [newAssets];
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}
Expand Down
61 changes: 26 additions & 35 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 @@ -144,26 +144,39 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.

function renderAssets() {
const assets = this.___assets;
const nonce = this.global.cspNonce;
this.___renderAssets = this.___assets = undefined;
this.flush = this.___flush;
this.end = this.___end;

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

if (assets.js) {
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
assets.js.forEach(js => {
this.write(`<script src=${JSON.stringify(__webpack_require__.p + js)}${nonceAttr} async></script>`);
});
}
for (const curAssets of assets) {
if (curAssets.js) {
for (const href of curAssets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
}
}
}

if (assets.css) {
assets.css.forEach(css => {
this.write(`<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + css)}>`);
});
if (curAssets.css) {
for (const href of curAssets.css) {
if (!written.has(href)) {
written.add(href);
styles += `<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + href)}>`;
}
}
}
}

this.write(scripts + styles);
}
}

Expand Down Expand Up @@ -191,34 +204,12 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_wUwF", out.global.buildName);

if (curAssets) {
if (newAssets.js) {
if (curAssets.js) {
for (const js of newAssets.js) {
if (!curAssets.js.includes(js)) {
curAssets.js.push(js);
}
}
} else {
curAssets.js = newAssets.js;
}
}

if (newAssets.css) {
if (curAssets.css) {
for (const css of newAssets.css) {
if (!curAssets.css.includes(css)) {
curAssets.css.push(css);
}
}
} else {
curAssets.css = newAssets.css;
}
}
curAssets.push(newAssets);
} else {
out.___assets = [newAssets];
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}
Expand Down
61 changes: 26 additions & 35 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 @@ -164,26 +164,39 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_

function renderAssets() {
const assets = this.___assets;
const nonce = this.global.cspNonce;
this.___renderAssets = this.___assets = undefined;
this.flush = this.___flush;
this.end = this.___end;

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

if (assets.js) {
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
assets.js.forEach(js => {
this.write(`<script src=${JSON.stringify(__webpack_require__.p + js)}${nonceAttr} async></script>`);
});
}
for (const curAssets of assets) {
if (curAssets.js) {
for (const href of curAssets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
}
}
}

if (assets.css) {
assets.css.forEach(css => {
this.write(`<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + css)}>`);
});
if (curAssets.css) {
for (const href of curAssets.css) {
if (!written.has(href)) {
written.add(href);
styles += `<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + href)}>`;
}
}
}
}

this.write(scripts + styles);
}
}

Expand Down Expand Up @@ -212,34 +225,12 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_8XgZ", out.global.buildName);

if (curAssets) {
if (newAssets.js) {
if (curAssets.js) {
for (const js of newAssets.js) {
if (!curAssets.js.includes(js)) {
curAssets.js.push(js);
}
}
} else {
curAssets.js = newAssets.js;
}
}

if (newAssets.css) {
if (curAssets.css) {
for (const css of newAssets.css) {
if (!curAssets.css.includes(css)) {
curAssets.css.push(css);
}
}
} else {
curAssets.css = newAssets.css;
}
}
curAssets.push(newAssets);
} else {
out.___assets = [newAssets];
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}
Expand Down
61 changes: 26 additions & 35 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 @@ -64,26 +64,39 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.

function renderAssets() {
const assets = this.___assets;
const nonce = this.global.cspNonce;
this.___renderAssets = this.___assets = undefined;
this.flush = this.___flush;
this.end = this.___end;

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

if (assets.js) {
const nonceAttr = nonce ? ` nonce=${JSON.stringify(nonce)}` : "";
assets.js.forEach(js => {
this.write(`<script src=${JSON.stringify(__webpack_require__.p + js)}${nonceAttr} async></script>`);
});
}
for (const curAssets of assets) {
if (curAssets.js) {
for (const href of curAssets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
}
}
}

if (assets.css) {
assets.css.forEach(css => {
this.write(`<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + css)}>`);
});
if (curAssets.css) {
for (const href of curAssets.css) {
if (!written.has(href)) {
written.add(href);
styles += `<link rel="stylesheet" href=${JSON.stringify(__webpack_require__.p + href)}>`;
}
}
}
}

this.write(scripts + styles);
}
}

Expand Down Expand Up @@ -112,34 +125,12 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_8XgZ", out.global.buildName);

if (curAssets) {
if (newAssets.js) {
if (curAssets.js) {
for (const js of newAssets.js) {
if (!curAssets.js.includes(js)) {
curAssets.js.push(js);
}
}
} else {
curAssets.js = newAssets.js;
}
}

if (newAssets.css) {
if (curAssets.css) {
for (const css of newAssets.css) {
if (!curAssets.css.includes(css)) {
curAssets.css.push(css);
}
}
} else {
curAssets.css = newAssets.css;
}
}
curAssets.push(newAssets);
} else {
out.___assets = [newAssets];
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}
Expand Down
Loading

0 comments on commit 79c08cd

Please sign in to comment.