Skip to content

Commit

Permalink
feat: avoid loading babel config by default (#89)
Browse files Browse the repository at this point in the history 
BREAKING CHANGE: no longer support compiler override to plugin
  • Loading branch information
@DylanPiercey
DylanPiercey authored Jun 1, 2024
1 parent f841ce1 commit 03b6521
Show file tree
Hide file tree
Showing 36 changed files with 4,719 additions and 17,404 deletions.
18,671 changes: 3,199 additions & 15,472 deletions package-lock.json
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@marko/compiler": "^5.8.1",
"@marko/compiler": "^5.37.0",
"@types/jest": "^26.0.20",
"@types/loader-utils": "^2.0.1",
"@types/node": "^14.14.22",
Expand All @@ -28,7 +28,7 @@
"jest": "^26.6.3",
"jest-file-snapshot": "0.3.8",
"lint-staged": "^10.5.3",
"marko": "^5.8.1",
"marko": "^5.35.0",
"memory-fs": "^0.5.0",
"mini-css-extract-plugin": "^1.3.5",
"prettier": "^2.2.1",
Expand All @@ -37,8 +37,8 @@
"tapable": "^1.1.3",
"ts-jest": "^26.5.0",
"typescript": "^4.1.3",
"webpack": "^4.46.0",
"webpack5": "npm:webpack@^5.0.0"
"webpack": "^4.47.0",
"webpack5": "npm:webpack@^5.91.0"
},
"files": [
"dist",
Expand Down
170 changes: 65 additions & 105 deletions src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js
View file

Large diffs are not rendered by default.

184 changes: 72 additions & 112 deletions src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js
View file

Large diffs are not rendered by default.

91 changes: 38 additions & 53 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 @@ -114,19 +114,17 @@ http

"use strict";
__webpack_require__.r(__webpack_exports__);
/* 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_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! marko/dist/runtime/components/renderer */ "marko/dist/runtime/components/renderer");
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_1__);


const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__["t"])();
/* harmony import */ var marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! marko/dist/runtime/html/index.js */ "marko/dist/runtime/html/index.js");
/* harmony import */ var marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! marko/dist/runtime/components/renderer.js */ "marko/dist/runtime/components/renderer.js");
/* harmony import */ var marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_1__);

const _marko_componentType = "8XgZ/c27",
_marko_template = Object(marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__["t"])(_marko_componentType);
/* harmony default export */ __webpack_exports__["default"] = (_marko_template);

const _marko_componentType = "8XgZ/c27",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_1___default()(function (input, out, _component, component, state) {
const _marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_1___default()(function (input, out, _componentDef, _component, state, $global) {
out.w("<h1>Hello World</h1>");
}, {
t: _marko_componentType,
Expand All @@ -144,35 +142,32 @@ _marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MOD

"use strict";
__webpack_require__.r(__webpack_exports__);
/* 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_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! marko/dist/runtime/html/index.js */ "marko/dist/runtime/html/index.js");
/* harmony import */ var marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/test.marko");
/* harmony import */ var _marko_webpack_loader_manifest__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! !@marko/webpack/loader!?manifest */ "./src/loader/index.ts!./?manifest");
/* empty/unused harmony star reexport *//* harmony import */ var marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! marko/dist/core-tags/core/__flush_here_and_after__.js */ "marko/dist/core-tags/core/__flush_here_and_after__.js");
/* harmony import */ var marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! marko/dist/runtime/helpers/render-tag */ "marko/dist/runtime/helpers/render-tag");
/* harmony import */ var marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! marko/dist/runtime/helpers/render-tag.js */ "marko/dist/runtime/helpers/render-tag.js");
/* harmony import */ var marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! marko/dist/core-tags/components/init-components-tag.js */ "marko/dist/core-tags/components/init-components-tag.js");
/* harmony import */ var marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5__);
/* harmony import */ var marko_dist_core_tags_core_await_reorderer_renderer_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! marko/dist/core-tags/core/await/reorderer-renderer.js */ "marko/dist/core-tags/core/await/reorderer-renderer.js");
/* harmony import */ var marko_dist_core_tags_core_await_reorderer_renderer_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(marko_dist_core_tags_core_await_reorderer_renderer_js__WEBPACK_IMPORTED_MODULE_6__);
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! marko/dist/runtime/components/renderer */ "marko/dist/runtime/components/renderer");
/* harmony import */ var marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7__);


const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__["t"])();
/* harmony import */ var marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! marko/dist/runtime/components/renderer.js */ "marko/dist/runtime/components/renderer.js");
/* harmony import */ var marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_7__);

const _marko_componentType = "6kM99PmO",
_marko_template = Object(marko_dist_runtime_html_index_js__WEBPACK_IMPORTED_MODULE_0__["t"])(_marko_componentType);
/* harmony default export */ __webpack_exports__["default"] = (_marko_template);



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

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

if (entries) {
__webpack_require__.p && out.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
const buildName = $global.buildName;
Expand All @@ -181,10 +176,8 @@ function renderAssets(out) {
const written = $global.___writtenAssets || ($global.___writtenAssets = new Set());
let scripts = "";
let styles = "";

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

if (assets.js) {
for (const href of assets.js) {
if (!written.has(href)) {
Expand All @@ -193,7 +186,6 @@ function renderAssets(out) {
}
}
}

if (assets.css) {
for (const href of assets.css) {
if (!written.has(href)) {
Expand All @@ -203,7 +195,6 @@ function renderAssets(out) {
}
}
}

out.write(scripts + styles);
}
}
Expand All @@ -212,26 +203,20 @@ function renderAssets(out) {




const _marko_componentType = "6kM99PmO",
_marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _component, component, state) {
const _marko_component = {};
_marko_template._ = marko_dist_runtime_components_renderer_js__WEBPACK_IMPORTED_MODULE_7___default()(function (input, out, _componentDef, _component, state, $global) {
out.global.runtimeId = "testruntime";
out.global.___renderAssets = renderAssets;
(out.global.___entries || (out.global.___entries = [])).push("test_8XgZ");

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, {
marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_flush_here_and_after_js__WEBPACK_IMPORTED_MODULE_3___default.a, {
"renderBody": out => {
const outAlias = out;
outAlias.global.___renderAssets && outAlias.global.___renderAssets(outAlias);
}
}, 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()(marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default.a, {}, out, _component, "2");

marko_dist_runtime_helpers_render_tag__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_await_reorderer_renderer_js__WEBPACK_IMPORTED_MODULE_6___default.a, {}, out, _component, "3");
}, out, _componentDef, "0");
marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4___default()(_test_marko__WEBPACK_IMPORTED_MODULE_1__["default"], input, out, _componentDef, "1");
marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_components_init_components_tag_js__WEBPACK_IMPORTED_MODULE_5___default.a, {}, out, _componentDef, "2");
marko_dist_runtime_helpers_render_tag_js__WEBPACK_IMPORTED_MODULE_4___default()(marko_dist_core_tags_core_await_reorderer_renderer_js__WEBPACK_IMPORTED_MODULE_6___default.a, {}, out, _componentDef, "3");
}, {
t: _marko_componentType,
i: true
Expand Down Expand Up @@ -301,36 +286,36 @@ module.exports = require("marko/dist/core-tags/core/await/reorderer-renderer.js"

/***/ }),

/***/ "marko/dist/runtime/components/renderer":
/*!*********************************************************!*\
!*** external "marko/dist/runtime/components/renderer" ***!
\*********************************************************/
/***/ "marko/dist/runtime/components/renderer.js":
/*!************************************************************!*\
!*** external "marko/dist/runtime/components/renderer.js" ***!
\************************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

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

/***/ }),

/***/ "marko/dist/runtime/helpers/render-tag":
/*!********************************************************!*\
!*** external "marko/dist/runtime/helpers/render-tag" ***!
\********************************************************/
/***/ "marko/dist/runtime/helpers/render-tag.js":
/*!***********************************************************!*\
!*** external "marko/dist/runtime/helpers/render-tag.js" ***!
\***********************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

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

/***/ }),

/***/ "marko/dist/runtime/html":
/*!******************************************!*\
!*** external "marko/dist/runtime/html" ***!
\******************************************/
/***/ "marko/dist/runtime/html/index.js":
/*!***************************************************!*\
!*** external "marko/dist/runtime/html/index.js" ***!
\***************************************************/
/*! no static exports found */
/***/ (function(module, exports) {

module.exports = require("marko/dist/runtime/html");
module.exports = require("marko/dist/runtime/html/index.js");

/***/ })

Expand Down
Loading

0 comments on commit 03b6521

Please sign in to comment.