From be3e1c924a99444f21292a6893befcb7463ccf96 Mon Sep 17 00:00:00 2001 From: Dylan Piercey Date: Wed, 29 Jul 2020 15:15:46 -0700 Subject: [PATCH] feat: expose template exports from top level asset wrappers --- .../__snapshots__/server--main.js | 47 ++++++++++++++- .../__snapshots__/server--main.js | 47 ++++++++++++++- .../__snapshots__/server--main.js | 59 +++++++++++++++++-- .../__snapshots__/server--main.js | 47 ++++++++++++++- .../__snapshots__/server--main.js | 47 ++++++++++++++- .../__snapshots__/server--main.js | 47 ++++++++++++++- src/loader/get-asset-code.ts | 2 + src/shared/plugin-options-for-compiler.ts | 7 +-- 8 files changed, 277 insertions(+), 26 deletions(-) diff --git a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/server--main.js b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/server--main.js index 69a9ea2..d47d22b 100644 --- a/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/server--main.js @@ -14,6 +14,41 @@ module.exports = { build: {"test_gpFj":{"js":["test_gpFj.js"]}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/server.js": @@ -73,10 +108,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/test.marko?assets ***! \******************************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/test.marko"); +/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _test_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/basic-template-plugin-custom-runtime-id/test.marko", @@ -89,6 +128,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -168,7 +209,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js index 94aa3bd..3e06c4d 100644 --- a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js @@ -14,6 +14,41 @@ module.exports = { build: {"test_uYWJ":{"js":["test_uYWJ.js"]}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/basic-template-plugin/server.js": @@ -73,10 +108,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/basic-template-plugin/test.marko?assets ***! \************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/basic-template-plugin/test.marko"); +/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _test_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/basic-template-plugin/test.marko", @@ -89,6 +128,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -166,7 +207,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js index 4dc10a8..d3f39ed 100644 --- a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js @@ -14,6 +14,41 @@ module.exports = { build: {"bar_aSxt":{"js":["bar_aSxt~foo_3XPO.js","bar_aSxt.js"]},"foo_3XPO":{"js":["bar_aSxt~foo_3XPO.js","foo_3XPO.js"]}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/multiple-entries-plugin/bar.marko": @@ -62,10 +97,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/multiple-entries-plugin/bar.marko?assets ***! \*************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _bar_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./bar.marko */ "./src/__tests__/fixtures/multiple-entries-plugin/bar.marko"); +/* harmony import */ var _bar_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_bar_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _bar_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _bar_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/multiple-entries-plugin/bar.marko", @@ -78,6 +117,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -155,7 +196,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), @@ -238,10 +279,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/multiple-entries-plugin/foo.marko?assets ***! \*************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _foo_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./foo.marko */ "./src/__tests__/fixtures/multiple-entries-plugin/foo.marko"); +/* harmony import */ var _foo_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_foo_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _foo_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _foo_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/multiple-entries-plugin/foo.marko", @@ -254,6 +299,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -331,7 +378,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js b/src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js index 450ba56..6e8b802 100644 --- a/src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js @@ -19,6 +19,41 @@ module.exports = { builds: {"browser-A":{"test_YDNP":{"css":["test_YDNP.A.css"],"js":["test_YDNP.A.js"]}},"browser-B":{"test_YDNP":{"css":["test_YDNP.B.css"],"js":["test_YDNP.B.js"]}},"browser-C":{"test_YDNP":{"css":["test_YDNP.C.css"],"js":["test_YDNP.C.js"]}}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/components/nested/index.marko": @@ -135,10 +170,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko?assets ***! \*********************************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko"); +/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _test_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin-dynamic-bundle/test.marko", @@ -151,6 +190,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -228,7 +269,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/server--main.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/server--main.js index 5460a1a..5f149f5 100644 --- a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/server--main.js @@ -14,6 +14,41 @@ module.exports = { build: {"test_nzzJ":{"css":["test_nzzJ.css"],"js":["test_nzzJ.js"]}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/with-class-component-plugin/components/nested/index.marko": @@ -128,10 +163,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/with-class-component-plugin/test.marko?assets ***! \******************************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/with-class-component-plugin/test.marko"); +/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _test_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/with-class-component-plugin/test.marko", @@ -144,6 +183,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -221,7 +262,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/server--main.js b/src/__tests__/fixtures/with-public-path/__snapshots__/server--main.js index d84f2c7..cf6a478 100644 --- a/src/__tests__/fixtures/with-public-path/__snapshots__/server--main.js +++ b/src/__tests__/fixtures/with-public-path/__snapshots__/server--main.js @@ -14,6 +14,41 @@ module.exports = { build: {"test_CDVG":{"js":["test_CDVG.js"]}} } +/***/ }), + +/***/ "./node_modules/webpack/buildin/harmony-module.js": +/*!*******************************************!*\ + !*** (webpack)/buildin/harmony-module.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(originalModule) { + if (!originalModule.webpackPolyfill) { + var module = Object.create(originalModule); + // module.parent = undefined by default + if (!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + Object.defineProperty(module, "exports", { + enumerable: true + }); + module.webpackPolyfill = 1; + } + return module; +}; + + /***/ }), /***/ "./src/__tests__/fixtures/with-public-path/server.js": @@ -73,10 +108,14 @@ marko_template.meta = { !*** ./src/__tests__/fixtures/with-public-path/test.marko?assets ***! \*******************************************************************/ /*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* WEBPACK VAR INJECTION */(function(__filename) { +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(__filename, module) {/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./test.marko */ "./src/__tests__/fixtures/with-public-path/test.marko"); +/* harmony import */ var _test_marko__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_test_marko__WEBPACK_IMPORTED_MODULE_0__); +/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _test_marko__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _test_marko__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__)); + var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ "marko/dist/html").t(__filename), marko_componentType = "/@marko/webpack-tests$x.x.x/fixtures/with-public-path/test.marko", @@ -89,6 +128,8 @@ var marko_template = module.exports = __webpack_require__(/*! marko/dist/html */ 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; const nonce = this.global.cspNonce; @@ -166,7 +207,7 @@ marko_template.meta = { ] }; -/* WEBPACK VAR INJECTION */}.call(this, "/index.js")) +/* WEBPACK VAR INJECTION */}.call(this, "/index.js", __webpack_require__(/*! ./../../../../node_modules/webpack/buildin/harmony-module.js */ "./node_modules/webpack/buildin/harmony-module.js")(module))) /***/ }), diff --git a/src/loader/get-asset-code.ts b/src/loader/get-asset-code.ts index 611616e..e96edc1 100644 --- a/src/loader/get-asset-code.ts +++ b/src/loader/get-asset-code.ts @@ -12,6 +12,8 @@ import manifest from ${JSON.stringify( `./${path.relative(path.dirname(resourcePath), VIRTUAL_SERVER_MANIFEST_PATH)}` )}; +static export * from ${JSON.stringify(`./${path.basename(resourcePath)}`)}; + static function renderAssets() { const assets = this.___assets; const nonce = this.global.cspNonce; diff --git a/src/shared/plugin-options-for-compiler.ts b/src/shared/plugin-options-for-compiler.ts index 6b1d69d..61edb34 100644 --- a/src/shared/plugin-options-for-compiler.ts +++ b/src/shared/plugin-options-for-compiler.ts @@ -1,6 +1,3 @@ -import { Compiler } from 'webpack'; +import { Compiler } from "webpack"; import Plugin from "../plugin"; -type PluginOptions = ConstructorParameters[0]; -const pluginnOptionsLookup: WeakMap = new WeakMap(); - -export { pluginnOptionsLookup as default }; \ No newline at end of file +export default new WeakMap[0]>();