@twreporter/universal-header 2.8.0 → 2.9.0-rc.1

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.9.0-rc.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.9.0-rc.0...@twreporter/universal-header@2.9.0-rc.1) (2023-12-05)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.9.0-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.8.0...@twreporter/universal-header@2.9.0-rc.0) (2023-12-05)
+
+
+### Bug Fixes
+
+* remove *-old file of MEMBERSHIP feature flag ([91cdfd2](https://github.com/twreporter/twreporter-npm-packages/commit/91cdfd2b04f36c2af40410d4d0cdcbc6a77831e5))
+
+
+### Features
+
+* add foundation category set ([29259ef](https://github.com/twreporter/twreporter-npm-packages/commit/29259efe78e37aa148631a31e7f1bd5a3b2ecfe3))
+
+
+
+
+
 # [2.8.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.8.0-rc.6...@twreporter/universal-header@2.8.0) (2023-11-20)
 
 **Note:** Version bump only for package @twreporter/universal-header

package/lib/components/action-button.js

@@ -17,10 +17,6 @@ var _headerContext = require("../contexts/header-context");
 
 var _actionButtonItem = _interopRequireDefault(require("./action-button-item"));
 
-var _actionButtonItemOld = _interopRequireDefault(require("./action-button-item-old"));
-
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
-
 var _map = _interopRequireDefault(require("lodash/map"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -34,7 +30,6 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 var _ = {
   map: _map["default"]
 };
-var ActionButton = _featureFlag.MEMBERSHIP ? _actionButtonItem["default"] : _actionButtonItemOld["default"];
 
 var getActionProps = function getActionProps(type) {
   return _.map(_actions.ACTION_ORDER[type], function (key) {
@@ -48,7 +43,7 @@ var DesktopHeaderAction = function DesktopHeaderAction(_ref) {
   var props = _extends({}, _ref);
 
   var actionProps = getActionProps('desktop');
-  return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
+  return /*#__PURE__*/_react["default"].createElement(_actionButtonItem["default"], _extends({
     actions: actionProps
   }, props));
 };
@@ -59,7 +54,7 @@ var MobileHeaderAction = function MobileHeaderAction(_ref2) {
   var props = _extends({}, _ref2);
 
   var actionProps = getActionProps('mobile');
-  return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
+  return /*#__PURE__*/_react["default"].createElement(_actionButtonItem["default"], _extends({
     actions: actionProps
   }, props));
 };
@@ -73,7 +68,7 @@ var DesktopHamburgerAction = function DesktopHamburgerAction(_ref3) {
       closeHamburgerMenu = _useContext.closeHamburgerMenu;
 
   var actionProps = getActionProps('hamburger');
-  return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
+  return /*#__PURE__*/_react["default"].createElement(_actionButtonItem["default"], _extends({
     actions: actionProps,
     direction: _actionItemTypes.DIRECTION_TYPE.column,
     textType: _actionItemTypes.TEXT_TYPE.full,
@@ -93,7 +88,7 @@ var MobileHamburgerAction = function MobileHamburgerAction(_ref4) {
       closeHamburgerMenu = _useContext2.closeHamburgerMenu;
 
   var actionProps = getActionProps('hamburger');
-  return /*#__PURE__*/_react["default"].createElement(ActionButton, _extends({
+  return /*#__PURE__*/_react["default"].createElement(_actionButtonItem["default"], _extends({
     actions: actionProps,
     textType: _actionItemTypes.TEXT_TYPE.full,
     buttonWidth: _actionItemTypes.BUTTON_WIDTH_TYPE.stretch,

package/lib/components/hamburger-footer-old.js

@@ -0,0 +1,162 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _headerContext = _interopRequireWildcard(require("../contexts/header-context"));
+
+var _linksOld = require("../utils/links-old");
+
+var _theme = require("../utils/theme");
+
+var _footerOld = require("../constants/footer-old");
+
+var _socialMedia = require("../constants/social-media");
+
+var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
+
+var _divider = _interopRequireDefault(require("@twreporter/react-components/lib/divider"));
+
+var _customizedLink = _interopRequireDefault(require("@twreporter/react-components/lib/customized-link"));
+
+var _paragraph = require("@twreporter/react-components/lib/text/paragraph");
+
+var _button = require("@twreporter/react-components/lib/button");
+
+var _icon = require("@twreporter/react-components/lib/icon");
+
+var _theme2 = require("@twreporter/core/lib/constants/theme");
+
+var _map = _interopRequireDefault(require("lodash/map"));
+
+var _templateObject, _templateObject2;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+var _ = {
+  map: _map["default"]
+};
+
+var FooterContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__FooterContainer",
+  componentId: "sc-1otfsiv-0"
+})(["display:flex;flex-direction:column;"]);
+
+var LinkItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__LinkItem",
+  componentId: "sc-1otfsiv-1"
+})(["padding:8px 32px;color:", ";", " &:active{color:", ";background-color:", ";}"], function (props) {
+  return props.color;
+}, _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    &:hover {\n      color: ", ";\n      background-color: ", ";\n    }\n  "])), function (props) {
+  return props.hoverColor;
+}, function (props) {
+  return props.hoverBgColor;
+}), function (props) {
+  return props.activeColor;
+}, function (props) {
+  return props.activeBgColor;
+});
+
+var LinkSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__LinkSection",
+  componentId: "sc-1otfsiv-2"
+})(["display:flex;flex-direction:column;a{text-decoration:none;}"]);
+
+var IconItem = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__IconItem",
+  componentId: "sc-1otfsiv-3"
+})(["margin-right:16px;&:last-child{margin-right:0;}", ""], _mediaQuery["default"].mobileOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    svg {\n      height: 32px;\n      width: 32px;\n    }\n  "]))));
+
+var SocialMediaSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__SocialMediaSection",
+  componentId: "sc-1otfsiv-4"
+})(["display:flex;justify-content:center;"]);
+
+var DividerContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
+  displayName: "hamburger-footer-old__DividerContainer",
+  componentId: "sc-1otfsiv-5"
+})(["margin:16px 32px;"]);
+
+var Footer = function Footer(_ref) {
+  var props = _extends({}, _ref);
+
+  var _useContext = (0, _react.useContext)(_headerContext["default"]),
+      theme = _useContext.theme,
+      releaseBranch = _useContext.releaseBranch,
+      isLinkExternal = _useContext.isLinkExternal;
+
+  var _useContext2 = (0, _react.useContext)(_headerContext.HamburgerContext),
+      closeHamburgerMenu = _useContext2.closeHamburgerMenu;
+
+  var footerTheme = theme === _theme2.THEME.transparent ? _theme2.THEME.normal : theme;
+
+  var _selectHamburgerFoote = (0, _theme.selectHamburgerFooterTheme)(footerTheme),
+      color = _selectHamburgerFoote.color,
+      hoverColor = _selectHamburgerFoote.hoverColor,
+      hoverBgColor = _selectHamburgerFoote.hoverBgColor,
+      activeColor = _selectHamburgerFoote.activeColor,
+      activeBgColor = _selectHamburgerFoote.activeBgColor;
+
+  var footerLinks = (0, _linksOld.getFooterLinks)(isLinkExternal, releaseBranch);
+  var linkJSX = footerLinks ? /*#__PURE__*/_react["default"].createElement(LinkSection, null, _.map(_footerOld.FOOTER_ORDER, function (key) {
+    var link = footerLinks[key];
+    var label = _footerOld.FOOTER_LABEL[key];
+
+    if (!link || !label) {
+      return;
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], _extends({}, link, {
+      key: key,
+      onClick: closeHamburgerMenu
+    }), /*#__PURE__*/_react["default"].createElement(LinkItem, {
+      color: color,
+      hoverColor: hoverColor,
+      hoverBgColor: hoverBgColor,
+      activeColor: activeColor,
+      activeBgColor: activeBgColor
+    }, /*#__PURE__*/_react["default"].createElement(_paragraph.P2, {
+      text: label
+    })));
+  })) : null;
+  var socialMediaLinks = (0, _linksOld.getSocialMediaLinks)();
+  var socialMediaJSX = socialMediaLinks ? /*#__PURE__*/_react["default"].createElement(SocialMediaSection, null, _.map(_socialMedia.SOCIAL_MEDIA_ORDER, function (key) {
+    var link = socialMediaLinks[key];
+
+    if (!link) {
+      return;
+    }
+
+    var Icon = /*#__PURE__*/_react["default"].createElement(_icon.SocialMedia, {
+      mediaType: key,
+      releaseBranch: releaseBranch
+    });
+
+    return /*#__PURE__*/_react["default"].createElement(IconItem, {
+      key: key
+    }, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], link, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
+      iconComponent: Icon,
+      theme: footerTheme
+    })));
+  })) : null;
+  return /*#__PURE__*/_react["default"].createElement(FooterContainer, props, linkJSX, /*#__PURE__*/_react["default"].createElement(DividerContainer, null, /*#__PURE__*/_react["default"].createElement(_divider["default"], null)), socialMediaJSX);
+};
+
+var _default = Footer;
+exports["default"] = _default;

package/lib/components/hamburger-menu.js

@@ -25,8 +25,6 @@ var _hamburgerMenu = require("../constants/hamburger-menu");
 
 var _actionButton = require("./action-button");
 
-var _hamburgerFooter = _interopRequireDefault(require("./hamburger-footer"));
-
 var _hamburgerMenuItem = require("./hamburger-menu-item");
 
 var _icons = require("./icons");
@@ -51,6 +49,12 @@ var _theme2 = require("@twreporter/core/lib/constants/theme");
 
 var _rwd = require("@twreporter/react-components/lib/rwd");
 
+var _hamburgerFooter = _interopRequireDefault(require("./hamburger-footer"));
+
+var _hamburgerFooterOld = _interopRequireDefault(require("./hamburger-footer-old"));
+
+var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
+
 var _map = _interopRequireDefault(require("lodash/map"));
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
@@ -77,6 +81,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
+var Footer = _featureFlag.FOUNDATION_CATEGORY_SET ? _hamburgerFooter["default"] : _hamburgerFooterOld["default"];
 var _ = {
   map: _map["default"]
 }; // global var
@@ -377,7 +382,7 @@ var HamburgerMenu = function HamburgerMenu(_ref2) {
     autofocus: false,
     widthType: "stretch",
     placeholder: "\u95DC\u9375\u5B57\u641C\u5C0B"
-  })), /*#__PURE__*/_react["default"].createElement(Content, null), /*#__PURE__*/_react["default"].createElement(_hamburgerFooter["default"], null), /*#__PURE__*/_react["default"].createElement(ActionSection, null, /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndAbove, null, /*#__PURE__*/_react["default"].createElement(_actionButton.DesktopHamburgerAction, null)), /*#__PURE__*/_react["default"].createElement(_rwd.MobileOnly, null, /*#__PURE__*/_react["default"].createElement(StyledMobileHamburgerAction, null))));
+  })), /*#__PURE__*/_react["default"].createElement(Content, null), /*#__PURE__*/_react["default"].createElement(Footer, null), /*#__PURE__*/_react["default"].createElement(ActionSection, null, /*#__PURE__*/_react["default"].createElement(_rwd.TabletAndAbove, null, /*#__PURE__*/_react["default"].createElement(_actionButton.DesktopHamburgerAction, null)), /*#__PURE__*/_react["default"].createElement(_rwd.MobileOnly, null, /*#__PURE__*/_react["default"].createElement(StyledMobileHamburgerAction, null))));
 };
 
 var _default = HamburgerMenu;

package/lib/constants/footer-old.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FOOTER_PATH = exports.FOOTER_ORDER = exports.FOOTER_LABEL = exports.FOOTER_KEY = void 0;
+
+var _FOOTER_PATH, _FOOTER_LABEL;
+
+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; }
+
+var footerKey = {
+  aboutUs: 'about-us',
+  influenceReport: 'influence-report',
+  openLab: 'open-lab'
+};
+var FOOTER_KEY = footerKey;
+exports.FOOTER_KEY = FOOTER_KEY;
+var FOOTER_PATH = (_FOOTER_PATH = {}, _defineProperty(_FOOTER_PATH, footerKey.aboutUs, '/about-us'), _defineProperty(_FOOTER_PATH, footerKey.influenceReport, '/a/impact-and-annual-report'), _FOOTER_PATH);
+exports.FOOTER_PATH = FOOTER_PATH;
+var FOOTER_LABEL = (_FOOTER_LABEL = {}, _defineProperty(_FOOTER_LABEL, footerKey.aboutUs, '關於我們'), _defineProperty(_FOOTER_LABEL, footerKey.influenceReport, '影響力報告'), _defineProperty(_FOOTER_LABEL, footerKey.openLab, '報導者開放實驗室'), _FOOTER_LABEL);
+exports.FOOTER_LABEL = FOOTER_LABEL;
+var FOOTER_ORDER = [footerKey.aboutUs, footerKey.influenceReport, footerKey.openLab];
+exports.FOOTER_ORDER = FOOTER_ORDER;

package/lib/constants/footer.js

@@ -10,15 +10,16 @@ var _FOOTER_PATH, _FOOTER_LABEL;
 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; }
 
 var footerKey = {
+  foundation: 'foundation',
   aboutUs: 'about-us',
   influenceReport: 'influence-report',
   openLab: 'open-lab'
 };
-var FOOTER_KEY = footerKey;
+var FOOTER_KEY = Object.freeze(footerKey);
 exports.FOOTER_KEY = FOOTER_KEY;
-var FOOTER_PATH = (_FOOTER_PATH = {}, _defineProperty(_FOOTER_PATH, footerKey.aboutUs, '/about-us'), _defineProperty(_FOOTER_PATH, footerKey.influenceReport, '/a/impact-and-annual-report'), _FOOTER_PATH);
+var FOOTER_PATH = (_FOOTER_PATH = {}, _defineProperty(_FOOTER_PATH, footerKey.foundation, '/categories/foundation'), _defineProperty(_FOOTER_PATH, footerKey.aboutUs, '/about-us'), _defineProperty(_FOOTER_PATH, footerKey.influenceReport, '/a/impact-and-annual-report'), _FOOTER_PATH);
 exports.FOOTER_PATH = FOOTER_PATH;
-var FOOTER_LABEL = (_FOOTER_LABEL = {}, _defineProperty(_FOOTER_LABEL, footerKey.aboutUs, '關於我們'), _defineProperty(_FOOTER_LABEL, footerKey.influenceReport, '影響力報告'), _defineProperty(_FOOTER_LABEL, footerKey.openLab, '報導者開放實驗室'), _FOOTER_LABEL);
+var FOOTER_LABEL = (_FOOTER_LABEL = {}, _defineProperty(_FOOTER_LABEL, footerKey.foundation, '基金會消息'), _defineProperty(_FOOTER_LABEL, footerKey.aboutUs, '關於我們'), _defineProperty(_FOOTER_LABEL, footerKey.influenceReport, '影響力報告'), _defineProperty(_FOOTER_LABEL, footerKey.openLab, '報導者開放實驗室'), _FOOTER_LABEL);
 exports.FOOTER_LABEL = FOOTER_LABEL;
-var FOOTER_ORDER = [footerKey.aboutUs, footerKey.influenceReport, footerKey.openLab];
+var FOOTER_ORDER = [footerKey.foundation, footerKey.aboutUs, footerKey.influenceReport, footerKey.openLab];
 exports.FOOTER_ORDER = FOOTER_ORDER;

package/lib/containers/header.js

@@ -17,10 +17,6 @@ var _propTypes = require("../constants/prop-types");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _headerOld = _interopRequireDefault(require("../components/header-old"));
-
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
-
 var _get = _interopRequireDefault(require("lodash/get"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -54,7 +50,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var _ = {
   get: _get["default"]
 };
-var Header = _featureFlag.MEMBERSHIP ? _header["default"] : _headerOld["default"];
 var HIDE_HEADER_THRESHOLD = 8;
 var TRANSFORM_HEADER_THRESHOLD = 40;
 var TRANSFORM_TIMEOUT = 800;
@@ -208,7 +203,7 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
       };
       return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
         value: contextValue
-      }, /*#__PURE__*/_react["default"].createElement(Header, {
+      }, /*#__PURE__*/_react["default"].createElement(_header["default"], {
         hamburgerContext: hamburgerContext
       }));
     }

package/lib/utils/links-old.js

@@ -11,16 +11,14 @@ exports.getFooterLinks = getFooterLinks;
 exports.getLink = getLink;
 exports.getLoginLink = getLoginLink;
 exports.getLogoLink = getLogoLink;
-exports.getLogoutLink = getLogoutLink;
+exports.getMemberLink = getMemberLink;
 exports.getSearchLink = getSearchLink;
 exports.getSocialMediaLinks = getSocialMediaLinks;
 exports.getTabBarLinks = getTabBarLinks;
 
-var _servicesOld = require("../constants/services-old");
-
 var _actions = require("../constants/actions");
 
-var _footer = require("../constants/footer");
+var _footerOld = require("../constants/footer-old");
 
 var _socialMedia = require("../constants/social-media");
 
@@ -67,7 +65,6 @@ function getOriginsByType(domain) {
 }
 
 var accountsBaseURL = getOriginsByType('accounts');
-var apiBaseURL = getOriginsByType('api');
 var mainBaseURL = getOriginsByType('main'); // const support = getOriginsByType('support')
 
 var defaultReleaseBranch = _releaseBranch["default"].master;
@@ -134,32 +131,30 @@ function getLink() {
   return __getLink(isExternal, releaseBranch, mainBaseURL, path);
 }
 
-function getLogoutLink() {
+function getLoginLink() {
   var releaseBranch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultReleaseBranch;
   return {
-    to: apiBaseURL[releaseBranch] + _servicesOld.servicePathnames.logout,
+    to: accountsBaseURL[releaseBranch] + '/signin',
     isExternal: true
   };
 }
 
-function getLoginLink() {
-  var releaseBranch = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultReleaseBranch;
-  return {
-    to: accountsBaseURL[releaseBranch] + _servicesOld.servicePathnames.login,
-    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, _servicesOld.servicePathnames.bookmarks);
+  return __getLink(isExternal, releaseBranch, mainBaseURL, '/bookmarks');
 }
 
 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, _servicesOld.servicePathnames.search);
+  return __getLink(isExternal, releaseBranch, mainBaseURL, '/search');
 }
 
 function getLogoLink() {
@@ -171,7 +166,9 @@ function getLogoLink() {
 function getActionLinks() {
   var _ref;
 
-  return _ref = {}, _defineProperty(_ref, _actions.ACTION_KEY.support, __composeExternalLink(__getExternalLinks().monthlyDonation)), _defineProperty(_ref, _actions.ACTION_KEY.newsLetter, __composeExternalLink(__getExternalLinks().newsLetter)), _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() {
@@ -179,7 +176,7 @@ function getFooterLinks() {
 
   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.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')), _ref2;
+  return _ref2 = {}, _defineProperty(_ref2, _footerOld.FOOTER_KEY.foundation, __getLink(true, releaseBranch, mainBaseURL, _footerOld.FOOTER_PATH[_footerOld.FOOTER_KEY.foundation])), _defineProperty(_ref2, _footerOld.FOOTER_KEY.aboutUs, __getLink(true, releaseBranch, mainBaseURL, _footerOld.FOOTER_PATH[_footerOld.FOOTER_KEY.aboutUs], '_blank')), _defineProperty(_ref2, _footerOld.FOOTER_KEY.influenceReport, __getLink(isExternal, releaseBranch, mainBaseURL, _footerOld.FOOTER_PATH[_footerOld.FOOTER_KEY.influenceReport])), _defineProperty(_ref2, _footerOld.FOOTER_KEY.openLab, __composeExternalLink(__getExternalLinks().openLab, '_blank')), _ref2;
 }
 
 function getSocialMediaLinks() {
@@ -217,6 +214,6 @@ function getTabBarLinks() {
   return {
     home: __getLink(isExternal, releaseBranch, mainBaseURL, ''),
     latest: __getLink(isExternal, releaseBranch, mainBaseURL, '/latest'),
-    bookmark: __getLink(isExternal, releaseBranch, mainBaseURL, _servicesOld.servicePathnames.bookmarks)
+    bookmark: __getLink(isExternal, releaseBranch, mainBaseURL, '/bookmarks')
   };
 }

package/lib/utils/links.js

@@ -176,7 +176,7 @@ function getFooterLinks() {
 
   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.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')), _ref2;
+  return _ref2 = {}, _defineProperty(_ref2, _footer.FOOTER_KEY.foundation, __getLink(true, 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')), _ref2;
 }
 
 function getSocialMediaLinks() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.8.0",
+  "version": "2.9.0-rc.1",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.14.0",
-    "@twreporter/react-components": "^8.21.0",
+    "@twreporter/core": "^1.15.0-rc.1",
+    "@twreporter/react-components": "^8.21.1-rc.1",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -51,5 +51,5 @@
     "babel-loader": "^8.2.5",
     "react-dom": "16.8.6"
   },
-  "gitHead": "ebe4cca68d577c8088974fbb5dadd9ec589cadba"
+  "gitHead": "4cb4fe4b153f04a931d4fbff13444383c775d9e9"
 }