@mjhls/mjh-framework 1.0.694-beta.3 → 1.0.695

package/dist/cjs/{index-fa8ed292.js → index-2d0a4911.js}

@@ -728,6 +728,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 () {
@@ -791,14 +793,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) {
@@ -807,34 +820,28 @@ 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()) {
-        var args = [];
-
-        var config = _this4.getLazyLoadConfig();
+      if (_this5.lazyLoadIsEnabled()) {
+        var config = _this5.getLazyLoadConfig();
 
-        if (config !== null) {
-          args.push(config);
+        if (config) {
+          pubadsService.enableLazyLoad(config);
+        } else {
+          pubadsService.enableLazyLoad();
         }
-
-        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);
       }
     });
   },
@@ -876,10 +883,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();
@@ -890,14 +897,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];
@@ -917,7 +924,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) {
@@ -940,7 +947,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,
@@ -979,7 +986,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/cjs/{index-3294d3bc.js → index-5be2866f.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
-var moment = require('./moment-575fe24c.js');
+var moment = require('./moment-66a6a284.js');
 
 var momentTimezone = _commonjsHelpers.createCommonjsModule(function (module) {
 //! moment-timezone.js

package/dist/cjs/{index-be0c82be.js → index-b5eb3ff8.js}

@@ -60,35 +60,35 @@ function parseSource(source) {
     if (typeof source === 'string' && isUrl(source)) {
         // Someone passed an existing image url?
         image = {
-            asset: { _ref: urlToId(source) }
+            asset: { _ref: urlToId(source) },
         };
     }
     else if (typeof source === 'string') {
         // Just an asset id
         image = {
-            asset: { _ref: source }
+            asset: { _ref: source },
         };
     }
     else if (isRef(source)) {
         // We just got passed an asset directly
         image = {
-            asset: source
+            asset: source,
         };
     }
     else if (isAsset(source)) {
         // If we were passed an image asset document
         image = {
             asset: {
-                _ref: source._id || ''
-            }
+                _ref: source._id || '',
+            },
         };
     }
     else if (isAssetStub(source)) {
         // If we were passed a partial asset (`url`, but no `_id`)
         image = {
             asset: {
-                _ref: urlToId(source.asset.url)
-            }
+                _ref: urlToId(source.asset.url),
+            },
         };
     }
     else if (typeof source.asset === 'object') {
@@ -129,7 +129,7 @@ function applyDefaults(image) {
             left: 0,
             top: 0,
             bottom: 0,
-            right: 0
+            right: 0,
         };
     }
     if (!result.hotspot) {
@@ -137,7 +137,7 @@ function applyDefaults(image) {
             x: 0.5,
             y: 0.5,
             height: 1.0,
-            width: 1.0
+            width: 1.0,
         };
     }
     return result;
@@ -184,7 +184,7 @@ exports.SPEC_NAME_TO_URL_NAME_MAPPINGS = [
     ['crop', 'crop'],
     ['saturation', 'sat'],
     ['auto', 'auto'],
-    ['dpr', 'dpr']
+    ['dpr', 'dpr'],
 ];
 function urlForImage(options) {
     var spec = __assign({}, (options || {}));
@@ -203,7 +203,7 @@ function urlForImage(options) {
         left: cropLeft,
         top: cropTop,
         width: Math.round(asset.width - image.crop.right * asset.width - cropLeft),
-        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop)
+        height: Math.round(asset.height - image.crop.bottom * asset.height - cropTop),
     };
     // Compute hot spot rect in terms of pixel coordinates
     var hotSpotVerticalRadius = (image.hotspot.height * asset.height) / 2;
@@ -214,7 +214,7 @@ function urlForImage(options) {
         left: hotSpotCenterX - hotSpotHorizontalRadius,
         top: hotSpotCenterY - hotSpotVerticalRadius,
         right: hotSpotCenterX + hotSpotHorizontalRadius,
-        bottom: hotSpotCenterY + hotSpotVerticalRadius
+        bottom: hotSpotCenterY + hotSpotVerticalRadius,
     };
     // If irrelevant, or if we are requested to: don't perform crop/fit based on
     // the crop/hotspot.
@@ -296,7 +296,7 @@ function fit(source, spec) {
             left: Math.round(left),
             top: Math.round(top_2),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     else {
@@ -318,13 +318,13 @@ function fit(source, spec) {
             left: Math.max(0, Math.floor(left)),
             top: Math.max(0, Math.floor(top_3)),
             width: Math.round(width),
-            height: Math.round(height)
+            height: Math.round(height),
         };
     }
     return {
         width: imgWidth,
         height: imgHeight,
-        rect: cropRect
+        rect: cropRect,
     };
 }
 
@@ -377,11 +377,12 @@ 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,
-            dataset: dataset
+            dataset: dataset,
         });
     }
     // Or just accept the options as given
@@ -394,7 +395,7 @@ var ImageUrlBuilder = /** @class */ (function () {
             ? __assign(__assign({}, (parent.options || {})), (options || {})) : __assign({}, (options || {})); // Copy options
     }
     ImageUrlBuilder.prototype.withOptions = function (options) {
-        var baseUrl = options.baseUrl || '';
+        var baseUrl = options.baseUrl || this.options.baseUrl;
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -522,7 +523,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Synonym for url()
+    // Alias for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };