@murasoftware/next-core - npm Package Compare versions

Comparing version 2.0.8 to 2.0.9

dist/index.modern.js

@@ -392,10 +392,12 @@ import { useEffect, useState, createContext } from 'react';
 
-    if (Array.isArray(filename)) {
-      if (filename.length && filename[0] == connectorConfig.siteid) {
-        filename.shift();
-      }
+    if (!Array.isArray(filename)) {
+      filename = filename.split("/");
+    }
 
-      filename = filename.join("/");
+    if (filename.length && filename[0] == Mura.siteid) {
+      filename.shift();
     }
 
+    filename = filename.join("/");
+
     if (params) {
@@ -405,2 +407,3 @@ query = Object.assign(query, params);
 
+    console.log('filename', filename);
     return Promise.resolve(Mura.renderFilename(filename, query).then(function (rendered) {
@@ -457,3 +460,3 @@ return Promise.resolve(rendered);
     return item.length;
-  });
+  }); //This shouldn't happen
 
@@ -513,2 +516,6 @@ if (connectorConfig.siteidinurls) {
 
+    if (ConnectorConfig.multitenant) {
+      return Promise.resolve([]);
+    }
+
     var siteids = ConnectorConfig.siteid;
@@ -551,8 +558,3 @@ var pathList = [];
   Mura.styleMap = Mura$1.styleMap;
-  var instanceConfig = Object.assign({}, ConnectorConfig);
 
-  if (!Array.isArray(instanceConfig.siteid)) {
-    instanceConfig.siteid = instanceConfig.siteid.split();
-  }
-
   if (typeof Mura.deInit == 'function') {
@@ -564,12 +566,30 @@ try {
 
-  if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
-    return item === context;
-  })) {
-    instanceConfig.siteid = context;
+  var instanceConfig = Object.assign({}, ConnectorConfig);
+
+  if (instanceConfig.multitenant) {
+    if (typeof context == 'string') {
+      instanceConfig.siteid = context;
+    } else {
+      var _context$params, _context$params$page;
+
+      if (context != null && (_context$params = context.params) != null && (_context$params$page = _context$params.page) != null && _context$params$page.length) {
+        instanceConfig.siteid = context.params.page[0];
+      } else {
+        instanceConfig.siteid = 'default';
+      }
+    }
   } else {
-    var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+    if (!Array.isArray(instanceConfig.siteid)) {
+      instanceConfig.siteid = instanceConfig.siteid.split();
+    }
 
-    if (Array.isArray(ConnectorConfig.siteid)) {
+    if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
+      return item === context;
+    })) {
+      instanceConfig.siteid = context;
+    } else {
+      var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == instanceConfig.editroute + "/");
+
       if (ishomepage) {
-        instanceConfig.siteid = ConnectorConfig.siteid[0];
+        instanceConfig.siteid = instanceConfig.siteid[0];
       } else {
@@ -589,3 +609,3 @@ var page = [];
 
-          if (page.length && ConnectorConfig.editroute && page[0] === ConnectorConfig.editroute.split("/")[1]) {
+          if (page.length && instanceConfig.editroute && page[0] === instanceConfig.editroute.split("/")[1]) {
             page.shift();
@@ -596,3 +616,3 @@ }
         if (page.length) {
-          if (ConnectorConfig.siteid.find(function (item) {
+          if (instanceConfig.siteid.find(function (item) {
             return item === page[0];
@@ -603,4 +623,6 @@ })) {
           } else {
-            instanceConfig.siteid = ConnectorConfig.siteid[0];
+            instanceConfig.siteid = instanceConfig.siteid[0];
           }
+        } else {
+          instanceConfig.siteid = instanceConfig.siteid[0];
         }
@@ -615,7 +637,5 @@ }
       request: context.req
-    }); //console.log('initing', connectorConfig.siteid)
-
+    });
     Mura.init(instanceConfig);
   } else if (startingsiteid != instanceConfig.siteid) {
-    //console.log('changing siteid',startingsiteid,connectorConfig.siteid)
     Mura.init(instanceConfig);
@@ -635,17 +655,34 @@ }
   var startingsiteid = Mura.siteid;
+  var instanceConfig = Object.assign({}, ConnectorConfig);
 
-  if (!Array.isArray(ConnectorConfig.siteid)) {
-    ConnectorConfig.siteid = v.siteid.split();
-  }
+  if (instanceConfig.multitenant) {
+    if (typeof context == 'string') {
+      instanceConfig.siteid = context;
+    } else {
+      var _context$params2, _context$params2$page;
 
-  if (typeof context == 'string' && ConnectorConfig.siteid.find(function (item) {
-    return item === context;
-  })) {
-    connectorConfig.siteid = context;
+      if (context != null && (_context$params2 = context.params) != null && (_context$params2$page = _context$params2.page) != null && _context$params2$page.length) {
+        instanceConfig.siteid = context.params.page[0];
+      } else {
+        if (typeof Mura != 'undefined') {
+          instanceConfig.siteid = Mura.siteid;
+        } else {
+          instanceConfig.siteid = 'default';
+        }
+      }
+    }
   } else {
-    var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+    if (!Array.isArray(instanceConfig.siteid)) {
+      instanceConfig.siteid = instanceConfig.siteid.split();
+    }
 
-    if (Array.isArray(ConnectorConfig.siteid)) {
+    if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
+      return item === context;
+    })) {
+      instanceConfig.siteid = context;
+    } else {
+      var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+
       if (ishomepage) {
-        connectorConfig.siteid = ConnectorConfig.siteid[0];
+        instanceConfig.siteid = instanceConfig.siteid[0];
       } else {
@@ -665,3 +702,3 @@ var page = [];
 
-          if (page.length && ConnectorConfig.editroute && page[0] === ConnectorConfig.editroute.split("/")[1]) {
+          if (page.length && instanceConfig.editroute && page[0] === instanceConfig.editroute.split("/")[1]) {
             page.shift();
@@ -672,10 +709,12 @@ }
         if (page.length) {
-          if (ConnectorConfig.siteid.find(function (item) {
+          if (instanceConfig.siteid.find(function (item) {
             return item === page[0];
           })) {
-            connectorConfig.siteid = page[0];
-            connectorConfig.siteidinurls = true;
+            instanceConfig.siteid = page[0];
+            instanceConfig.siteidinurls = true;
           } else {
-            connectorConfig.siteid = ConnectorConfig.siteid[0];
+            instanceConfig.siteid = instanceConfig.siteid[0];
           }
+        } else {
+          instanceConfig.siteid = instanceConfig.siteid[0];
         }
@@ -687,4 +726,4 @@ }
   var clearMuraAPICache = function clearMuraAPICache() {
-    delete connectorConfig.apiEndpoint;
-    delete connectorConfig.apiendpoint;
+    delete instanceConfig.apiEndpoint;
+    delete instanceConfig.apiendpoint;
     delete Mura.apiEndpoint;
@@ -695,13 +734,11 @@ delete Mura.apiendpoint;
   if (context && context.res) {
-    Object.assign(connectorConfig, {
+    Object.assign(instanceConfig, {
       response: context.res,
       request: context.req
     });
-    clearMuraAPICache(); //console.log('initing', connectorConfig.siteid)
-
-    Mura.init(connectorConfig);
-  } else if (startingsiteid != connectorConfig.siteid) {
-    //console.log('changing siteid',startingsiteid,connectorConfig.siteid)
     clearMuraAPICache();
-    Mura.init(connectorConfig);
+    Mura.init(instanceConfig);
+  } else if (startingsiteid != instanceConfig.siteid) {
+    clearMuraAPICache();
+    Mura.init(instanceConfig);
   }
@@ -708,0 +745,0 @@

dist/index.umd.js

@@ -397,10 +397,12 @@ (function (global, factory) {
 
-      if (Array.isArray(filename)) {
-        if (filename.length && filename[0] == connectorConfig.siteid) {
-          filename.shift();
-        }
+      if (!Array.isArray(filename)) {
+        filename = filename.split("/");
+      }
 
-        filename = filename.join("/");
+      if (filename.length && filename[0] == Mura.siteid) {
+        filename.shift();
       }
 
+      filename = filename.join("/");
+
       if (params) {
@@ -410,2 +412,3 @@ query = Object.assign(query, params);
 
+      console.log('filename', filename);
       return Promise.resolve(Mura.renderFilename(filename, query).then(function (rendered) {
@@ -462,3 +465,3 @@ return Promise.resolve(rendered);
       return item.length;
-    });
+    }); //This shouldn't happen
 
@@ -518,2 +521,6 @@ if (connectorConfig.siteidinurls) {
 
+      if (ConnectorConfig.multitenant) {
+        return Promise.resolve([]);
+      }
+
       var siteids = ConnectorConfig.siteid;
@@ -556,8 +563,3 @@ var pathList = [];
     Mura.styleMap = Mura__default["default"].styleMap;
-    var instanceConfig = Object.assign({}, ConnectorConfig);
 
-    if (!Array.isArray(instanceConfig.siteid)) {
-      instanceConfig.siteid = instanceConfig.siteid.split();
-    }
-
     if (typeof Mura.deInit == 'function') {
@@ -569,12 +571,30 @@ try {
 
-    if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
-      return item === context;
-    })) {
-      instanceConfig.siteid = context;
+    var instanceConfig = Object.assign({}, ConnectorConfig);
+
+    if (instanceConfig.multitenant) {
+      if (typeof context == 'string') {
+        instanceConfig.siteid = context;
+      } else {
+        var _context$params, _context$params$page;
+
+        if (context != null && (_context$params = context.params) != null && (_context$params$page = _context$params.page) != null && _context$params$page.length) {
+          instanceConfig.siteid = context.params.page[0];
+        } else {
+          instanceConfig.siteid = 'default';
+        }
+      }
     } else {
-      var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+      if (!Array.isArray(instanceConfig.siteid)) {
+        instanceConfig.siteid = instanceConfig.siteid.split();
+      }
 
-      if (Array.isArray(ConnectorConfig.siteid)) {
+      if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
+        return item === context;
+      })) {
+        instanceConfig.siteid = context;
+      } else {
+        var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == instanceConfig.editroute + "/");
+
         if (ishomepage) {
-          instanceConfig.siteid = ConnectorConfig.siteid[0];
+          instanceConfig.siteid = instanceConfig.siteid[0];
         } else {
@@ -594,3 +614,3 @@ var page = [];
 
-            if (page.length && ConnectorConfig.editroute && page[0] === ConnectorConfig.editroute.split("/")[1]) {
+            if (page.length && instanceConfig.editroute && page[0] === instanceConfig.editroute.split("/")[1]) {
               page.shift();
@@ -601,3 +621,3 @@ }
           if (page.length) {
-            if (ConnectorConfig.siteid.find(function (item) {
+            if (instanceConfig.siteid.find(function (item) {
               return item === page[0];
@@ -608,4 +628,6 @@ })) {
             } else {
-              instanceConfig.siteid = ConnectorConfig.siteid[0];
+              instanceConfig.siteid = instanceConfig.siteid[0];
             }
+          } else {
+            instanceConfig.siteid = instanceConfig.siteid[0];
           }
@@ -620,7 +642,5 @@ }
         request: context.req
-      }); //console.log('initing', connectorConfig.siteid)
-
+      });
       Mura.init(instanceConfig);
     } else if (startingsiteid != instanceConfig.siteid) {
-      //console.log('changing siteid',startingsiteid,connectorConfig.siteid)
       Mura.init(instanceConfig);
@@ -640,17 +660,34 @@ }
     var startingsiteid = Mura.siteid;
+    var instanceConfig = Object.assign({}, ConnectorConfig);
 
-    if (!Array.isArray(ConnectorConfig.siteid)) {
-      ConnectorConfig.siteid = v.siteid.split();
-    }
+    if (instanceConfig.multitenant) {
+      if (typeof context == 'string') {
+        instanceConfig.siteid = context;
+      } else {
+        var _context$params2, _context$params2$page;
 
-    if (typeof context == 'string' && ConnectorConfig.siteid.find(function (item) {
-      return item === context;
-    })) {
-      connectorConfig.siteid = context;
+        if (context != null && (_context$params2 = context.params) != null && (_context$params2$page = _context$params2.page) != null && _context$params2$page.length) {
+          instanceConfig.siteid = context.params.page[0];
+        } else {
+          if (typeof Mura != 'undefined') {
+            instanceConfig.siteid = Mura.siteid;
+          } else {
+            instanceConfig.siteid = 'default';
+          }
+        }
+      }
     } else {
-      var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+      if (!Array.isArray(instanceConfig.siteid)) {
+        instanceConfig.siteid = instanceConfig.siteid.split();
+      }
 
-      if (Array.isArray(ConnectorConfig.siteid)) {
+      if (typeof context == 'string' && instanceConfig.siteid.find(function (item) {
+        return item === context;
+      })) {
+        instanceConfig.siteid = context;
+      } else {
+        var ishomepage = context && !(context.params && context.params.page) || typeof location != 'undefined' && (location.pathname == "/" || location.pathname == ConnectorConfig.editroute + "/");
+
         if (ishomepage) {
-          connectorConfig.siteid = ConnectorConfig.siteid[0];
+          instanceConfig.siteid = instanceConfig.siteid[0];
         } else {
@@ -670,3 +707,3 @@ var page = [];
 
-            if (page.length && ConnectorConfig.editroute && page[0] === ConnectorConfig.editroute.split("/")[1]) {
+            if (page.length && instanceConfig.editroute && page[0] === instanceConfig.editroute.split("/")[1]) {
               page.shift();
@@ -677,10 +714,12 @@ }
           if (page.length) {
-            if (ConnectorConfig.siteid.find(function (item) {
+            if (instanceConfig.siteid.find(function (item) {
               return item === page[0];
             })) {
-              connectorConfig.siteid = page[0];
-              connectorConfig.siteidinurls = true;
+              instanceConfig.siteid = page[0];
+              instanceConfig.siteidinurls = true;
             } else {
-              connectorConfig.siteid = ConnectorConfig.siteid[0];
+              instanceConfig.siteid = instanceConfig.siteid[0];
             }
+          } else {
+            instanceConfig.siteid = instanceConfig.siteid[0];
           }
@@ -692,4 +731,4 @@ }
     var clearMuraAPICache = function clearMuraAPICache() {
-      delete connectorConfig.apiEndpoint;
-      delete connectorConfig.apiendpoint;
+      delete instanceConfig.apiEndpoint;
+      delete instanceConfig.apiendpoint;
       delete Mura.apiEndpoint;
@@ -700,13 +739,11 @@ delete Mura.apiendpoint;
     if (context && context.res) {
-      Object.assign(connectorConfig, {
+      Object.assign(instanceConfig, {
         response: context.res,
         request: context.req
       });
-      clearMuraAPICache(); //console.log('initing', connectorConfig.siteid)
-
-      Mura.init(connectorConfig);
-    } else if (startingsiteid != connectorConfig.siteid) {
-      //console.log('changing siteid',startingsiteid,connectorConfig.siteid)
       clearMuraAPICache();
-      Mura.init(connectorConfig);
+      Mura.init(instanceConfig);
+    } else if (startingsiteid != instanceConfig.siteid) {
+      clearMuraAPICache();
+      Mura.init(instanceConfig);
     }
@@ -713,0 +750,0 @@

package.json

 {
   "name": "@murasoftware/next-core",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "Core utilties for Mura.js and Next.js",
@@ -5,0 +5,0 @@ "author": "Mura Software",

No alert changes

Improved metrics

Total package byte prevSize

416400

increased by2.64%

Lines of code

3782

increased by2.77%

No dependency changes