@twreporter/universal-header 3.0.2 → 3.0.3-rc.1

package/lib/utils/links.js

@@ -17,33 +17,23 @@ exports.getMyReadingLink = getMyReadingLink;
 exports.getSearchLink = getSearchLink;
 exports.getSocialMediaLinks = getSocialMediaLinks;
 exports.getTabBarLinks = getTabBarLinks;
-
 var _actions = require("../constants/actions");
-
 var _footer = require("../constants/footer");
-
 var _socialMedia = require("../constants/social-media");
-
 var _channels = require("../constants/channels");
-
 var _externalLinks = _interopRequireDefault(require("../constants/external-links"));
-
 var _requestOrigins = _interopRequireDefault(require("@twreporter/core/lib/constants/request-origins"));
-
 var _releaseBranch = _interopRequireDefault(require("@twreporter/core/lib/constants/release-branch"));
-
 var _forEach = _interopRequireDefault(require("lodash/forEach"));
-
 var _reduce = _interopRequireDefault(require("lodash/reduce"));
-
 var _split = _interopRequireDefault(require("lodash/split"));
-
 var _indexOf = _interopRequireDefault(require("lodash/indexOf"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // @twreporter
+// lodash
 var _ = {
   forEach: _forEach["default"],
   reduce: _reduce["default"],
@@ -51,30 +41,26 @@ var _ = {
   indexOf: _indexOf["default"]
 };
 var originsForClient = _requestOrigins["default"].forClientSideRendering;
+
 /**
  * @param {string} domain - one of 'account', 'main', 'support', or 'api'
  * @returns {Object}
  */
-
 function getOriginsByType(domain) {
   var baseURL = {};
-
   _.forEach(_releaseBranch["default"], function (branch) {
     baseURL[branch] = originsForClient[branch][domain];
   });
-
   return baseURL;
 }
-
 var accountsBaseURL = getOriginsByType('accounts');
-var mainBaseURL = getOriginsByType('main'); // const support = getOriginsByType('support')
+var mainBaseURL = getOriginsByType('main');
+// const support = getOriginsByType('support')
 
 var defaultReleaseBranch = _releaseBranch["default"].master;
 var defaultIsExternal = false;
-
 function __getLink(isExternal, releaseBranch, baseURL, path) {
   var target = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '_self';
-
   if (isExternal) {
     if (baseURL.hasOwnProperty(releaseBranch)) {
       return {
@@ -84,17 +70,14 @@ function __getLink(isExternal, releaseBranch, baseURL, path) {
       };
     }
   }
-
   return {
     to: path,
     isExternal: isExternal
   };
 }
-
 function __getExternalLinks() {
   return Object.assign({}, _externalLinks["default"]);
 }
-
 var __composeExternalLink = function __composeExternalLink(link) {
   var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '_self';
   return {
@@ -103,11 +86,9 @@ var __composeExternalLink = function __composeExternalLink(link) {
     target: target
   };
 };
-
-var checkReferrer = function checkReferrer() {
+var checkReferrer = exports.checkReferrer = function checkReferrer() {
   var referrer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
-
   try {
     var url = new URL(referrer);
     return url.origin === mainBaseURL[releaseBranch];
@@ -115,24 +96,17 @@ var checkReferrer = function checkReferrer() {
     return false;
   }
 };
-
-exports.checkReferrer = checkReferrer;
-
-var checkPathnameParent = function checkPathnameParent() {
+var checkPathnameParent = exports.checkPathnameParent = function checkPathnameParent() {
   var pathname = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var parent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return _.indexOf(_.split(pathname, '/'), parent) === 1;
 };
-
-exports.checkPathnameParent = checkPathnameParent;
-
 function getLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   return __getLink(isExternal, releaseBranch, mainBaseURL, path);
 }
-
 function getLoginLink() {
   var releaseBranch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultReleaseBranch;
   return {
@@ -140,53 +114,43 @@ function getLoginLink() {
     isExternal: true
   };
 }
-
 function getMemberLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return __getLink(isExternal, releaseBranch, mainBaseURL, '/account');
 }
-
 function getBookmarksLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return __getLink(isExternal, releaseBranch, mainBaseURL, '/myreading/saved');
 }
-
 function getMyReadingLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return __getLink(isExternal, releaseBranch, mainBaseURL, '/myreading');
 }
-
 function getSearchLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return __getLink(isExternal, releaseBranch, mainBaseURL, '/search');
 }
-
 function getLogoLink() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return __getLink(isExternal, releaseBranch, mainBaseURL, '');
 }
-
 function getActionLinks() {
   var _ref;
-
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return _ref = {}, _defineProperty(_ref, _actions.ACTION_KEY.support, __composeExternalLink(__getExternalLinks().monthlyDonation)), _defineProperty(_ref, _actions.ACTION_KEY.newsLetter, __getLink(isExternal, releaseBranch, mainBaseURL, '/account/email-subscription')), _ref;
 }
-
 function getFooterLinks() {
   var _ref2;
-
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
   return _ref2 = {}, _defineProperty(_ref2, _footer.FOOTER_KEY.foundation, __getLink(isExternal, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.foundation])), _defineProperty(_ref2, _footer.FOOTER_KEY.aboutUs, __getLink(true, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.aboutUs], '_blank')), _defineProperty(_ref2, _footer.FOOTER_KEY.influenceReport, __getLink(isExternal, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.influenceReport])), _defineProperty(_ref2, _footer.FOOTER_KEY.openLab, __composeExternalLink(__getExternalLinks().openLab, '_blank')), _defineProperty(_ref2, _footer.FOOTER_KEY.publicationAndMerchandise, __composeExternalLink(__getExternalLinks().publicationAndMerchandise, '_blank')), _ref2;
 }
-
 function getMemberLinks() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
@@ -195,36 +159,27 @@ function getMemberLinks() {
     return res;
   }, {});
 }
-
 function getSocialMediaLinks() {
   var externalLinks = __getExternalLinks();
-
   return _.reduce(_socialMedia.SOCIAL_MEDIA_KEY, function (res, key) {
     var link = externalLinks[key];
-
     if (link) {
       res[key] = __composeExternalLink(link, '_blank');
     }
-
     return res;
   }, {});
 }
-
 function getChannelLinks() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
-
   var links = _.reduce(_channels.CHANNEL_PATH, function (res, path, key) {
     var link = __getLink(isExternal, releaseBranch, mainBaseURL, path);
-
     res[key] = link;
     return res;
   }, {});
-
   links[_channels.CHANNEL_KEY.kidsReporter] = __composeExternalLink(__getExternalLinks().kidsReporter, '_blank');
   return links;
 }
-
 function getTabBarLinks() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;

package/lib/utils/theme.js

@@ -4,46 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.selectTabBarTheme = exports.selectSloganTheme = exports.selectLogoType = exports.selectHeaderTheme = exports.selectHamburgerMenuTheme = exports.selectHamburgerItemTheme = exports.selectHamburgerFooterTheme = void 0;
-
 var _theme = _interopRequireDefault(require("../constants/theme"));
-
 var _color = require("@twreporter/core/lib/constants/color");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var selectLogoType = function selectLogoType(theme) {
+var selectLogoType = exports.selectLogoType = function selectLogoType(theme) {
   switch (theme) {
     case _theme["default"].photography:
     case _theme["default"].transparent:
       return 'white';
-
     default:
       return 'default';
   }
 };
-
-exports.selectLogoType = selectLogoType;
-
-var selectHeaderTheme = function selectHeaderTheme(theme) {
+var selectHeaderTheme = exports.selectHeaderTheme = function selectHeaderTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
       return {
         bgColor: _color.colorPhoto.dark,
         topRowBgColor: _color.colorPhoto.dark
       };
-
     case _theme["default"].transparent:
       return {
         bgColor: _color.colorOpacity['black_0.2'],
         topRowBgColor: 'unset'
       };
-
     case _theme["default"].index:
       return {
         bgColor: _color.colorGrayscale.white,
         topRowBgColor: _color.colorGrayscale.white
       };
-
     case _theme["default"].normal:
     default:
       return {
@@ -52,25 +41,18 @@ var selectHeaderTheme = function selectHeaderTheme(theme) {
       };
   }
 };
-
-exports.selectHeaderTheme = selectHeaderTheme;
-
-var selectSloganTheme = function selectSloganTheme(theme) {
+var selectSloganTheme = exports.selectSloganTheme = function selectSloganTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
     case _theme["default"].transparent:
       return _color.colorGrayscale.white;
-
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
       return _color.colorGrayscale.gray800;
   }
 };
-
-exports.selectSloganTheme = selectSloganTheme;
-
-var selectHamburgerFooterTheme = function selectHamburgerFooterTheme(theme) {
+var selectHamburgerFooterTheme = exports.selectHamburgerFooterTheme = function selectHamburgerFooterTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
       return {
@@ -80,7 +62,6 @@ var selectHamburgerFooterTheme = function selectHamburgerFooterTheme(theme) {
         activeColor: _color.colorGrayscale.gray400,
         activeBgColor: _color.colorOpacity['white_0.5']
       };
-
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
@@ -94,12 +75,8 @@ var selectHamburgerFooterTheme = function selectHamburgerFooterTheme(theme) {
       };
   }
 };
-
-exports.selectHamburgerFooterTheme = selectHamburgerFooterTheme;
-
-var selectHamburgerItemTheme = function selectHamburgerItemTheme(theme) {
+var selectHamburgerItemTheme = exports.selectHamburgerItemTheme = function selectHamburgerItemTheme(theme) {
   var active = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
   switch (theme) {
     case _theme["default"].photography:
       return {
@@ -107,7 +84,6 @@ var selectHamburgerItemTheme = function selectHamburgerItemTheme(theme) {
         hoverBgColor: _color.colorOpacity['white_0.2'],
         activeBgColor: _color.colorOpacity['white_0.5']
       };
-
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
@@ -119,17 +95,13 @@ var selectHamburgerItemTheme = function selectHamburgerItemTheme(theme) {
       };
   }
 };
-
-exports.selectHamburgerItemTheme = selectHamburgerItemTheme;
-
-var selectHamburgerMenuTheme = function selectHamburgerMenuTheme(theme) {
+var selectHamburgerMenuTheme = exports.selectHamburgerMenuTheme = function selectHamburgerMenuTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
       return {
         bgColor: _color.colorPhoto.dark,
         scrollBarColor: _color.colorOpacity['white_0.8']
       };
-
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
@@ -140,17 +112,13 @@ var selectHamburgerMenuTheme = function selectHamburgerMenuTheme(theme) {
       };
   }
 };
-
-exports.selectHamburgerMenuTheme = selectHamburgerMenuTheme;
-
-var selectTabBarTheme = function selectTabBarTheme(theme) {
+var selectTabBarTheme = exports.selectTabBarTheme = function selectTabBarTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
       return {
         bgColor: _color.colorPhoto.dark,
         borderColor: _color.colorPhoto.heavy
       };
-
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
@@ -160,6 +128,4 @@ var selectTabBarTheme = function selectTabBarTheme(theme) {
         borderColor: _color.colorGrayscale.gray300
       };
   }
-};
-
-exports.selectTabBarTheme = selectTabBarTheme;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "3.0.2",
+  "version": "3.0.3-rc.1",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,17 +20,18 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@reduxjs/toolkit": "^2.2.5",
     "@twreporter/core": "^1.22.1",
-    "@twreporter/react-components": "^9.0.2",
+    "@twreporter/react-components": "^9.1.0-rc.0",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
     "react": "^18.2.0",
-    "react-redux": "^6.0.0",
+    "react-redux": "^9.1.2",
     "react-router-dom": "^5.1.2",
     "react-transition-group": "^4.4.5",
-    "redux": "^4.0.1",
-    "redux-thunk": "^2.3.0",
+    "redux": "^5.0.1",
+    "redux-thunk": "^3.1.0",
     "styled-components": "^6.0.0",
     "stylis": "^4.0.0"
   },
@@ -52,5 +53,5 @@
     "babel-loader": "^8.2.5",
     "react-dom": "^18.2.0"
   },
-  "gitHead": "48b821a07c388fab197859b742571da4f76bbf87"
+  "gitHead": "df79295a50f202d6ed016de4e91bbbc0899a3882"
 }