@mjhls/mjh-framework 1.0.625 → 1.0.626-iOS-chrome-fix

package/dist/cjs/getRelatedArticle.js

@@ -1,6 +1,6 @@
 'use strict';
 
-require('./_commonjsHelpers-06173234.js');
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 require('./_to-object-329a650b.js');
 require('./core.get-iterator-method-41e87ec1.js');
 require('./_library-dd23b178.js');
@@ -8,9 +8,358 @@ require('./_iter-detect-4d0352f8.js');
 require('./web.dom.iterable-43c3e277.js');
 var asyncToGenerator = require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
-var nookies = require('nookies');
+var index$4 = require('./index-bd6c9f56.js');
 var getQuery = require('./getQuery.js');
 
+var defaultParseOptions = {
+  decodeValues: true,
+  map: false,
+  silent: false,
+};
+
+function isNonEmptyString(str) {
+  return typeof str === "string" && !!str.trim();
+}
+
+function parseString(setCookieValue, options) {
+  var parts = setCookieValue.split(";").filter(isNonEmptyString);
+  var nameValue = parts.shift().split("=");
+  var name = nameValue.shift();
+  var value = nameValue.join("="); // everything after the first =, joined by a "=" if there was more than one part
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  var cookie = {
+    name: name, // grab everything before the first =
+    value: options.decodeValues ? decodeURIComponent(value) : value, // decode cookie value
+  };
+
+  parts.forEach(function (part) {
+    var sides = part.split("=");
+    var key = sides.shift().trimLeft().toLowerCase();
+    var value = sides.join("=");
+    if (key === "expires") {
+      cookie.expires = new Date(value);
+    } else if (key === "max-age") {
+      cookie.maxAge = parseInt(value, 10);
+    } else if (key === "secure") {
+      cookie.secure = true;
+    } else if (key === "httponly") {
+      cookie.httpOnly = true;
+    } else if (key === "samesite") {
+      cookie.sameSite = value;
+    } else {
+      cookie[key] = value;
+    }
+  });
+
+  return cookie;
+}
+
+function parse(input, options) {
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!input) {
+    if (!options.map) {
+      return [];
+    } else {
+      return {};
+    }
+  }
+
+  if (input.headers && input.headers["set-cookie"]) {
+    // fast-path for node.js (which automatically normalizes header names to lower-case
+    input = input.headers["set-cookie"];
+  } else if (input.headers) {
+    // slow-path for other environments - see #25
+    var sch =
+      input.headers[
+        Object.keys(input.headers).find(function (key) {
+          return key.toLowerCase() === "set-cookie";
+        })
+      ];
+    // warn if called on a request-like object with a cookie header rather than a set-cookie header - see #34, 36
+    if (!sch && input.headers.cookie && !options.silent) {
+      console.warn(
+        "Warning: set-cookie-parser appears to have been called on a request object. It is designed to parse Set-Cookie headers from responses, not Cookie headers from requests. Set the option {silent: true} to suppress this warning."
+      );
+    }
+    input = sch;
+  }
+  if (!Array.isArray(input)) {
+    input = [input];
+  }
+
+  options = options
+    ? Object.assign({}, defaultParseOptions, options)
+    : defaultParseOptions;
+
+  if (!options.map) {
+    return input.filter(isNonEmptyString).map(function (str) {
+      return parseString(str, options);
+    });
+  } else {
+    var cookies = {};
+    return input.filter(isNonEmptyString).reduce(function (cookies, str) {
+      var cookie = parseString(str, options);
+      cookies[cookie.name] = cookie;
+      return cookies;
+    }, cookies);
+  }
+}
+
+/*
+  Set-Cookie header field-values are sometimes comma joined in one string. This splits them without choking on commas
+  that are within a single set-cookie field-value, such as in the Expires portion.
+
+  This is uncommon, but explicitly allowed - see https://tools.ietf.org/html/rfc2616#section-4.2
+  Node.js does this for every header *except* set-cookie - see https://github.com/nodejs/node/blob/d5e363b77ebaf1caf67cd7528224b651c86815c1/lib/_http_incoming.js#L128
+  React Native's fetch does this for *every* header, including set-cookie.
+
+  Based on: https://github.com/google/j2objc/commit/16820fdbc8f76ca0c33472810ce0cb03d20efe25
+  Credits to: https://github.com/tomball for original and https://github.com/chrusart for JavaScript implementation
+*/
+function splitCookiesString(cookiesString) {
+  if (Array.isArray(cookiesString)) {
+    return cookiesString;
+  }
+  if (typeof cookiesString !== "string") {
+    return [];
+  }
+
+  var cookiesStrings = [];
+  var pos = 0;
+  var start;
+  var ch;
+  var lastComma;
+  var nextStart;
+  var cookiesSeparatorFound;
+
+  function skipWhitespace() {
+    while (pos < cookiesString.length && /\s/.test(cookiesString.charAt(pos))) {
+      pos += 1;
+    }
+    return pos < cookiesString.length;
+  }
+
+  function notSpecialChar() {
+    ch = cookiesString.charAt(pos);
+
+    return ch !== "=" && ch !== ";" && ch !== ",";
+  }
+
+  while (pos < cookiesString.length) {
+    start = pos;
+    cookiesSeparatorFound = false;
+
+    while (skipWhitespace()) {
+      ch = cookiesString.charAt(pos);
+      if (ch === ",") {
+        // ',' is a cookie separator if we have later first '=', not ';' or ','
+        lastComma = pos;
+        pos += 1;
+
+        skipWhitespace();
+        nextStart = pos;
+
+        while (pos < cookiesString.length && notSpecialChar()) {
+          pos += 1;
+        }
+
+        // currently special character
+        if (pos < cookiesString.length && cookiesString.charAt(pos) === "=") {
+          // we found cookies separator
+          cookiesSeparatorFound = true;
+          // pos is inside the next cookie, so back up and return it.
+          pos = nextStart;
+          cookiesStrings.push(cookiesString.substring(start, lastComma));
+          start = pos;
+        } else {
+          // in param ',' or param separator ';',
+          // we continue from that comma
+          pos = lastComma + 1;
+        }
+      } else {
+        pos += 1;
+      }
+    }
+
+    if (!cookiesSeparatorFound || pos >= cookiesString.length) {
+      cookiesStrings.push(cookiesString.substring(start, cookiesString.length));
+    }
+  }
+
+  return cookiesStrings;
+}
+
+var setCookie = parse;
+var parse_1 = parse;
+var parseString_1 = parseString;
+var splitCookiesString_1 = splitCookiesString;
+setCookie.parse = parse_1;
+setCookie.parseString = parseString_1;
+setCookie.splitCookiesString = splitCookiesString_1;
+
+var dist = _commonjsHelpers.createCommonjsModule(function (module, exports) {
+var __assign = (_commonjsHelpers.commonjsGlobal && _commonjsHelpers.commonjsGlobal.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.destroyCookie = exports.setCookie = exports.parseCookies = void 0;
+
+
+var isBrowser = function () { return typeof window !== 'undefined'; };
+function hasSameProperties(a, b) {
+    var aProps = Object.getOwnPropertyNames(a);
+    var bProps = Object.getOwnPropertyNames(b);
+    if (aProps.length !== bProps.length) {
+        return false;
+    }
+    for (var i = 0; i < aProps.length; i++) {
+        var propName = aProps[i];
+        if (a[propName] !== b[propName]) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Compare the cookie and return true if the cookies has equivalent
+ * options and the cookies would be overwritten in the browser storage.
+ *
+ * @param a first Cookie for comparison
+ * @param b second Cookie for comparison
+ */
+function areCookiesEqual(a, b) {
+    var sameSiteSame = a.sameSite === b.sameSite;
+    if (typeof a.sameSite === 'string' && typeof b.sameSite === 'string') {
+        sameSiteSame = a.sameSite.toLowerCase() === b.sameSite.toLowerCase();
+    }
+    return (hasSameProperties(__assign(__assign({}, a), { sameSite: undefined }), __assign(__assign({}, b), { sameSite: undefined })) && sameSiteSame);
+}
+/**
+ * Create an instance of the Cookie interface
+ *
+ * @param name name of the Cookie
+ * @param value value of the Cookie
+ * @param options Cookie options
+ */
+function createCookie(name, value, options) {
+    var sameSite = options.sameSite;
+    if (sameSite === true) {
+        sameSite = 'strict';
+    }
+    if (sameSite === undefined || sameSite === false) {
+        sameSite = 'lax';
+    }
+    var cookieToSet = __assign(__assign({}, options), { sameSite: sameSite });
+    delete cookieToSet.encode;
+    return __assign({ name: name, value: value }, cookieToSet);
+}
+/**
+ *
+ * Parses cookies.
+ *
+ * @param ctx
+ * @param options
+ */
+function parseCookies(ctx, options) {
+    if (ctx && ctx.req && ctx.req.headers && ctx.req.headers.cookie) {
+        return index$4.cookie.parse(ctx.req.headers.cookie, options);
+    }
+    if (isBrowser()) {
+        return index$4.cookie.parse(document.cookie, options);
+    }
+    return {};
+}
+exports.parseCookies = parseCookies;
+/**
+ *
+ * Sets a cookie.
+ *
+ * @param ctx
+ * @param name
+ * @param value
+ * @param options
+ */
+function setCookie$1(ctx, name, value, options) {
+    if (ctx && ctx.res && ctx.res.getHeader && ctx.res.setHeader) {
+        var cookies = ctx.res.getHeader('Set-Cookie') || [];
+        if (typeof cookies === 'string')
+            cookies = [cookies];
+        if (typeof cookies === 'number')
+            cookies = [];
+        var parsedCookies = setCookie.parse(cookies);
+        var cookiesToSet_1 = [];
+        parsedCookies.forEach(function (parsedCookie) {
+            if (!areCookiesEqual(parsedCookie, createCookie(name, value, options))) {
+                cookiesToSet_1.push(index$4.cookie.serialize(parsedCookie.name, parsedCookie.value, __assign({ encode: function (val) { return val; } }, parsedCookie)));
+            }
+        });
+        cookiesToSet_1.push(index$4.cookie.serialize(name, value, options));
+        if (!ctx.res.finished) {
+            ctx.res.setHeader('Set-Cookie', cookiesToSet_1);
+        }
+    }
+    if (isBrowser()) {
+        if (options && options.httpOnly) {
+            throw new Error('Can not set a httpOnly cookie in the browser.');
+        }
+        document.cookie = index$4.cookie.serialize(name, value, options);
+    }
+    return {};
+}
+exports.setCookie = setCookie$1;
+/**
+ *
+ * Destroys a cookie with a particular name.
+ *
+ * @param ctx
+ * @param name
+ * @param options
+ */
+function destroyCookie(ctx, name, options) {
+    var opts = __assign(__assign({}, (options || {})), { maxAge: -1 });
+    if (ctx && ctx.res && ctx.res.setHeader && ctx.res.getHeader) {
+        var cookies = ctx.res.getHeader('Set-Cookie') || [];
+        if (typeof cookies === 'string')
+            cookies = [cookies];
+        if (typeof cookies === 'number')
+            cookies = [];
+        cookies.push(index$4.cookie.serialize(name, '', opts));
+        ctx.res.setHeader('Set-Cookie', cookies);
+    }
+    if (isBrowser()) {
+        document.cookie = index$4.cookie.serialize(name, '', opts);
+    }
+    return {};
+}
+exports.destroyCookie = destroyCookie;
+exports.default = {
+    set: setCookie$1,
+    get: parseCookies,
+    destroy: destroyCookie,
+};
+
+});
+
+_commonjsHelpers.unwrapExports(dist);
+var dist_1 = dist.destroyCookie;
+var dist_2 = dist.setCookie;
+var dist_3 = dist.parseCookies;
+
 var _this = undefined;
 
 var getRelatedArticle = function () {
@@ -63,13 +412,13 @@ var getRelatedArticle = function () {
             conditions = '';
 
             if (ctx && url) {
-              cookies = nookies.parseCookies(ctx);
+              cookies = dist_3(ctx);
               prevSlugs = cookies['prevSlugs'];
 
               if (!!prevSlugs) {
-                nookies.setCookie(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
+                dist_2(ctx, 'prevSlugs', prevSlugs + ',"' + url + '"', {});
                 conditions = '&& !(url.current in [' + prevSlugs + '])';
-              } else nookies.setCookie(ctx, 'prevSlugs', '"' + url + '"', {});
+              } else dist_2(ctx, 'prevSlugs', '"' + url + '"', {});
             }
             relatedArticleQuery = getQuery('related', conditions, '', articleCount);
             _context.next = 12;

package/dist/cjs/getSerializers.js

@@ -9,24 +9,24 @@ require('./toConsumableArray-bee80df5.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
 require('./_object-sap-5e74ba08.js');
-require('./inherits-dca612fa.js');
+require('./inherits-227da8e1.js');
 require('./define-property-f4d12f4e.js');
 require('./web.dom.iterable-43c3e277.js');
 require('./typeof-1869832c.js');
 require('./_is-array-754e012d.js');
 require('react');
-require('./index-f7ee1612.js');
+require('./index-fa3cec70.js');
 require('prop-types');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
-require('./moment-66a6a284.js');
+require('./moment-575fe24c.js');
 require('next/router');
 require('./isSymbol-488934a7.js');
 require('./debounce-32e57002.js');
 require('react-dom');
-require('./index-b5eb3ff8.js');
+require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
-require('./main-bc4db521.js');
+require('./main-a4cb15bb.js');
 require('./entities-310b46ee.js');
 require('./stringify-7c5aff47.js');
 require('./slicedToArray-8063ee51.js');
@@ -34,12 +34,12 @@ require('./asyncToGenerator-8e707718.js');
 require('./_set-species-4458e975.js');
 require('./beam-d22818d3.js');
 require('./AdSlot.js');
-require('./BlockContent-f942392e.js');
+require('./BlockContent-c2168db0.js');
 require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-77531536.js');
+var getSerializers = require('./index-2cc1225c.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/{index-77531536.js → index-2cc1225c.js}

@@ -5,24 +5,24 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
 var toConsumableArray = require('./toConsumableArray-bee80df5.js');
 var _extends = require('./extends-60837c34.js');
-var inherits = require('./inherits-dca612fa.js');
+var inherits = require('./inherits-227da8e1.js');
 var React = require('react');
 var React__default = _interopDefault(React);
-var index = require('./index-f7ee1612.js');
+var index = require('./index-fa3cec70.js');
 var PropTypes = _interopDefault(require('prop-types'));
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
-var moment = require('./moment-66a6a284.js');
+var moment = require('./moment-575fe24c.js');
 var Router = require('next/router');
 var Router__default = _interopDefault(Router);
-var index$1 = require('./index-b5eb3ff8.js');
+var index$1 = require('./index-39beccb3.js');
 var index$2 = require('./index-fa0fb52c.js');
-var main = require('./main-bc4db521.js');
+var main = require('./main-a4cb15bb.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-8063ee51.js');
 var Segment = require('./beam-d22818d3.js');
 var AdSlot = require('./AdSlot.js');
-var BlockContent = require('./BlockContent-f942392e.js');
+var BlockContent = require('./BlockContent-c2168db0.js');
 var smoothscroll = require('./smoothscroll-95231a70.js');
 var GroupDeck = require('./GroupDeck.js');
 var reactBootstrap = require('react-bootstrap');
@@ -7486,7 +7486,7 @@ var Poll = function Poll(_ref) {
   );
 };
 
-var numberOfPaginations = main.main_38 ? 4 : 10;
+var numberOfPaginations = main.main_35 ? 4 : 10;
 
 var Quiz = function Quiz(_ref) {
   var quizzes = _ref.quizzes,
@@ -7599,7 +7599,7 @@ var Quiz = function Quiz(_ref) {
   var renderPagination = function renderPagination() {
     return React__default.createElement(
       Pagination,
-      { className: 'p-0 m-0', size: main.main_38 && 'sm' },
+      { className: 'p-0 m-0', size: main.main_35 && 'sm' },
       React__default.createElement(Pagination.First, { onClick: function onClick() {
           return changePage('first');
         }, disabled: currentPage === 1 }),
@@ -8181,7 +8181,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
     //const activeArticle = path
     //let targeting = getTargeting({ article: activeArticle, cpModificationRequired, position: props.position, prevUrl })
 
-    if (!main.main_39) {
+    if (!main.main_36) {
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {
           index.lib_3.refresh();
@@ -8189,7 +8189,7 @@ var ArticleSeries = function ArticleSeries(_ref) {
       });
     }
     //Refresh leaderboard ad on mobile
-    if (main.main_39) {
+    if (main.main_36) {
       var leaderboardSlotId = '';
       index.lib_3.getGoogletag().then(function (googletag) {
         if (window.googletag && googletag.pubadsReady) {

package/dist/cjs/{index-5be2866f.js → index-3294d3bc.js}

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

package/dist/cjs/{index-b5eb3ff8.js → index-39beccb3.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
     };
 }
 
@@ -382,7 +382,7 @@ function urlBuilder(options) {
         return new ImageUrlBuilder(null, {
             baseUrl: apiHost.replace(/^https:\/\/api\./, 'https://cdn.'),
             projectId: projectId,
-            dataset: dataset,
+            dataset: dataset
         });
     }
     // Or just accept the options as given
@@ -395,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 || this.options.baseUrl;
+        var baseUrl = options.baseUrl || '';
         var newOptions = { baseUrl: baseUrl };
         for (var key in options) {
             if (options.hasOwnProperty(key)) {
@@ -523,7 +523,7 @@ var ImageUrlBuilder = /** @class */ (function () {
     ImageUrlBuilder.prototype.url = function () {
         return urlForImage_1$1.default(this.options);
     };
-    // Alias for url()
+    // Synonym for url()
     ImageUrlBuilder.prototype.toString = function () {
         return this.url();
     };