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

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('./es6.string.iterator-cc0bbaa4.js');
 require('./_library-dd23b178.js');
@@ -9,9 +9,358 @@ require('./core.get-iterator-method-f62321d4.js');
 require('./web.dom.iterable-a0e279c1.js');
 var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.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 () {
@@ -71,13 +420,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

@@ -41,7 +41,7 @@ require('./smoothscroll-95231a70.js');
 require('./GroupDeck.js');
 require('react-bootstrap');
 require('react-bootstrap/Button');
-var getSerializers = require('./index-0fff88e9.js');
+var getSerializers = require('./index-1735f801.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/index-bd6c9f56.js

@@ -0,0 +1,211 @@
+'use strict';
+
+/*!
+ * cookie
+ * Copyright(c) 2012-2014 Roman Shtylman
+ * Copyright(c) 2015 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+
+/**
+ * Module exports.
+ * @public
+ */
+
+var parse_1 = parse;
+var serialize_1 = serialize;
+
+/**
+ * Module variables.
+ * @private
+ */
+
+var decode = decodeURIComponent;
+var encode = encodeURIComponent;
+var pairSplitRegExp = /; */;
+
+/**
+ * RegExp to match field-content in RFC 7230 sec 3.2
+ *
+ * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
+ * field-vchar   = VCHAR / obs-text
+ * obs-text      = %x80-FF
+ */
+
+var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
+
+/**
+ * Parse a cookie header.
+ *
+ * Parse the given cookie header string into an object
+ * The object has the various cookies as keys(names) => values
+ *
+ * @param {string} str
+ * @param {object} [options]
+ * @return {object}
+ * @public
+ */
+
+function parse(str, options) {
+  if (typeof str !== 'string') {
+    throw new TypeError('argument str must be a string');
+  }
+
+  var obj = {};
+  var opt = options || {};
+  var pairs = str.split(pairSplitRegExp);
+  var dec = opt.decode || decode;
+
+  for (var i = 0; i < pairs.length; i++) {
+    var pair = pairs[i];
+    var eq_idx = pair.indexOf('=');
+
+    // skip things that don't look like key=value
+    if (eq_idx < 0) {
+      continue;
+    }
+
+    var key = pair.substr(0, eq_idx).trim();
+    var val = pair.substr(++eq_idx, pair.length).trim();
+
+    // quoted values
+    if ('"' == val[0]) {
+      val = val.slice(1, -1);
+    }
+
+    // only assign once
+    if (undefined == obj[key]) {
+      obj[key] = tryDecode(val, dec);
+    }
+  }
+
+  return obj;
+}
+
+/**
+ * Serialize data into a cookie header.
+ *
+ * Serialize the a name value pair into a cookie string suitable for
+ * http headers. An optional options object specified cookie parameters.
+ *
+ * serialize('foo', 'bar', { httpOnly: true })
+ *   => "foo=bar; httpOnly"
+ *
+ * @param {string} name
+ * @param {string} val
+ * @param {object} [options]
+ * @return {string}
+ * @public
+ */
+
+function serialize(name, val, options) {
+  var opt = options || {};
+  var enc = opt.encode || encode;
+
+  if (typeof enc !== 'function') {
+    throw new TypeError('option encode is invalid');
+  }
+
+  if (!fieldContentRegExp.test(name)) {
+    throw new TypeError('argument name is invalid');
+  }
+
+  var value = enc(val);
+
+  if (value && !fieldContentRegExp.test(value)) {
+    throw new TypeError('argument val is invalid');
+  }
+
+  var str = name + '=' + value;
+
+  if (null != opt.maxAge) {
+    var maxAge = opt.maxAge - 0;
+
+    if (isNaN(maxAge) || !isFinite(maxAge)) {
+      throw new TypeError('option maxAge is invalid')
+    }
+
+    str += '; Max-Age=' + Math.floor(maxAge);
+  }
+
+  if (opt.domain) {
+    if (!fieldContentRegExp.test(opt.domain)) {
+      throw new TypeError('option domain is invalid');
+    }
+
+    str += '; Domain=' + opt.domain;
+  }
+
+  if (opt.path) {
+    if (!fieldContentRegExp.test(opt.path)) {
+      throw new TypeError('option path is invalid');
+    }
+
+    str += '; Path=' + opt.path;
+  }
+
+  if (opt.expires) {
+    if (typeof opt.expires.toUTCString !== 'function') {
+      throw new TypeError('option expires is invalid');
+    }
+
+    str += '; Expires=' + opt.expires.toUTCString();
+  }
+
+  if (opt.httpOnly) {
+    str += '; HttpOnly';
+  }
+
+  if (opt.secure) {
+    str += '; Secure';
+  }
+
+  if (opt.sameSite) {
+    var sameSite = typeof opt.sameSite === 'string'
+      ? opt.sameSite.toLowerCase() : opt.sameSite;
+
+    switch (sameSite) {
+      case true:
+        str += '; SameSite=Strict';
+        break;
+      case 'lax':
+        str += '; SameSite=Lax';
+        break;
+      case 'strict':
+        str += '; SameSite=Strict';
+        break;
+      case 'none':
+        str += '; SameSite=None';
+        break;
+      default:
+        throw new TypeError('option sameSite is invalid');
+    }
+  }
+
+  return str;
+}
+
+/**
+ * Try decoding a string using a decoding function.
+ *
+ * @param {string} str
+ * @param {function} decode
+ * @private
+ */
+
+function tryDecode(str, decode) {
+  try {
+    return decode(str);
+  } catch (e) {
+    return str;
+  }
+}
+
+var cookie = {
+	parse: parse_1,
+	serialize: serialize_1
+};
+
+exports.cookie = cookie;
+exports.parse_1 = parse_1;
+exports.serialize_1 = serialize_1;

package/dist/cjs/index.js

@@ -42,10 +42,10 @@ require('./_set-species-f92c67c5.js');
 var Segment = require('./Segment.js');
 var Beam = require('./Beam.js');
 var AdSlot = require('./AdSlot.js');
-require('./ADInfeed-8952e375.js');
+require('./ADInfeed-fd8c792f.js');
 var DeckContent = require('./DeckContent.js');
 require('./lodash-7fd85bcf.js');
-require('./ADlgInfeed-20c916fc.js');
+require('./ADlgInfeed-40259fe0.js');
 require('./getContentCategory-f38a4c00.js');
 require('./get-68c52cb1.js');
 var AD = require('./AD.js');
@@ -83,7 +83,7 @@ require('react-bootstrap/Form');
 require('./index-3294d3bc.js');
 require('./js.cookie-a511c430.js');
 var CMEDeck = require('./CMEDeck.js');
-var getSerializers = require('./index-0fff88e9.js');
+var getSerializers = require('./index-1735f801.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');
@@ -161,9 +161,9 @@ var ConferenceArticleCard = require('./ConferenceArticleCard.js');
 var KMTracker = require('./KMTracker.js');
 var getSeriesDetail = require('./getSeriesDetail.js');
 var SetCookie = require('./SetCookie.js');
-require('nookies');
-var getQuery = require('./getQuery.js');
+require('./index-bd6c9f56.js');
 var getRelatedArticle = require('./getRelatedArticle.js');
+var getQuery = require('./getQuery.js');
 var Auth = require('./Auth.js');
 require('swr');
 require('passport-local');
@@ -254,8 +254,8 @@ exports.ConferenceArticleCard = ConferenceArticleCard;
 exports.KMTracker = KMTracker;
 exports.getSeriesDetail = getSeriesDetail;
 exports.SetCookie = SetCookie;
-exports.getQuery = getQuery;
 exports.getRelatedArticle = getRelatedArticle;
+exports.getQuery = getQuery;
 exports.Auth = Auth.default;
 exports.getTargeting = getTargeting.getTargeting;
 exports.View = View;

package/dist/esm/ADGutter.js

@@ -23,7 +23,9 @@ var ADGutter = function ADGutter(_ref) {
   var title = _ref.title,
       gutterAd = _ref.gutterAd,
       _ref$minScreenWidth = _ref.minScreenWidth,
-      minScreenWidth = _ref$minScreenWidth === undefined ? 1700 : _ref$minScreenWidth;
+      minScreenWidth = _ref$minScreenWidth === undefined ? 1700 : _ref$minScreenWidth,
+      _ref$refreshFlag = _ref.refreshFlag,
+      refreshFlag = _ref$refreshFlag === undefined ? false : _ref$refreshFlag;
   var className = gutterAd.className,
       slotId = gutterAd.slotId,
       adUnit = gutterAd.adUnit,
@@ -119,7 +121,7 @@ var ADGutter = function ADGutter(_ref) {
             sizes: sizes,
             adUnit: adUnit,
             targeting: adTargeting,
-            refreshFlag: false
+            refreshFlag: refreshFlag
             /* Passing function to check for ad creative only if it is not in preview. */
             , checkIsAdFound: previewAd ? null : checkIsAdFound
           })

package/dist/esm/{ADInfeed-1153eefc.js → ADInfeed-af6b0616.js}

@@ -6,7 +6,9 @@ import DFPAdSlot from './AdSlot.js';
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,
-      infeedAd = _ref.infeedAd;
+      infeedAd = _ref.infeedAd,
+      _ref$refreshFlag = _ref.refreshFlag,
+      refreshFlag = _ref$refreshFlag === undefined ? false : _ref$refreshFlag;
   var className = infeedAd.className,
       slotId = infeedAd.slotId,
       adUnit = infeedAd.adUnit,
@@ -74,7 +76,7 @@ var ADInfeed = function ADInfeed(_ref) {
         sizes: sizes
         /* Passing function to check for ad creative only if it is not in preview. */
         , checkIsAdFound: previewAd ? null : checkIsAdFound,
-        refreshFlag: false
+        refreshFlag: refreshFlag
       })
     ),
     React__default.createElement(