fix: include runtimeId in dynamic public path var (#32)

marko-js · Mar 15, 2020 · d6751af · d6751af
1 parent 6d117c9
commit d6751af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 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,7 +19,7 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 
-       if (window.$mwp) __webpack_require__.p = $mwp;
+       if (window.$mwp_testruntime) __webpack_require__.p = $mwp_testruntime;
       __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) {
-    __webpack_require__.p && this.script(`$mwp=${JSON.stringify(__webpack_require__.p)}`);
+    __webpack_require__.p && this.script(`$mwp_testruntime=${JSON.stringify(__webpack_require__.p)}`);
 
     if (assets.js) {
       const setNonce = nonce && `.setAttribute("nonce", ${JSON.stringify(nonce)})`;

diff --git a/src/loader/get-asset-code.ts b/src/loader/get-asset-code.ts
@@ -22,7 +22,9 @@ static function renderAssets() {
   if (assets) {
     ${
       publicPath === undefined
-        ? "__webpack_public_path__ && this.script(`$mwp=${JSON.stringify(__webpack_public_path__)}`);"
+        ? `__webpack_public_path__ && this.script(\`${
+            runtimeId ? `$mwp_${runtimeId}` : "$mwp"
+          }=\${JSON.stringify(__webpack_public_path__)}\`);`
         : ""
     }
 
@@ -55,7 +57,11 @@ static function outEndOverride(data, encoding, callback) {
   this.end(data, encoding, callback);
 }
 
-${runtimeId === undefined ? "" : `$ out.global.runtimeId = ${runtimeId};`}
+${
+  runtimeId === undefined
+    ? ""
+    : `$ out.global.runtimeId = ${JSON.stringify(runtimeId)};`
+}
 $ out.___flush = out.flush;
 $ out.___end = out.end;
 $ out.___renderAssets = renderAssets;

diff --git a/src/loader/index.ts b/src/loader/index.ts
@@ -124,18 +124,23 @@ export default function(source: string): string {
       }
     );
   } else if (hydrate) {
+    let mwpVar = "$mwp";
+    if (runtimeId) {
+      mwpVar += `_${runtimeId}`;
+    }
+
     return `
       ${
         publicPath === undefined
-          ? " if (window.$mwp) __webpack_public_path__ = $mwp;"
+          ? ` if (window.${mwpVar}) __webpack_public_path__ = ${mwpVar};`
           : ""
       }
       ${loadStr(`./${path.basename(this.resourcePath)}?dependencies`)}
       ${
         runtimeId
           ? `
           ${loadStr("marko/components", "{ init }")}
-          init(${runtimeId});
+          init(${JSON.stringify(runtimeId)});
         `
           : "window.$initComponents && $initComponents();"
       }

diff --git a/src/plugin/index.ts b/src/plugin/index.ts
@@ -35,10 +35,7 @@ export default class MarkoWebpackPlugin {
   });
 
   constructor(private options?: { runtimeId?: string }) {
-    this.options = { ...options };
-    if (this.options.runtimeId) {
-      this.options.runtimeId = JSON.stringify(options.runtimeId);
-    }
+    this.options = options;
   }
 
   // Overwritten by each compiler.