Merge pull request #44 from edx/alasdair/remove-paragon

perf(paragon): remove paragon to reduce bundle size
2019-06-21 11:14:29 -04:00 · 2019-06-21 11:11:01 -04:00 · 2019-06-21 09:56:05 -04:00 · 2019-06-11 13:51:08 -04:00 · 2019-06-11 13:34:27 -04:00 · 2019-06-09 16:32:55 -04:00
11 changed files with 5400 additions and 5968 deletions
--- a/22
+++ b/22
@@ -1,11 +1,13 @@
 transifex_resource = frontend-component-footer
 transifex_langs = "ar,fr,es_419,zh_CN"
+
 transifex_utils = ./node_modules/.bin/transifex-utils.js
-transifex_input = ./src/i18n/transifex_input.json
+i18n = ./src/i18n
+transifex_input = $(i18n)/transifex_input.json
 tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
 tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/

-# this directory must match .babelrc
+# This directory must match .babelrc .
 transifex_temp = ./temp/babel-plugin-react-intl

 requirements:
@@ -22,15 +24,12 @@ i18n.concat:

 extract_translations: | requirements i18n.extract i18n.concat

+# Despite the name, we actually need this target to detect changes in the incoming translated message files as well.
 detect_changed_source_translations:
 	# Checking for changed translations...
-	git diff --exit-code $(transifex_input)
+	git diff --exit-code $(i18n)

-validate-no-uncommitted-package-lock-changes:
-	# Checking for package-lock.json changes...
-	git diff --exit-code package-lock.json
-
-# Push translations to Transifex.  Run make extract_translations first.
+# Pushes translations to Transifex.  You must run make extract_translations first.
 push_translations:
 	# Pushing strings to Transifex...
 	tx push -s
@@ -41,6 +40,11 @@ push_translations:
 	# Pushing comments to Transifex...
 	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

-# Pull translations from Transifex
+# Pulls translations from Transifex.
 pull_translations:
 	tx pull -f --mode reviewed --language=$(transifex_langs)
+
+# This target is used by Travis.
+validate-no-uncommitted-package-lock-changes:
+	# Checking for package-lock.json changes...
+	git diff --exit-code package-lock.json
--- a/config/webpack.prod.config.js
+++ b/config/webpack.prod.config.js
@@ -47,12 +47,6 @@ module.exports = Merge.smart(commonConfig, {
      amd: '@edx/frontend-logging',
      root: '@edx/frontend-logging',
    },
-    '@edx/paragon': {
-      commonjs: '@edx/paragon',
-      commonjs2: '@edx/paragon',
-      amd: 'Paragon',
-      root: 'Paragon',
-    },
  },
  plugins: [
    // Cleans the dist directory before each build
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
    "@edx/edx-bootstrap": "^2.2.1",
    "@edx/frontend-i18n": "^2.1.0",
    "@edx/frontend-logging": "^2.0.2",
-    "@edx/paragon": "^4.2.4",
    "@fortawesome/fontawesome-svg-core": "^1.2.17",
    "@fortawesome/free-brands-svg-icons": "^5.8.1",
    "@fortawesome/free-regular-svg-icons": "^5.8.1",
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.affiliates": "Affiliates",
-  "footer.site-footer.link.open-source": "Open {siteName}",
-  "footer.site-footer.link.careers": "Careers",
-  "footer.site-footer.link.news": "News",
-  "footer.site-footer.link.header.legal": "Legal",
-  "footer.site-footer.link.terms-of-service": "Terms of Service & Honor Code",
-  "footer.site-footer.link.privacy": "Privacy Policy",
-  "footer.site-footer.link.accessibility": "Accessibility Policy",
-  "footer.site-footer.link.trademark": "Trademark Policy",
-  "footer.site-footer.link.sitemap": "Sitemap",
-  "footer.site-footer.link.header.connect": "Connect",
-  "footer.site-footer.link.blog": "Blog",
-  "footer.site-footer.link.contact-us": "Contact Us",
-  "footer.site-footer.link.help-center": "Help Center",
-  "footer.site-footer.link.media-kit": "Media Kit",
-  "footer.site-footer.link.donate": "Donate",
-  "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
-  "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 {icpLicense}",
-  "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} Home",
-  "footer.site-footer.facebook.title": "Facebook",
-  "footer.site-footer.facebook.screen-reader-text": "Like {siteName} on Facebook",
-  "footer.site-footer.twitter.title": "Twitter",
-  "footer.site-footer.twitter.screen-reader-text": "Follow {siteName} on Twitter",
-  "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "Subscribe to the {siteName} YouTube channel",
-  "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "Follow {siteName} on LinkedIn",
-  "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "Follow {siteName} on Google+",
-  "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "Subscribe to the {siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "Download the {siteName} mobile app from the Apple App Store",
-  "footer.site-footer.google-play.alt-text": "Download the {siteName} mobile app from Google Play",
-  "footer.site-footer.footer.aria-label": "Page Footer"
-}
+{}
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.affiliates": "Affiliates",
-  "footer.site-footer.link.open-source": "Open {siteName}",
-  "footer.site-footer.link.careers": "Careers",
-  "footer.site-footer.link.news": "News",
-  "footer.site-footer.link.header.legal": "Legal",
-  "footer.site-footer.link.terms-of-service": "Terms of Service & Honor Code",
-  "footer.site-footer.link.privacy": "Privacy Policy",
-  "footer.site-footer.link.accessibility": "Accessibility Policy",
-  "footer.site-footer.link.trademark": "Trademark Policy",
-  "footer.site-footer.link.sitemap": "Sitemap",
-  "footer.site-footer.link.header.connect": "Connect",
-  "footer.site-footer.link.blog": "Blog",
-  "footer.site-footer.link.contact-us": "Contact Us",
-  "footer.site-footer.link.help-center": "Help Center",
-  "footer.site-footer.link.media-kit": "Media Kit",
-  "footer.site-footer.link.donate": "Donate",
-  "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
-  "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 {icpLicense}",
-  "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} Home",
-  "footer.site-footer.facebook.title": "Facebook",
-  "footer.site-footer.facebook.screen-reader-text": "Like {siteName} on Facebook",
-  "footer.site-footer.twitter.title": "Twitter",
-  "footer.site-footer.twitter.screen-reader-text": "Follow {siteName} on Twitter",
-  "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "Subscribe to the {siteName} YouTube channel",
-  "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "Follow {siteName} on LinkedIn",
-  "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "Follow {siteName} on Google+",
-  "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "Subscribe to the {siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "Download the {siteName} mobile app from the Apple App Store",
-  "footer.site-footer.google-play.alt-text": "Download the {siteName} mobile app from Google Play",
-  "footer.site-footer.footer.aria-label": "Page Footer"
-}
+{}
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.affiliates": "Affiliates",
-  "footer.site-footer.link.open-source": "Open {siteName}",
-  "footer.site-footer.link.careers": "Careers",
-  "footer.site-footer.link.news": "News",
-  "footer.site-footer.link.header.legal": "Legal",
-  "footer.site-footer.link.terms-of-service": "Terms of Service & Honor Code",
-  "footer.site-footer.link.privacy": "Privacy Policy",
-  "footer.site-footer.link.accessibility": "Accessibility Policy",
-  "footer.site-footer.link.trademark": "Trademark Policy",
-  "footer.site-footer.link.sitemap": "Sitemap",
-  "footer.site-footer.link.header.connect": "Connect",
-  "footer.site-footer.link.blog": "Blog",
-  "footer.site-footer.link.contact-us": "Contact Us",
-  "footer.site-footer.link.help-center": "Help Center",
-  "footer.site-footer.link.media-kit": "Media Kit",
-  "footer.site-footer.link.donate": "Donate",
-  "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
-  "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 {icpLicense}",
-  "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} Home",
-  "footer.site-footer.facebook.title": "Facebook",
-  "footer.site-footer.facebook.screen-reader-text": "Like {siteName} on Facebook",
-  "footer.site-footer.twitter.title": "Twitter",
-  "footer.site-footer.twitter.screen-reader-text": "Follow {siteName} on Twitter",
-  "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "Subscribe to the {siteName} YouTube channel",
-  "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "Follow {siteName} on LinkedIn",
-  "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "Follow {siteName} on Google+",
-  "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "Subscribe to the {siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "Download the {siteName} mobile app from the Apple App Store",
-  "footer.site-footer.google-play.alt-text": "Download the {siteName} mobile app from Google Play",
-  "footer.site-footer.footer.aria-label": "Page Footer"
-}
+{}
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.business": "商用{siteName} ",
-  "footer.site-footer.link.about": "关于",
-  "footer.site-footer.link.affiliates": "附属机构",
-  "footer.site-footer.link.open-source": "打开{siteName}",
-  "footer.site-footer.link.careers": "招才纳贤",
-  "footer.site-footer.link.news": "新闻",
-  "footer.site-footer.link.header.legal": "法律条款",
-  "footer.site-footer.link.terms-of-service": "服务条款 & 荣誉准则",
-  "footer.site-footer.link.privacy": "隐私政策",
-  "footer.site-footer.link.accessibility": "可访问策略",
-  "footer.site-footer.link.trademark": "商标政策",
-  "footer.site-footer.link.sitemap": "网站导航",
-  "footer.site-footer.link.header.connect": "连接",
-  "footer.site-footer.link.blog": "博客",
-  "footer.site-footer.link.contact-us": "联系我们",
-  "footer.site-footer.link.help-center": "帮助中心",
-  "footer.site-footer.link.media-kit": "多媒体工具箱",
-  "footer.site-footer.link.donate": "捐献",
-  "footer.site-footer.copyright-text": "{copyrightSymbol} {startDate}–{endDate} {siteName} Inc.",
-  "footer.site-footer.trademark-text": "EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 {icpLicense}",
-  "footer.site-footer.site-logo.alt-text": "{siteName} logo",
-  "footer.site-footer.site-logo.aria-label": "{siteName} 主页",
-  "footer.site-footer.facebook.title": "脸书",
-  "footer.site-footer.facebook.screen-reader-text": "在Facebook上为 {siteName}点赞",
-  "footer.site-footer.twitter.title": "推特",
-  "footer.site-footer.twitter.screen-reader-text": "在Twitter上关注 {siteName}",
-  "footer.site-footer.youtube.title": "Youtube",
-  "footer.site-footer.youtube.screen-reader-text": "订阅{siteName} YouTube频道",
-  "footer.site-footer.linkedin.title": "LinkedIn",
-  "footer.site-footer.linkedin.screen-reader-text": "在LinkedIn上关注{siteName}",
-  "footer.site-footer.google-plus.title": "Google+",
-  "footer.site-footer.google-plus.screen-reader-text": "在Google+上关注{siteName} ",
-  "footer.site-footer.reddit.title": "Reddit",
-  "footer.site-footer.reddit.screen-reader-text": "订阅{siteName} subreddit",
-  "footer.site-footer.apple-app-store.alt-text": "从Apple App Store下载 {siteName} 的移动客户端",
-  "footer.site-footer.google-play.alt-text": "从Google Play下载 {siteName} 的移动客户端",
-  "footer.site-footer.footer.aria-label": "页脚"
-}
+{}
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,4 +1,4 @@
-@import "~@edx/edx-bootstrap/sass/edx/theme";
+@import "~@edx/edx-bootstrap/scss/edx/theme";
@import "~bootstrap/scss/bootstrap";

@import './lib/scss/_site-footer.scss';
--- a/src/lib/components/SiteFooter/snapshots/SiteFooter.test.jsx.snap
+++ b/src/lib/components/SiteFooter/snapshots/SiteFooter.test.jsx.snap
@@ -15,8 +15,6 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
      <a
        aria-label="edX Home"
        href="https://www.example.com"
-        onClick={[Function]}
-        target="_self"
      >
        <img
          alt="edx Logo"
@@ -398,8 +396,6 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
      <a
        aria-label="edX Home"
        href="https://www.example.com"
-        onClick={[Function]}
-        target="_self"
      >
        <img
          alt="edx Logo"
@@ -807,8 +803,6 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
      <a
        aria-label="edX Home"
        href="https://www.example.com"
-        onClick={[Function]}
-        target="_self"
      >
        <img
          alt="edx Logo"
@@ -1084,8 +1078,6 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
      <a
        aria-label="edX Home"
        href="https://www.example.com"
-        onClick={[Function]}
-        target="_self"
      >
        <img
          alt="edx Logo"
--- a/src/lib/components/SiteFooter/index.jsx
+++ b/src/lib/components/SiteFooter/index.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Hyperlink } from '@edx/paragon';
 import qs from 'query-string';

 const EVENT_NAMES = {
@@ -118,11 +117,12 @@ class SiteFooter extends React.Component {
      >
        <div className="max-width-1180 d-grid">
          <div className="area-1">
-            <Hyperlink
-              destination={marketingSiteBaseUrl}
-              content={<img src={siteLogo.src} alt={siteLogo.altText} />}
+            <a
+              href={marketingSiteBaseUrl}
              aria-label={siteLogo.ariaLabel}
-            />
+            >
+              <img src={siteLogo.src} alt={siteLogo.altText} />
+            </a>
            {showLanguageSelector &&
              <div className="i18n d-flex mt-2">
                <form
Author	SHA1	Message	Date
AlasdairSwan	31e255ebe9	Merge pull request #44 from edx/alasdair/remove-paragon perf(paragon): remove paragon to reduce bundle size	2019-06-21 11:14:29 -04:00
AlasdairSwan	349f83f686	perf(paragon): remove paragon to reduce bundle size	2019-06-21 11:11:01 -04:00
David Joy	e0c205ce14	fix: non deprecated use of hyperlink (#43 )	2019-06-21 09:56:05 -04:00
albemarle	81398c8cfd	Merge pull request #42 from edx/albemarle/different-diff fix(i18n): make detect_changed_source_translations work for both push and pull jobs	2019-06-11 13:51:08 -04:00
albemarle	3fcd76b455	fix(i18n): make detect_changed_source_translations work for both push and pull jobs	2019-06-11 13:34:27 -04:00
edX Transifex Bot	a8f57aa553	fix(i18n): update translations	2019-06-09 16:32:55 -04:00