feat: skip writing dynamic publicPath if publicPath is in output opti…

…ons (#31)
marko-js · Mar 15, 2020 · 6d117c9 · 6d117c9
1 parent 677127c
commit 6d117c9
Show file tree

Hide file tree

Showing 20 changed files with 353 additions and 49 deletions.
diff --git a/...ts__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/browser--test_gpFj.js b/...ts__/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/browser--test_gpFj.js
@@ -19,10 +19,7 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/basic-template-plugin-custom-runtime-id/test.marko?dependencies");
 
           const { init } = __webpack_require__(/*! marko/components */ "marko/components");

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
@@ -96,7 +96,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/browser--test_uYWJ.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/browser--test_uYWJ.js
@@ -19,10 +19,7 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/basic-template-plugin/test.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js b/src/__tests__/fixtures/basic-template-plugin/__snapshots__/server--main.js
@@ -96,7 +96,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/browser--bar_aSxt.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/browser--bar_aSxt.js
@@ -19,10 +19,7 @@ __webpack_require__(/*! ./components/shared.marko?dependencies */ "./src/__tests
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./bar.marko?dependencies */ "./src/__tests__/fixtures/multiple-entries-plugin/bar.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/browser--foo_3XPO.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/browser--foo_3XPO.js
@@ -19,10 +19,7 @@ __webpack_require__(/*! ./components/shared.marko?dependencies */ "./src/__tests
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./foo.marko?dependencies */ "./src/__tests__/fixtures/multiple-entries-plugin/foo.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js b/src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/server--main.js
@@ -85,7 +85,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;
@@ -257,7 +257,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-A--test_YDNP.A.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-A--test_YDNP.A.js
@@ -103,10 +103,7 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-B--test_YDNP.B.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-B--test_YDNP.B.js
@@ -103,10 +103,7 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-C--test_YDNP.C.js b/...xtures/with-class-component-plugin-dynamic-bundle/__snapshots__/browser-C--test_YDNP.C.js
@@ -103,10 +103,7 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/with-class-component-plugin-dynamic-bundle/test.marko?dependencies");
       window.$initComponents && $initComponents();
 

diff --git a/...tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js b/...tests__/fixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/server--main.js
@@ -158,7 +158,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/browser--test_nzzJ.js b/src/__tests__/fixtures/with-class-component-plugin/__snapshots__/browser--test_nzzJ.js
@@ -101,10 +101,7 @@ __webpack_require__(/*! ./components/nested/index.marko?dependencies */ "./src/_
 /***/ (function(module, exports, __webpack_require__) {
 
 
-      if (window.$mwp) {
-        __webpack_require__.p = $mwp;
-      }
-
+       if (window.$mwp) __webpack_require__.p = $mwp;
       __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/with-class-component-plugin/test.marko?dependencies");
       window.$initComponents && $initComponents();
 

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
@@ -151,7 +151,7 @@ function renderAssets() {
   this.end = this.___end;
 
   if (assets) {
-    this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/src/__tests__/fixtures/with-public-path/__snapshots__/browser--test_CDVG.js b/src/__tests__/fixtures/with-public-path/__snapshots__/browser--test_CDVG.js
@@ -0,0 +1,30 @@
+/******/ ({
+
+/***/ "./src/__tests__/fixtures/with-public-path/test.marko?dependencies":
+/*!*************************************************************************!*\
+  !*** ./src/__tests__/fixtures/with-public-path/test.marko?dependencies ***!
+  \*************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+
+
+/***/ }),
+
+/***/ "./src/__tests__/fixtures/with-public-path/test.marko?hydrate":
+/*!********************************************************************!*\
+  !*** ./src/__tests__/fixtures/with-public-path/test.marko?hydrate ***!
+  \********************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+
+      __webpack_require__(/*! ./test.marko?dependencies */ "./src/__tests__/fixtures/with-public-path/test.marko?dependencies");
+      window.$initComponents && $initComponents();
+
+
+
+/***/ })
+
+/******/ });