pass default namespace to gerbundleassets inside cdn-map.js (#1805)

electrode-io · Feb 2, 2021 · 9464aba · 9464aba
1 parent fbba865
commit 9464aba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/packages/subapp-web/lib/init.js b/packages/subapp-web/lib/init.js
@@ -70,13 +70,16 @@ module.exports = function setup(setupContext) {
     });`;
   }
 
+  const namespaceScriptJs = namespace ? `window.__default__namespace="${namespace}";` : "";
+
   const scriptId = namespace ? namespace : "bundle";
 
   const webSubAppJs = `<script id="${scriptId}Assets" type="application/json">
 ${JSON.stringify(bundleAssets)}
 </script>
 <script>/*LJ*/${loadJs}/*LJ*/
 ${webpackJsonpJS}
+${namespaceScriptJs}
 ${clientJs}
 ${cdnJs}
 ${inlineRuntimeJS}

diff --git a/packages/subapp-web/src/cdn-map.js b/packages/subapp-web/src/cdn-map.js
@@ -42,5 +42,5 @@
   };
 
   // initialize bundle assets
-  xv1.getBundleAssets();
+  xv1.getBundleAssets(w.__default__namespace);
 })(window);
diff --git a/packages/subapp-web/test/spec/init.spec.js b/packages/subapp-web/test/spec/init.spec.js
@@ -39,6 +39,7 @@ describe("init", function () {
     expect(context.user.assets).to.be.ok;
     expect(initJs).contains(`<script id="bundleAssets" type="application/json">`);
     expect(initJs).contains(`<script>/*LJ*/`);
+    expect(initJs).not.contains(`window.__default__namespace="testNameSpace";`);
   });
 
   it("should return assets as JSON script and loadJs for a given namespace", () => {
@@ -67,6 +68,7 @@ describe("init", function () {
     expect(context.user.assets).to.be.ok;
     expect(initJs).contains(`<script id="testNameSpaceAssets" type="application/json">`);
     expect(initJs).contains(`<script>/*LJ*/`);
+    expect(initJs).contains(`window.__default__namespace="testNameSpace";`);
   });
 
   it("it should load runtime.bundle.js inline and mark includedBundles.runtime to true", () => {