Skip to content

Commit

Permalink
fix: include component-globals and await-reorderer tags inn ssr code (#…
Browse files Browse the repository at this point in the history 
…37)
  • Loading branch information
@DylanPiercey
DylanPiercey authored Mar 19, 2020
1 parent 90db689 commit 63f0ce5
Show file tree
Hide file tree
Showing 7 changed files with 211 additions and 21 deletions.
36 changes: 33 additions & 3 deletions src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */
template = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/test.marko"),
module_manifest = __webpack_require__(/*! ./../../../../__MARKO_WEBPACK__MANIFEST.js */ "./__MARKO_WEBPACK__MANIFEST.js"),
manifest = module_manifest.default || module_manifest,
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
marko_loadTag = __webpack_require__(/*! marko/dist/runtime/helpers/load-tag */ "marko/dist/runtime/helpers/load-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag"));
component_globals_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/component-globals-tag */ "marko/dist/core-tags/components/component-globals-tag")),
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag")),
await_reorderer_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer */ "marko/dist/core-tags/core/await/reorderer-renderer"));

function renderAssets() {
const assets = this.___assets;
Expand Down Expand Up @@ -144,11 +146,15 @@ function render(input, out, __component, component, state) {

out.end = outEndOverride;

component_globals_tag({}, out);

marko_dynamicTag(out, template, function() {
return input;
}, null, null, null, __component, "0");

init_components_tag({}, out);

await_reorderer_tag({}, out, __component, "1");
}

marko_template._ = marko_renderer(render, {
Expand All @@ -160,7 +166,9 @@ marko_template.meta = {
id: "/@marko/webpack-tests$x.x.x/fixtures/basic-template-plugin-custom-runtime-id/test.marko",
tags: [
"./test.marko",
"marko/dist/core-tags/components/init-components-tag"
"marko/dist/core-tags/components/component-globals-tag",
"marko/dist/core-tags/components/init-components-tag",
"marko/dist/core-tags/core/await/reorderer-renderer"
]
};

Expand All @@ -179,6 +187,17 @@ module.exports = http;

/***/ }),

/***/ "marko/dist/core-tags/components/component-globals-tag":
/*!************************************************************************!*\
!*** external "marko/dist/core-tags/components/component-globals-tag" ***!
\************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/components/component-globals-tag;

/***/ }),

/***/ "marko/dist/core-tags/components/init-components-tag":
/*!**********************************************************************!*\
!*** external "marko/dist/core-tags/components/init-components-tag" ***!
Expand All @@ -190,6 +209,17 @@ module.exports = marko/dist/core-tags/components/init-components-tag;

/***/ }),

/***/ "marko/dist/core-tags/core/await/reorderer-renderer":
/*!*********************************************************************!*\
!*** external "marko/dist/core-tags/core/await/reorderer-renderer" ***!
\*********************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/core/await/reorderer-renderer;
/***/ }),

/***/ "marko/dist/html":
/*!**********************************!*\
!*** external "marko/dist/html" ***!
Expand Down
36 changes: 33 additions & 3 deletions src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */
template = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/basic-template-plugin/test.marko"),
module_manifest = __webpack_require__(/*! ./../../../../__MARKO_WEBPACK__MANIFEST.js */ "./__MARKO_WEBPACK__MANIFEST.js"),
manifest = module_manifest.default || module_manifest,
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
marko_loadTag = __webpack_require__(/*! marko/dist/runtime/helpers/load-tag */ "marko/dist/runtime/helpers/load-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag"));
component_globals_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/component-globals-tag */ "marko/dist/core-tags/components/component-globals-tag")),
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag")),
await_reorderer_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer */ "marko/dist/core-tags/core/await/reorderer-renderer"));

function renderAssets() {
const assets = this.___assets;
Expand Down Expand Up @@ -142,11 +144,15 @@ function render(input, out, __component, component, state) {

out.end = outEndOverride;

component_globals_tag({}, out);

marko_dynamicTag(out, template, function() {
return input;
}, null, null, null, __component, "0");

init_components_tag({}, out);

await_reorderer_tag({}, out, __component, "1");
}

marko_template._ = marko_renderer(render, {
Expand All @@ -158,7 +164,9 @@ marko_template.meta = {
id: "/@marko/webpack-tests$x.x.x/fixtures/basic-template-plugin/test.marko",
tags: [
"./test.marko",
"marko/dist/core-tags/components/init-components-tag"
"marko/dist/core-tags/components/component-globals-tag",
"marko/dist/core-tags/components/init-components-tag",
"marko/dist/core-tags/core/await/reorderer-renderer"
]
};

Expand All @@ -177,6 +185,17 @@ module.exports = http;

/***/ }),

/***/ "marko/dist/core-tags/components/component-globals-tag":
/*!************************************************************************!*\
!*** external "marko/dist/core-tags/components/component-globals-tag" ***!
\************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/components/component-globals-tag;

/***/ }),

/***/ "marko/dist/core-tags/components/init-components-tag":
/*!**********************************************************************!*\
!*** external "marko/dist/core-tags/components/init-components-tag" ***!
Expand All @@ -188,6 +207,17 @@ module.exports = marko/dist/core-tags/components/init-components-tag;

/***/ }),

/***/ "marko/dist/core-tags/core/await/reorderer-renderer":
/*!*********************************************************************!*\
!*** external "marko/dist/core-tags/core/await/reorderer-renderer" ***!
\*********************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/core/await/reorderer-renderer;
/***/ }),

/***/ "marko/dist/html":
/*!**********************************!*\
!*** external "marko/dist/html" ***!
Expand Down
50 changes: 44 additions & 6 deletions src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */
template = __webpack_require__(/*! ./bar.marko */ "./src/__tests__/fixtures/multiple-entries-plugin/bar.marko"),
module_manifest = __webpack_require__(/*! ./../../../../__MARKO_WEBPACK__MANIFEST.js */ "./__MARKO_WEBPACK__MANIFEST.js"),
manifest = module_manifest.default || module_manifest,
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
marko_loadTag = __webpack_require__(/*! marko/dist/runtime/helpers/load-tag */ "marko/dist/runtime/helpers/load-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag"));
component_globals_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/component-globals-tag */ "marko/dist/core-tags/components/component-globals-tag")),
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag")),
await_reorderer_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer */ "marko/dist/core-tags/core/await/reorderer-renderer"));

function renderAssets() {
const assets = this.___assets;
Expand Down Expand Up @@ -131,11 +133,15 @@ function render(input, out, __component, component, state) {

out.end = outEndOverride;

component_globals_tag({}, out);

marko_dynamicTag(out, template, function() {
return input;
}, null, null, null, __component, "0");

init_components_tag({}, out);

await_reorderer_tag({}, out, __component, "1");
}

marko_template._ = marko_renderer(render, {
Expand All @@ -147,7 +153,9 @@ marko_template.meta = {
id: "/@marko/webpack-tests$x.x.x/fixtures/multiple-entries-plugin/bar.marko",
tags: [
"./bar.marko",
"marko/dist/core-tags/components/init-components-tag"
"marko/dist/core-tags/components/component-globals-tag",
"marko/dist/core-tags/components/init-components-tag",
"marko/dist/core-tags/core/await/reorderer-renderer"
]
};

Expand Down Expand Up @@ -245,9 +253,11 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */
template = __webpack_require__(/*! ./foo.marko */ "./src/__tests__/fixtures/multiple-entries-plugin/foo.marko"),
module_manifest = __webpack_require__(/*! ./../../../../__MARKO_WEBPACK__MANIFEST.js */ "./__MARKO_WEBPACK__MANIFEST.js"),
manifest = module_manifest.default || module_manifest,
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
marko_loadTag = __webpack_require__(/*! marko/dist/runtime/helpers/load-tag */ "marko/dist/runtime/helpers/load-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag"));
component_globals_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/component-globals-tag */ "marko/dist/core-tags/components/component-globals-tag")),
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag")),
await_reorderer_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer */ "marko/dist/core-tags/core/await/reorderer-renderer"));

function renderAssets() {
const assets = this.___assets;
Expand Down Expand Up @@ -303,11 +313,15 @@ function render(input, out, __component, component, state) {

out.end = outEndOverride;

component_globals_tag({}, out);

marko_dynamicTag(out, template, function() {
return input;
}, null, null, null, __component, "0");

init_components_tag({}, out);

await_reorderer_tag({}, out, __component, "1");
}

marko_template._ = marko_renderer(render, {
Expand All @@ -319,7 +333,9 @@ marko_template.meta = {
id: "/@marko/webpack-tests$x.x.x/fixtures/multiple-entries-plugin/foo.marko",
tags: [
"./foo.marko",
"marko/dist/core-tags/components/init-components-tag"
"marko/dist/core-tags/components/component-globals-tag",
"marko/dist/core-tags/components/init-components-tag",
"marko/dist/core-tags/core/await/reorderer-renderer"
]
};

Expand Down Expand Up @@ -359,6 +375,17 @@ module.exports = http;

/***/ }),

/***/ "marko/dist/core-tags/components/component-globals-tag":
/*!************************************************************************!*\
!*** external "marko/dist/core-tags/components/component-globals-tag" ***!
\************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/components/component-globals-tag;

/***/ }),

/***/ "marko/dist/core-tags/components/init-components-tag":
/*!**********************************************************************!*\
!*** external "marko/dist/core-tags/components/init-components-tag" ***!
Expand All @@ -370,6 +397,17 @@ module.exports = marko/dist/core-tags/components/init-components-tag;

/***/ }),

/***/ "marko/dist/core-tags/core/await/reorderer-renderer":
/*!*********************************************************************!*\
!*** external "marko/dist/core-tags/core/await/reorderer-renderer" ***!
\*********************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/core/await/reorderer-renderer;
/***/ }),

/***/ "marko/dist/html":
/*!**********************************!*\
!*** external "marko/dist/html" ***!
Expand Down
36 changes: 33 additions & 3 deletions ...tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,11 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */
template = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko"),
module_manifest = __webpack_require__(/*! ./../../../../__MARKO_WEBPACK__MANIFEST.js */ "./__MARKO_WEBPACK__MANIFEST.js"),
manifest = module_manifest.default || module_manifest,
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
marko_loadTag = __webpack_require__(/*! marko/dist/runtime/helpers/load-tag */ "marko/dist/runtime/helpers/load-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag"));
component_globals_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/component-globals-tag */ "marko/dist/core-tags/components/component-globals-tag")),
marko_dynamicTag = __webpack_require__(/*! marko/dist/runtime/helpers/dynamic-tag */ "marko/dist/runtime/helpers/dynamic-tag"),
init_components_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/components/init-components-tag */ "marko/dist/core-tags/components/init-components-tag")),
await_reorderer_tag = marko_loadTag(__webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer */ "marko/dist/core-tags/core/await/reorderer-renderer"));

function renderAssets() {
const assets = this.___assets;
Expand Down Expand Up @@ -204,11 +206,15 @@ function render(input, out, __component, component, state) {

out.end = outEndOverride;

component_globals_tag({}, out);

marko_dynamicTag(out, template, function() {
return input;
}, null, null, null, __component, "0");

init_components_tag({}, out);

await_reorderer_tag({}, out, __component, "1");
}

marko_template._ = marko_renderer(render, {
Expand All @@ -220,7 +226,9 @@ marko_template.meta = {
id: "/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin-dynamic-bundle/test.marko",
tags: [
"./test.marko",
"marko/dist/core-tags/components/init-components-tag"
"marko/dist/core-tags/components/component-globals-tag",
"marko/dist/core-tags/components/init-components-tag",
"marko/dist/core-tags/core/await/reorderer-renderer"
]
};

Expand All @@ -239,6 +247,17 @@ module.exports = http;

/***/ }),

/***/ "marko/dist/core-tags/components/component-globals-tag":
/*!************************************************************************!*\
!*** external "marko/dist/core-tags/components/component-globals-tag" ***!
\************************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/components/component-globals-tag;

/***/ }),

/***/ "marko/dist/core-tags/components/init-components-tag":
/*!**********************************************************************!*\
!*** external "marko/dist/core-tags/components/init-components-tag" ***!
Expand All @@ -250,6 +269,17 @@ module.exports = marko/dist/core-tags/components/init-components-tag;

/***/ }),

/***/ "marko/dist/core-tags/core/await/reorderer-renderer":
/*!*********************************************************************!*\
!*** external "marko/dist/core-tags/core/await/reorderer-renderer" ***!
\*********************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = marko/dist/core-tags/core/await/reorderer-renderer;
/***/ }),

/***/ "marko/dist/html":
/*!**********************************!*\
!*** external "marko/dist/html" ***!
Expand Down
Loading

0 comments on commit 63f0ce5

Please sign in to comment.