Skip to content

Commit

Permalink
fix: avoid making node_module Marko files entries
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey committed Nov 8, 2023
1 parent 613e342 commit 5366351
Show file tree
Hide file tree
Showing 17 changed files with 857 additions and 264 deletions.
853 changes: 723 additions & 130 deletions package-lock.json
View file

Large diffs are not rendered by default.

46 changes: 23 additions & 23 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 @@ -14,13 +14,13 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ });
/* harmony import */ var marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! marko/dist/runtime/html */ "marko/dist/runtime/html");
/* harmony import */ var marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! !!@marko/webpack/loader!?manifest */ "./src/loader/index.ts!?manifest");
/* harmony import */ var marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! marko/dist/runtime/html/helpers/attr */ "marko/dist/runtime/html/helpers/attr");
/* harmony import */ var marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! marko/dist/runtime/html/helpers/attrs */ "marko/dist/runtime/html/helpers/attrs");
/* harmony import */ var marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! marko/dist/runtime/components/renderer */ "marko/dist/runtime/components/renderer");
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! !!@marko/webpack/loader!?manifest */ "./src/loader/index.ts!?manifest");
/* harmony import */ var marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! marko/dist/runtime/html/helpers/attr */ "marko/dist/runtime/html/helpers/attr");
/* harmony import */ var marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_helpers_attr__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! marko/dist/runtime/html/helpers/attrs */ "marko/dist/runtime/html/helpers/attrs");
/* harmony import */ var marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! marko/dist/runtime/components/renderer */ "marko/dist/runtime/components/renderer");
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_4__);


const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.t)();
Expand All @@ -32,13 +32,13 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.

const _marko_componentType = "GHIxthSC",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_3___default()(function (input, out, _component, component, state) {
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_4___default()(function (input, out, _component, component, state) {
const {
entry,
scriptAttrs,
styleAttrs
} = input;
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_4__["default"].getAssets(entry, out.global.buildName);
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_1__.default.getAssets(entry, out.global.buildName);
const written = out.global.___writtenAssets || (out.global.___writtenAssets = new Set());

if (assets.js) {
Expand All @@ -50,7 +50,7 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD

if (!written.has(js)) {
written.add(js);
out.w(`<script${marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_2___default()({
out.w(`<script${marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_3___default()({
"src": __webpack_require__.p + js,
"nonce": nonce,
...scriptAttrs
Expand All @@ -67,7 +67,7 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD

if (!written.has(css)) {
written.add(css);
out.w(`<link${marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_2___default()({
out.w(`<link${marko_dist_runtime_html_helpers_attrs__WEBPACK_IMPORTED_MODULE_3___default()({
"rel": "stylesheet",
"href": __webpack_require__.p + css,
...styleAttrs
Expand Down Expand Up @@ -113,7 +113,7 @@ const _marko_componentType = "wUwFs+xe",
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_3___default()(function (input, out, _component, component, state) {
out.w("<h1>Hello World</h1>");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_2___default()(_components_webpack_assets_index_marko__WEBPACK_IMPORTED_MODULE_1__["default"], {
marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_2___default()(_components_webpack_assets_index_marko__WEBPACK_IMPORTED_MODULE_1__.default, {
"entry": "other"
}, out, _component, "1");
}, {
Expand Down Expand Up @@ -173,7 +173,7 @@ function renderAssets(out) {
let styles = "";

for (const entry of entries) {
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__["default"].getAssets(entry, buildName);
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets(entry, buildName);

if (assets.js) {
for (const href of assets.js) {
Expand Down Expand Up @@ -217,7 +217,7 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
}
}, out, _component, "0");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__["default"], input, out, _component, "1");
marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "1");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default()), {}, out, _component, "2");

Expand Down Expand Up @@ -256,7 +256,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ ((module) => {

"use strict";
module.exports = require("http");
module.exports = require("http");;

/***/ }),

Expand All @@ -267,7 +267,7 @@ module.exports = require("http");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");;

/***/ }),

Expand All @@ -278,7 +278,7 @@ module.exports = require("marko/dist/core-tags/components/init-components-tag.js
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");;

/***/ }),

Expand All @@ -289,7 +289,7 @@ module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");;

/***/ }),

Expand All @@ -300,7 +300,7 @@ module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/components/renderer");
module.exports = require("marko/dist/runtime/components/renderer");;

/***/ }),

Expand All @@ -311,7 +311,7 @@ module.exports = require("marko/dist/runtime/components/renderer");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/helpers/render-tag");
module.exports = require("marko/dist/runtime/helpers/render-tag");;

/***/ }),

Expand All @@ -322,7 +322,7 @@ module.exports = require("marko/dist/runtime/helpers/render-tag");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/html");
module.exports = require("marko/dist/runtime/html");;

/***/ }),

Expand All @@ -333,7 +333,7 @@ module.exports = require("marko/dist/runtime/html");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/html/helpers/attr");
module.exports = require("marko/dist/runtime/html/helpers/attr");;

/***/ }),

Expand All @@ -344,7 +344,7 @@ module.exports = require("marko/dist/runtime/html/helpers/attr");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/html/helpers/attrs");
module.exports = require("marko/dist/runtime/html/helpers/attrs");;

/***/ })

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 @@ -83,7 +83,7 @@ function renderAssets(out) {
let styles = "";

for (const entry of entries) {
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__["default"].getAssets(entry, buildName);
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets(entry, buildName);

if (assets.js) {
for (const href of assets.js) {
Expand Down Expand Up @@ -127,7 +127,7 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
}
}, out, _component, "0");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__["default"], input, out, _component, "1");
marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "1");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default()), {}, out, _component, "2");

Expand Down Expand Up @@ -166,7 +166,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ ((module) => {

"use strict";
module.exports = require("http");
module.exports = require("http");;

/***/ }),

Expand All @@ -177,7 +177,7 @@ module.exports = require("http");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");;

/***/ }),

Expand All @@ -188,7 +188,7 @@ module.exports = require("marko/dist/core-tags/components/init-components-tag.js
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");;

/***/ }),

Expand All @@ -199,7 +199,7 @@ module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");;

/***/ }),

Expand All @@ -210,7 +210,7 @@ module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/components/renderer");
module.exports = require("marko/dist/runtime/components/renderer");;

/***/ }),

Expand All @@ -221,7 +221,7 @@ module.exports = require("marko/dist/runtime/components/renderer");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/helpers/render-tag");
module.exports = require("marko/dist/runtime/helpers/render-tag");;

/***/ }),

Expand All @@ -232,7 +232,7 @@ module.exports = require("marko/dist/runtime/helpers/render-tag");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/html");
module.exports = require("marko/dist/runtime/html");;

/***/ })

Expand Down
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__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function renderAssets(out) {
let styles = "";

for (const entry of entries) {
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__["default"].getAssets(entry, buildName);
const assets = _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__.default.getAssets(entry, buildName);

if (assets.js) {
for (const href of assets.js) {
Expand Down Expand Up @@ -127,7 +127,7 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD
}
}, out, _component, "0");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__["default"], input, out, _component, "1");
marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__.default, input, out, _component, "1");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()((marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default()), {}, out, _component, "2");

Expand Down Expand Up @@ -166,7 +166,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ ((module) => {

"use strict";
module.exports = require("http");
module.exports = require("http");;

/***/ }),

Expand All @@ -177,7 +177,7 @@ module.exports = require("http");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");
module.exports = require("marko/dist/core-tags/components/init-components-tag.js");;

/***/ }),

Expand All @@ -188,7 +188,7 @@ module.exports = require("marko/dist/core-tags/components/init-components-tag.js
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");
module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js");;

/***/ }),

Expand All @@ -199,7 +199,7 @@ module.exports = require("marko/dist/core-tags/core/__flush_here_and_after__.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");
module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js");;

/***/ }),

Expand All @@ -210,7 +210,7 @@ module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js"
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/components/renderer");
module.exports = require("marko/dist/runtime/components/renderer");;

/***/ }),

Expand All @@ -221,7 +221,7 @@ module.exports = require("marko/dist/runtime/components/renderer");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/helpers/render-tag");
module.exports = require("marko/dist/runtime/helpers/render-tag");;

/***/ }),

Expand All @@ -232,7 +232,7 @@ module.exports = require("marko/dist/runtime/helpers/render-tag");
/***/ ((module) => {

"use strict";
module.exports = require("marko/dist/runtime/html");
module.exports = require("marko/dist/runtime/html");;

/***/ })

Expand Down
Loading

0 comments on commit 5366351

Please sign in to comment.