Skip to content

Commit

Permalink
feat: multiple top level component assets now merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey committed Feb 12, 2021
1 parent a9589b4 commit bc8fc0d
Show file tree
Hide file tree
Showing 15 changed files with 672 additions and 119 deletions.
41 changes: 35 additions & 6 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 @@ -199,12 +199,41 @@ function outEndOverride(data, encoding, callback) {
const _marko_componentType = "wUwFs+xe",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_5___default()(function (input, out, _component, component, state) {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_wUwF", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_2___default()(_test_marko__WEBPACK_IMPORTED_MODULE_0__["default"], input, out, _component, "0");

Expand Down
41 changes: 35 additions & 6 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 @@ -187,12 +187,41 @@ function outEndOverride(data, encoding, callback) {
const _marko_componentType = "wUwFs+xe",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_6___default()(function (input, out, _component, component, state) {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_wUwF", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_3___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "0");

Expand Down
41 changes: 35 additions & 6 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 @@ -122,12 +122,41 @@ const _marko_componentType = "8XgZ/c27",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_5___default()(function (input, out, _component, component, state) {
out.global.runtimeId = "testruntime";
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_8XgZ", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_2___default()(_test_marko__WEBPACK_IMPORTED_MODULE_0__["default"], input, out, _component, "0");

Expand Down
41 changes: 35 additions & 6 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 @@ -108,12 +108,41 @@ const _marko_componentType = "8XgZ/c27",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_6___default()(function (input, out, _component, component, state) {
out.global.runtimeId = "testruntime";
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_8XgZ", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_3___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "0");

Expand Down
41 changes: 35 additions & 6 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 @@ -121,12 +121,41 @@ function outEndOverride(data, encoding, callback) {
const _marko_componentType = "r9oeuJMR",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_5___default()(function (input, out, _component, component, state) {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_r9oe", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__["default"].getAssets("test_r9oe", 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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_2___default()(_test_marko__WEBPACK_IMPORTED_MODULE_0__["default"], input, out, _component, "0");

Expand Down
41 changes: 35 additions & 6 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 @@ -107,12 +107,41 @@ function outEndOverride(data, encoding, callback) {
const _marko_componentType = "r9oeuJMR",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_6___default()(function (input, out, _component, component, state) {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_r9oe", out.global.buildName);
out.flush = outFlushOverride;
out.end = outEndOverride;
const curAssets = out.___assets;
const newAssets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets("test_r9oe", 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;
}
}
} else {
out.___flush = out.flush;
out.___end = out.end;
out.___renderAssets = renderAssets;
out.___assets = newAssets;
out.flush = outFlushOverride;
out.end = outEndOverride;
}

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_3___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "0");

Expand Down
Loading

0 comments on commit bc8fc0d

Please sign in to comment.