@mjhls/mjh-framework 1.0.691-beta.4 → 1.0.691-beta.6

package/dist/esm/{index-73819142.js → index-3849e3fe.js}

@@ -375,7 +375,8 @@ function urlBuilder(options) {
     var client = options;
     if (isSanityClient(client)) {
         // Inherit config from client
-        var _a = client.clientConfig, apiHost = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var _a = client.clientConfig, apiUrl = _a.apiHost, projectId = _a.projectId, dataset = _a.dataset;
+        var apiHost = apiUrl || 'https://api.sanity.io';
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,

package/dist/esm/{index-0e45a0b2.js → index-3f4dd6f2.js}

@@ -722,6 +722,8 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
     return new Promise(function (resolve) {
       _this3.getGoogletag().then(function (googletag) {
+        _this3.configureInitialOptions(googletag);
+
         slotsToInitialize.forEach(function (currentSlotId) {
           registeredSlots[currentSlotId].loading = false;
           googletag.cmd.push(function () {
@@ -785,14 +787,25 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
       });
     });
   },
-  configureOptions: function configureOptions(googletag) {
+  // configure those gpt parameters that need to be set before pubsads service
+  // initialization.
+  configureInitialOptions: function configureInitialOptions(googletag) {
     var _this4 = this;
 
+    googletag.cmd.push(function () {
+      if (_this4.disableInitialLoadIsEnabled()) {
+        googletag.pubads().disableInitialLoad();
+      }
+    });
+  },
+  configureOptions: function configureOptions(googletag) {
+    var _this5 = this;
+
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
-      pubadsService.setRequestNonPersonalizedAds(_this4.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
 
-      var targetingArguments = _this4.getTargetingArguments(); // set global targetting arguments
+      var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
 
 
       Object.keys(targetingArguments).forEach(function (varName) {
@@ -801,16 +814,16 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         }
       }); // set global adSense attributes
 
-      var adSenseAttributes = _this4.getAdSenseAttributes();
+      var adSenseAttributes = _this5.getAdSenseAttributes();
 
       Object.keys(adSenseAttributes).forEach(function (key) {
         pubadsService.set(key, adSenseAttributes[key]);
       });
 
-      if (_this4.lazyLoadIsEnabled()) {
+      if (_this5.lazyLoadIsEnabled()) {
         var args = [];
 
-        var config = _this4.getLazyLoadConfig();
+        var config = _this5.getLazyLoadConfig();
 
         if (config !== null) {
           args.push(config);
@@ -819,16 +832,12 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         pubadsService.enableLazyLoad.call(args);
       }
 
-      if (_this4.singleRequestIsEnabled()) {
+      if (_this5.singleRequestIsEnabled()) {
         pubadsService.enableSingleRequest();
       }
 
-      if (_this4.disableInitialLoadIsEnabled()) {
-        pubadsService.disableInitialLoad();
-      }
-
-      if (_this4.collapseEmptyDivs === true || _this4.collapseEmptyDivs === false) {
-        pubadsService.collapseEmptyDivs(_this4.collapseEmptyDivs);
+      if (_this5.collapseEmptyDivs === true || _this5.collapseEmptyDivs === false) {
+        pubadsService.collapseEmptyDivs(_this5.collapseEmptyDivs);
       }
     });
   },
@@ -870,10 +879,10 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this5 = this;
+    var _this6 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this5.configureOptions(googletag);
+      _this6.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -884,14 +893,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this6.load();
+      return _this7.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this7 = this;
+    var _this8 = this;
 
     for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       slotsToDestroy[_key4] = arguments[_key4];
@@ -911,7 +920,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this7.getGoogletag().then(function (googletag) {
+      _this8.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -934,7 +943,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this8 = this;
+    var _this9 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -973,7 +982,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this8.load(slotId);
+              _this9.load(slotId);
             }
           }
         });

package/dist/esm/index.js

@@ -14,7 +14,7 @@ import './web.dom.iterable-8956f9a5.js';
 import './typeof-08f2c380.js';
 import './_is-array-49698029.js';
 import 'react';
-import './index-0e45a0b2.js';
+import './index-3f4dd6f2.js';
 import 'prop-types';
 import 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
@@ -27,9 +27,9 @@ import './debounce-1a993acf.js';
 import './index.es-29c1cef5.js';
 import 'react-dom';
 import './visibility-sensor-0baa4eea.js';
-import './index-73819142.js';
+import './index-3849e3fe.js';
 import './index-5f9f807a.js';
-import './main-5d1e4bd3.js';
+import './main-35ff7b4f.js';
 import './entities-7cc3bf45.js';
 import './stringify-008c8802.js';
 import './slicedToArray-7021e5df.js';
@@ -38,10 +38,10 @@ import './_set-species-cede29f8.js';
 export { default as Segment } from './Segment.js';
 export { default as Beam } from './Beam.js';
 export { default as AdSlot } from './AdSlot.js';
-import './ADInfeed-ffcb5391.js';
+import './ADInfeed-af6b0616.js';
 export { default as DeckContent } from './DeckContent.js';
-import './lodash-17fdfebb.js';
-import './ADlgInfeed-6df5151e.js';
+import './lodash-ec8c6b48.js';
+import './ADlgInfeed-27ba8238.js';
 import './getContentCategory-15dcc413.js';
 import './get-5ee14cda.js';
 export { default as AD } from './AD.js';
@@ -50,7 +50,7 @@ export { default as GridContent } from './GridContent.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
-import './BlockContent-e9b4ddcf.js';
+import './BlockContent-c409aca5.js';
 import './react-social-icons-a7d5c5c7.js';
 export { default as TaxonomyCard } from './TaxonomyCard.js';
 export { default as RolesDeck } from './RolesDeck.js';
@@ -79,7 +79,7 @@ import 'react-bootstrap/Form';
 import './index-ef6d5dcf.js';
 import './js.cookie-6874175c.js';
 export { default as CMEDeck } from './CMEDeck.js';
-export { g as getSerializers } from './index-1ee3baee.js';
+export { g as getSerializers } from './index-273cc821.js';
 import './util-7700fc59.js';
 import './brightcove-react-player-loader.es-83f53e4e.js';
 import 'react-bootstrap/Pagination';
@@ -110,7 +110,7 @@ import './NavFooter-e27bd93b.js';
 import './index.esm-fd746768.js';
 export { default as SocialIcons } from './SocialIcons.js';
 import 'react-bootstrap/FormControl';
-import './SocialSearchComponent-93233334.js';
+import './SocialSearchComponent-677ed3bd.js';
 export { default as NavMagazine } from './NavMagazine.js';
 export { NavNative } from './NavNative.js';
 export { default as Search } from './Search.js';

package/dist/esm/{lodash-17fdfebb.js → lodash-ec8c6b48.js}

@@ -7,7 +7,7 @@ var lodash = createCommonjsModule(function (module, exports) {
   var undefined$1;
 
   /** Used as the semantic version number. */
-  var VERSION = '4.17.15';
+  var VERSION = '4.17.20';
 
   /** Used as the size to enable large array optimizations. */
   var LARGE_ARRAY_SIZE = 200;
@@ -3714,8 +3714,21 @@ var lodash = createCommonjsModule(function (module, exports) {
      * @returns {Array} Returns the new sorted array.
      */
     function baseOrderBy(collection, iteratees, orders) {
+      if (iteratees.length) {
+        iteratees = arrayMap(iteratees, function(iteratee) {
+          if (isArray(iteratee)) {
+            return function(value) {
+              return baseGet(value, iteratee.length === 1 ? iteratee[0] : iteratee);
+            }
+          }
+          return iteratee;
+        });
+      } else {
+        iteratees = [identity];
+      }
+
       var index = -1;
-      iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(getIteratee()));
+      iteratees = arrayMap(iteratees, baseUnary(getIteratee()));
 
       var result = baseMap(collection, function(value, key, collection) {
         var criteria = arrayMap(iteratees, function(iteratee) {
@@ -3972,6 +3985,10 @@ var lodash = createCommonjsModule(function (module, exports) {
         var key = toKey(path[index]),
             newValue = value;
 
+        if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+          return object;
+        }
+
         if (index != lastIndex) {
           var objValue = nested[key];
           newValue = customizer ? customizer(objValue, key, nested) : undefined$1;
@@ -4124,11 +4141,14 @@ var lodash = createCommonjsModule(function (module, exports) {
      *  into `array`.
      */
     function baseSortedIndexBy(array, value, iteratee, retHighest) {
-      value = iteratee(value);
-
       var low = 0,
-          high = array == null ? 0 : array.length,
-          valIsNaN = value !== value,
+          high = array == null ? 0 : array.length;
+      if (high === 0) {
+        return 0;
+      }
+
+      value = iteratee(value);
+      var valIsNaN = value !== value,
           valIsNull = value === null,
           valIsSymbol = isSymbol(value),
           valIsUndefined = value === undefined$1;
@@ -5613,10 +5633,11 @@ var lodash = createCommonjsModule(function (module, exports) {
       if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
         return false;
       }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(array);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
+      // Check that cyclic values are equal.
+      var arrStacked = stack.get(array);
+      var othStacked = stack.get(other);
+      if (arrStacked && othStacked) {
+        return arrStacked == other && othStacked == array;
       }
       var index = -1,
           result = true,
@@ -5778,10 +5799,11 @@ var lodash = createCommonjsModule(function (module, exports) {
           return false;
         }
       }
-      // Assume cyclic values are equal.
-      var stacked = stack.get(object);
-      if (stacked && stack.get(other)) {
-        return stacked == other;
+      // Check that cyclic values are equal.
+      var objStacked = stack.get(object);
+      var othStacked = stack.get(other);
+      if (objStacked && othStacked) {
+        return objStacked == other && othStacked == object;
       }
       var result = true;
       stack.set(object, other);
@@ -9162,6 +9184,10 @@ var lodash = createCommonjsModule(function (module, exports) {
      * // The `_.property` iteratee shorthand.
      * _.filter(users, 'active');
      * // => objects for ['barney']
+     *
+     * // Combining several predicates using `_.overEvery` or `_.overSome`.
+     * _.filter(users, _.overSome([{ 'age': 36 }, ['age', 40]]));
+     * // => objects for ['fred', 'barney']
      */
     function filter(collection, predicate) {
       var func = isArray(collection) ? arrayFilter : baseFilter;
@@ -9911,15 +9937,15 @@ var lodash = createCommonjsModule(function (module, exports) {
      * var users = [
      *   { 'user': 'fred',   'age': 48 },
      *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 },
+     *   { 'user': 'fred',   'age': 30 },
      *   { 'user': 'barney', 'age': 34 }
      * ];
      *
      * _.sortBy(users, [function(o) { return o.user; }]);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 30]]
      *
      * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 30], ['fred', 48]]
      */
     var sortBy = baseRest(function(collection, iteratees) {
       if (collection == null) {
@@ -14794,11 +14820,11 @@ var lodash = createCommonjsModule(function (module, exports) {
 
       // Use a sourceURL for easier debugging.
       // The sourceURL gets injected into the source that's eval-ed, so be careful
-      // with lookup (in case of e.g. prototype pollution), and strip newlines if any.
-      // A newline wouldn't be a valid sourceURL anyway, and it'd enable code injection.
+      // to normalize all kinds of whitespace, so e.g. newlines (and unicode versions of it) can't sneak in
+      // and escape the comment, thus injecting code that gets evaled.
       var sourceURL = '//# sourceURL=' +
         (hasOwnProperty.call(options, 'sourceURL')
-          ? (options.sourceURL + '').replace(/[\r\n]/g, ' ')
+          ? (options.sourceURL + '').replace(/\s/g, ' ')
           : ('lodash.templateSources[' + (++templateCounter) + ']')
         ) + '\n';
 
@@ -14831,8 +14857,6 @@ var lodash = createCommonjsModule(function (module, exports) {
 
       // If `variable` is not specified wrap a with-statement around the generated
       // code to add the data object to the top of the scope chain.
-      // Like with sourceURL, we take care to not check the option's prototype,
-      // as this configuration is a code injection vector.
       var variable = hasOwnProperty.call(options, 'variable') && options.variable;
       if (!variable) {
         source = 'with (obj) {\n' + source + '\n}\n';
@@ -15539,6 +15563,9 @@ var lodash = createCommonjsModule(function (module, exports) {
      * values against any array or object value, respectively. See `_.isEqual`
      * for a list of supported value comparisons.
      *
+     * **Note:** Multiple values can be checked by combining several matchers
+     * using `_.overSome`
+     *
      * @static
      * @memberOf _
      * @since 3.0.0
@@ -15554,6 +15581,10 @@ var lodash = createCommonjsModule(function (module, exports) {
      *
      * _.filter(objects, _.matches({ 'a': 4, 'c': 6 }));
      * // => [{ 'a': 4, 'b': 5, 'c': 6 }]
+     *
+     * // Checking for several possible values
+     * _.filter(objects, _.overSome([_.matches({ 'a': 1 }), _.matches({ 'a': 4 })]));
+     * // => [{ 'a': 1, 'b': 2, 'c': 3 }, { 'a': 4, 'b': 5, 'c': 6 }]
      */
     function matches(source) {
       return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
@@ -15568,6 +15599,9 @@ var lodash = createCommonjsModule(function (module, exports) {
      * `srcValue` values against any array or object value, respectively. See
      * `_.isEqual` for a list of supported value comparisons.
      *
+     * **Note:** Multiple values can be checked by combining several matchers
+     * using `_.overSome`
+     *
      * @static
      * @memberOf _
      * @since 3.2.0
@@ -15584,6 +15618,10 @@ var lodash = createCommonjsModule(function (module, exports) {
      *
      * _.find(objects, _.matchesProperty('a', 4));
      * // => { 'a': 4, 'b': 5, 'c': 6 }
+     *
+     * // Checking for several possible values
+     * _.filter(objects, _.overSome([_.matchesProperty('a', 1), _.matchesProperty('a', 4)]));
+     * // => [{ 'a': 1, 'b': 2, 'c': 3 }, { 'a': 4, 'b': 5, 'c': 6 }]
      */
     function matchesProperty(path, srcValue) {
       return baseMatchesProperty(path, baseClone(srcValue, CLONE_DEEP_FLAG));
@@ -15807,6 +15845,10 @@ var lodash = createCommonjsModule(function (module, exports) {
      * Creates a function that checks if **all** of the `predicates` return
      * truthy when invoked with the arguments it receives.
      *
+     * Following shorthands are possible for providing predicates.
+     * Pass an `Object` and it will be used as an parameter for `_.matches` to create the predicate.
+     * Pass an `Array` of parameters for `_.matchesProperty` and the predicate will be created using them.
+     *
      * @static
      * @memberOf _
      * @since 4.0.0
@@ -15833,6 +15875,10 @@ var lodash = createCommonjsModule(function (module, exports) {
      * Creates a function that checks if **any** of the `predicates` return
      * truthy when invoked with the arguments it receives.
      *
+     * Following shorthands are possible for providing predicates.
+     * Pass an `Object` and it will be used as an parameter for `_.matches` to create the predicate.
+     * Pass an `Array` of parameters for `_.matchesProperty` and the predicate will be created using them.
+     *
      * @static
      * @memberOf _
      * @since 4.0.0
@@ -15852,6 +15898,9 @@ var lodash = createCommonjsModule(function (module, exports) {
      *
      * func(NaN);
      * // => false
+     *
+     * var matchesFunc = _.overSome([{ 'a': 1 }, { 'a': 2 }])
+     * var matchesPropertyFunc = _.overSome([['a', 1], ['a', 2]])
      */
     var overSome = createOver(arraySome);
 

package/dist/esm/{main-5d1e4bd3.js → main-35ff7b4f.js}

@@ -848,4 +848,4 @@ var main_47 = main.osName;
 var main_48 = main.osVersion;
 var main_49 = main.withOrientationChange;
 
-export { main_37 as a, main_16 as b, main_35 as c, main_30 as d, main_36 as m };
+export { main_37 as a, main_16 as b, main_22 as c, main_35 as d, main_30 as e, main_36 as m };

package/dist/esm/urlFor.js

@@ -1,5 +1,5 @@
 import './_commonjsHelpers-0c4b6f40.js';
-import { i as imageUrlBuilder } from './index-73819142.js';
+import { i as imageUrlBuilder } from './index-3849e3fe.js';
 
 // Sanity image auto formating
 function urlFor(client, source) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.691-beta.4",
+  "version": "1.0.691-beta.6",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",
@@ -20,8 +20,8 @@
     "test:watch": "react-scripts test --env=jsdom",
     "build": "npm run clean && rollup -c",
     "start": "npm run clean && rollup -c -w",
-    "prepare": "yarn run build",
-    "predeploy": "cd example && yarn install && yarn run build",
+    "prepare": "npm run build",
+    "predeploy": "cd example && npm install && npm run build",
     "deploy": "gh-pages -d example/build"
   },
   "peerDependencies": {