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 · 2019-06-11 13:34:27 -04:00 · 2019-06-09 16:32:55 -04:00 · 2019-06-07 11:12:41 -04:00 · 2019-06-07 10:53:50 -04:00 · 2019-06-07 10:07:30 -04:00
29 changed files with 1609 additions and 1200 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -19,7 +19,8 @@
    "i18n": {
      "plugins": [
        ["react-intl", {
-          "messagesDir": "./temp"
+          "messagesDir": "./temp/babel-plugin-react-intl",
+          "moduleSourceName": "@edx/frontend-i18n"
        }]
      ]
    }
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ node_modules
 temp

 .idea/
+
+src/i18n/transifex_input.json
+temp/babel-plugin-react-intl
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ script:
  - npm run i18n_extract
  - npm run test
  - npm run build
+  - npm run is-es5
 after_success:
  - npm run travis-deploy-once "npm run semantic-release"
  - npm run coveralls
--- a/56
+++ b/56
@@ -1,36 +1,50 @@
-extract_translations: ## no prerequisites so we can control order of operations
-	echo "We have to define this target due to tooling assumptions"
-	echo "Also we have to npm install using this hook b/c there's no other place for it in the current setup"
+transifex_resource = frontend-component-footer
+transifex_langs = "ar,fr,es_419,zh_CN"
+
+transifex_utils = ./node_modules/.bin/transifex-utils.js
+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 .
+transifex_temp = ./temp/babel-plugin-react-intl
+
+requirements:
 	npm install
-	npm run-script i18n_extract

 i18n.extract:
-    # Pulling display strings from .jsx files into .json files...
+	# Pulling display strings from .jsx files into .json files...
+	rm -rf $(transifex_temp)
 	npm run-script i18n_extract

 i18n.concat:
-    # Gathering JSON messages into one file...
-	./src/i18n/i18n-concat.js ./temp/src ./src/i18n/transifex_input.json
+	# Gathering JSON messages into one file...
+	$(transifex_utils) $(transifex_temp) $(transifex_input)

+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:
-	git diff --exit-code ./src/i18n/transifex_input.json
+	# Checking for changed translations...
+	git diff --exit-code $(i18n)

-tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/frontend-component-footer/translation/en/strings/
-tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/frontend-component-footer/source/
-
-# push translations to Transifex, doing magic so we can include the translator comments
-push_translations: | i18n.extract
-	# Adding translator comments...
-	# Fetching strings from Transifex...
+# Pushes translations to Transifex.  You must run make extract_translations first.
+push_translations:
+	# Pushing strings to Transifex...
+	tx push -s
+	# Fetching hashes from Transifex...
 	./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
-    # Writing out comments to file...
-	./src/i18n/i18n-concat.js ./temp/src --comments
-    # Adding comments to Transifex...
+	# Writing out comments to file...
+	$(transifex_utils) $(transifex_temp) --comments
+	# Pushing comments to Transifex...
 	./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)

-# pull translations from Transifex
-pull_translations: ## must be exactly this name for edx tooling support, see ecommerce-scripts/transifex/pull.py
-	tx pull -f --mode reviewed --language="ar,fr,es_419,zh_CN"
+# 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/README.rst
+++ b/README.rst
@@ -23,7 +23,7 @@ of how the SiteFooter component can be specified.
 Requirements
 ------------

-This component uses ``react-intl``. Any containing app must provide ``react-intl`` as a peer dependency, and be wrapped inside an ``IntlProvider`` element, whether or not your consuming application is actually localized. For a basic default locale (English) version, follow the ``IntlProvider`` example in the sample application in `src/index.jsx <src/index.jsx>`__.
+This component uses ``@edx/frontend-i18n``. Any containing app must provide ``@edx/frontend-i18n`` as a peer dependency, and be wrapped inside an ``IntlProvider`` element, whether or not your consuming application is actually localized. For a basic default locale (English) version, follow the ``IntlProvider`` example in the sample application in `src/index.jsx <src/index.jsx>`__.

 Development
 -----------
--- a/config/webpack.prod.config.js
+++ b/config/webpack.prod.config.js
@@ -35,11 +35,17 @@ module.exports = Merge.smart(commonConfig, {
      amd: 'ReactDOM',
      root: 'ReactDOM',
    },
-    'react-intl': {
-      commonjs: 'react-intl',
-      commonjs2: 'react-intl',
-      amd: 'ReactIntl',
-      root: 'ReactIntl',
+    '@edx/frontend-i18n': {
+      commonjs: '@edx/frontend-i18n',
+      commonjs2: '@edx/frontend-i18n',
+      amd: '@edx/frontend-i18n',
+      root: '@edx/frontend-i18n',
+    },
+    '@edx/frontend-logging': {
+      commonjs: '@edx/frontend-logging',
+      commonjs2: '@edx/frontend-logging',
+      amd: '@edx/frontend-logging',
+      root: '@edx/frontend-logging',
    },
    '@edx/paragon': {
      commonjs: '@edx/paragon',
--- a/package-lock.json
+++ b/package-lock.json
@@ -1418,36 +1418,155 @@
        "find-up": "^2.1.0"
      }
    },
+    "@cospired/i18n-iso-languages": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@cospired/i18n-iso-languages/-/i18n-iso-languages-2.0.2.tgz",
+      "integrity": "sha512-APBpZvdQrC1MJWMzk33V7FR2RhBRtnH2QPLqZzS+qia7PixwgWNlnX7UfHjhx+YWkM53GdsZKs40EBkSwADuMA==",
+      "dev": true
+    },
    "@edx/edx-bootstrap": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-1.0.3.tgz",
-      "integrity": "sha512-3T6yYiLK9WdIn0iwjLoWfrsDqgfd0byiVB3aXK7w4oaltdVzA/fB/qU3iKrJ8cy4T6ZgDA2uFP726fU0StmxUw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@edx/edx-bootstrap/-/edx-bootstrap-2.2.1.tgz",
+      "integrity": "sha512-HkQ45u46ejX7WYwJX6ar/0FGBjx4F7bZvt3Dd4A677st0ic/47X5vQlqMqmK/M08C+GXaunNbZdbyF/ROrmwxw==",
+      "dev": true,
      "requires": {
-        "bootstrap": "4.0.0",
-        "jquery": "^3.2.1",
-        "popper.js": "^1.12.6"
+        "bootstrap": "^4.3.1"
      }
    },
-    "@edx/paragon": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-3.8.0.tgz",
-      "integrity": "sha512-4HqsCY8sA+2XdI/Jx2o+gqCJPpAUzJ+jlLvkUGiUSk/QxWKYIWAxuXAiE6kyZzA1I7C6+H7LlwWHG4ticoU+2g==",
+    "@edx/frontend-i18n": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-i18n/-/frontend-i18n-2.1.1.tgz",
+      "integrity": "sha512-1uPagQWBfnZn6EFjJmu+igfEG4F8GFxYx+piLsyPsq/vZs6G1qJPa6hM4Aipx+JIEAUr72l7sExgCPBj+G/71g==",
+      "dev": true,
      "requires": {
-        "@edx/edx-bootstrap": "^1.0.0",
-        "@sambego/storybook-styles": "^1.0.0",
-        "airbnb-prop-types": "^2.10.0",
-        "babel-polyfill": "^6.26.0",
-        "classnames": "^2.2.5",
-        "email-prop-type": "^1.1.5",
+        "@cospired/i18n-iso-languages": "^2.0.2",
+        "glob": "^7.1.4",
+        "i18n-iso-countries": "^4.0.0",
+        "iso-countries-languages": "^0.2.1",
+        "react-intl": "^2.9.0",
+        "universal-cookie": "^4.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
+    "@edx/frontend-logging": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-logging/-/frontend-logging-2.0.2.tgz",
+      "integrity": "sha512-DFj4CXcy5jStwkEN/sBiTFV5IB06KnTdWIfk/OYpx7EnMJCXL7b8BawW74xstyVjkGXRhQr08sgt/cY+hNGd7A==",
+      "dev": true
+    },
+    "@edx/paragon": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-4.2.6.tgz",
+      "integrity": "sha512-HOSClLgOe2hGxFuRORgK+6iSrEixFvaz5Cg3pdQa+SeU9WBqiPlEevG4TnWl0qlihltsYR9Vba80tzG9ci84hQ==",
+      "dev": true,
+      "requires": {
+        "@fortawesome/fontawesome-svg-core": "^1.2.18",
+        "@fortawesome/free-solid-svg-icons": "^5.8.2",
+        "@fortawesome/react-fontawesome": "^0.1.4",
+        "airbnb-prop-types": "^2.12.0",
+        "classnames": "^2.2.6",
+        "email-prop-type": "^3.0.0",
        "font-awesome": "^4.7.0",
        "mailto-link": "^1.0.0",
-        "prop-types": "^15.5.8",
-        "react": "^16.4.2",
-        "react-dom": "^16.1.0",
-        "react-element-proptypes": "^1.0.0",
+        "prop-types": "^15.7.2",
+        "react": "^16.8.6",
+        "react-dom": "^16.8.6",
        "react-proptype-conditional-require": "^1.0.4",
-        "react-responsive": "^5.0.0",
-        "sanitize-html": "^1.18.2"
+        "react-responsive": "^6.1.1",
+        "react-transition-group": "^4.0.0",
+        "sanitize-html": "^1.20.0"
+      },
+      "dependencies": {
+        "@fortawesome/fontawesome-common-types": {
+          "version": "0.2.18",
+          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.18.tgz",
+          "integrity": "sha512-834DrzO2Ne3upCW+mJJPC/E6BsFcj+2Z1HmPIhbpbj8UaKmXWum4NClqLpUiMetugRlHuG4jbIHNdv2/lc3c1Q==",
+          "dev": true
+        },
+        "@fortawesome/fontawesome-svg-core": {
+          "version": "1.2.18",
+          "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.18.tgz",
+          "integrity": "sha512-1vyLWVQqxQ8q8bA2zgZcljk3RkeELlDJ757ymLk+ebK019AFgEFH5kTnR5OMN1SFsTwW1OHlFQO3VufdeCg/Gg==",
+          "dev": true,
+          "requires": {
+            "@fortawesome/fontawesome-common-types": "^0.2.18"
+          }
+        },
+        "@fortawesome/free-solid-svg-icons": {
+          "version": "5.8.2",
+          "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.8.2.tgz",
+          "integrity": "sha512-5tF6WOFlqqO95zY5ukSB6jliDa3jnk1p5L4K/a58ccDFsbjSkhfGuvZkRkeWxH8uMms81pZd6yQTwQrkedeJmg==",
+          "dev": true,
+          "requires": {
+            "@fortawesome/fontawesome-common-types": "^0.2.18"
+          }
+        },
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
+          }
+        },
+        "react": {
+          "version": "16.8.6",
+          "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
+          "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1",
+            "prop-types": "^15.6.2",
+            "scheduler": "^0.13.6"
+          }
+        },
+        "react-dom": {
+          "version": "16.8.6",
+          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
+          "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1",
+            "prop-types": "^15.6.2",
+            "scheduler": "^0.13.6"
+          }
+        },
+        "react-is": {
+          "version": "16.8.6",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+          "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==",
+          "dev": true
+        },
+        "scheduler": {
+          "version": "0.13.6",
+          "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
+          "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.1"
+          }
+        }
      }
    },
    "@fortawesome/fontawesome-common-types": {
@@ -1571,11 +1690,6 @@
        "url-template": "^2.0.8"
      }
    },
-    "@sambego/storybook-styles": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@sambego/storybook-styles/-/storybook-styles-1.0.0.tgz",
-      "integrity": "sha512-n0SqZwDewUDRaStEcoNMiYy9qovaLVStsh4Gb2dc2LLiG3IIK0UXdeR1N7puVuRihJq/192uOyGPCjZ/NAteuA=="
-    },
    "@semantic-release/commit-analyzer": {
      "version": "6.1.0",
      "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-6.1.0.tgz",
@@ -1909,12 +2023,24 @@
        "defer-to-connect": "^1.0.1"
      }
    },
+    "@types/cookie": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
+      "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==",
+      "dev": true
+    },
    "@types/node": {
      "version": "10.12.18",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz",
      "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==",
      "dev": true
    },
+    "@types/object-assign": {
+      "version": "4.0.30",
+      "resolved": "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz",
+      "integrity": "sha1-iUk3HVqZ9Dge4PHfCpt6GH4H5lI=",
+      "dev": true
+    },
    "@types/q": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz",
@@ -2208,9 +2334,10 @@
      }
    },
    "airbnb-prop-types": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.11.0.tgz",
-      "integrity": "sha512-Y46/0gNVDy5gpedxIaoKjigdes+TouqVg7GTYQr73PBfE/lTSvOR/WIgUib0Zonm3Hyvlcax0mHr+v4K8DfGGw==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.13.2.tgz",
+      "integrity": "sha512-2FN6DlHr6JCSxPPi25EnqGaXC4OC3/B3k1lCd6MMYrZ51/Gf/1qDfaR+JElzWa+Tl7cY2aYOlsYJGFeQyVHIeQ==",
+      "dev": true,
      "requires": {
        "array.prototype.find": "^2.0.4",
        "function.prototype.name": "^1.1.0",
@@ -2218,9 +2345,29 @@
        "is-regex": "^1.0.4",
        "object-is": "^1.0.1",
        "object.assign": "^4.1.0",
-        "object.entries": "^1.0.4",
-        "prop-types": "^15.6.2",
-        "prop-types-exact": "^1.2.0"
+        "object.entries": "^1.1.0",
+        "prop-types": "^15.7.2",
+        "prop-types-exact": "^1.2.0",
+        "react-is": "^16.8.6"
+      },
+      "dependencies": {
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
+          }
+        },
+        "react-is": {
+          "version": "16.8.6",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
+          "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==",
+          "dev": true
+        }
      }
    },
    "ajv": {
@@ -2259,6 +2406,12 @@
      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
      "dev": true
    },
+    "ansi": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=",
+      "dev": true
+    },
    "ansi-align": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -2329,6 +2482,7 @@
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
      "requires": {
        "color-convert": "^1.9.0"
      }
@@ -2500,7 +2654,8 @@
    "array-uniq": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
    },
    "array-unique": {
      "version": "0.2.1",
@@ -2509,12 +2664,13 @@
      "dev": true
    },
    "array.prototype.find": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz",
-      "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz",
+      "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==",
+      "dev": true,
      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.7.0"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.13.0"
      }
    },
    "array.prototype.flat": {
@@ -2583,7 +2739,8 @@
    "assert-ok": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/assert-ok/-/assert-ok-1.0.0.tgz",
-      "integrity": "sha1-W1z3lfknXFnHFNZsOgbX3nDkPsg="
+      "integrity": "sha1-W1z3lfknXFnHFNZsOgbX3nDkPsg=",
+      "dev": true
    },
    "assert-plus": {
      "version": "1.0.0",
@@ -3486,6 +3643,7 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
      "requires": {
        "babel-runtime": "^6.26.0",
        "core-js": "^2.5.0",
@@ -3495,7 +3653,8 @@
        "regenerator-runtime": {
          "version": "0.10.5",
          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
        }
      }
    },
@@ -3589,6 +3748,7 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
      "requires": {
        "core-js": "^2.4.0",
        "regenerator-runtime": "^0.11.0"
@@ -4080,9 +4240,10 @@
      "dev": true
    },
    "bootstrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz",
-      "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==",
+      "dev": true
    },
    "bottleneck": {
      "version": "2.15.0",
@@ -4590,6 +4751,25 @@
      "integrity": "sha512-ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g==",
      "dev": true
    },
+    "caporal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/caporal/-/caporal-1.1.0.tgz",
+      "integrity": "sha512-R5qo2QGoqBM6RvzHonGhUuEJSeqEa4lD1r+cPUEY2+YsXhpQVTS2TvScfIbi6ydFdhzFCNeNUB1v0YrRBvsbdg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.4.7",
+        "cli-table3": "^0.5.0",
+        "colorette": "1.0.1",
+        "fast-levenshtein": "^2.0.6",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.kebabcase": "^4.1.1",
+        "lodash.merge": "^4.6.0",
+        "micromist": "1.1.0",
+        "prettyjson": "^1.2.1",
+        "tabtab": "^2.2.2",
+        "winston": "^2.3.1"
+      }
+    },
    "capture-exit": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
@@ -4625,6 +4805,7 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/cast-array/-/cast-array-1.0.1.tgz",
      "integrity": "sha1-Jk7xEp5YiLxIysQP6RTp9puNGJ0=",
+      "dev": true,
      "requires": {
        "isarray": "0.0.1"
      },
@@ -4632,7 +4813,8 @@
        "isarray": {
          "version": "0.0.1",
          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
        }
      }
    },
@@ -4802,7 +4984,8 @@
    "classnames": {
      "version": "2.2.6",
      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==",
+      "dev": true
    },
    "clean-css": {
      "version": "4.2.1",
@@ -4860,6 +5043,50 @@
        }
      }
    },
+    "cli-table3": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
+      "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2",
+        "object-assign": "^4.1.0",
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
    "cli-width": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz",
@@ -5000,6 +5227,7 @@
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
      "requires": {
        "color-name": "1.1.3"
      }
@@ -5007,7 +5235,8 @@
    "color-name": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
    },
    "color-string": {
      "version": "0.3.0",
@@ -5018,6 +5247,12 @@
        "color-name": "^1.0.0"
      }
    },
+    "colorette": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.0.1.tgz",
+      "integrity": "sha512-40MnlppkzHhFjRhtXunbpqKUT+eJn0gyVGi8aQlNSG8T2CCy31NdD7yktcS0aizH1VP2OhhQCyGMeTp0a/fvaw==",
+      "dev": true
+    },
    "colormin": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
@@ -5338,7 +5573,8 @@
    "core-js": {
      "version": "2.6.1",
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.1.tgz",
-      "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg=="
+      "integrity": "sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==",
+      "dev": true
    },
    "core-util-is": {
      "version": "1.0.2",
@@ -5547,7 +5783,8 @@
    "css-mediaquery": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/css-mediaquery/-/css-mediaquery-0.1.2.tgz",
-      "integrity": "sha1-aiw3NEkoYYYxxUvTPO3TAdoYvqA="
+      "integrity": "sha1-aiw3NEkoYYYxxUvTPO3TAdoYvqA=",
+      "dev": true
    },
    "css-select": {
      "version": "1.2.0",
@@ -5794,6 +6031,12 @@
        "logalot": "^2.1.0"
      }
    },
+    "cycle": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
+      "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=",
+      "dev": true
+    },
    "cyclist": {
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
@@ -5896,8 +6139,7 @@
    "decode-uri-component": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
    },
    "decompress": {
      "version": "4.2.0",
@@ -6121,6 +6363,7 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
      "requires": {
        "object-keys": "^1.0.12"
      }
@@ -6345,10 +6588,20 @@
        "utila": "~0.4"
      }
    },
+    "dom-helpers": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
+      "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.1.2"
+      }
+    },
    "dom-serializer": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
      "requires": {
        "domelementtype": "~1.1.1",
        "entities": "~1.1.1"
@@ -6357,7 +6610,8 @@
        "domelementtype": {
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
        }
      }
    },
@@ -6370,7 +6624,8 @@
    "domelementtype": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
    },
    "domexception": {
      "version": "1.0.1",
@@ -6385,6 +6640,7 @@
      "version": "2.4.2",
      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
      "requires": {
        "domelementtype": "1"
      }
@@ -6393,6 +6649,7 @@
      "version": "1.7.0",
      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
      "requires": {
        "dom-serializer": "0",
        "domelementtype": "1"
@@ -6505,17 +6762,19 @@
      }
    },
    "email-prop-type": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/email-prop-type/-/email-prop-type-1.1.7.tgz",
-      "integrity": "sha512-5dhzRyH20+oooO5ZN4xJBSKuXj5gVg523gYGlj/bADXXx6ZsiB8x0XgPGLWOeZee9sURjgtyVc0RoBkfh0AfaA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/email-prop-type/-/email-prop-type-3.0.0.tgz",
+      "integrity": "sha512-717XiCoLR3g6KIKbjim2OuBr7BKNgCiP74z/4DGt2xPsX1h3VlY1GiKy42Qy1EqONfeg/3FhtgaUcsAy7YcqHQ==",
+      "dev": true,
      "requires": {
-        "email-validator": "^2.0.0"
+        "email-validator": "^2.0.4"
      }
    },
    "email-validator": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz",
-      "integrity": "sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="
+      "integrity": "sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==",
+      "dev": true
    },
    "emoji-regex": {
      "version": "6.5.1",
@@ -6558,7 +6817,8 @@
    "entities": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
    },
    "env-ci": {
      "version": "3.1.3",
@@ -6685,6 +6945,7 @@
      "version": "1.13.0",
      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "dev": true,
      "requires": {
        "es-to-primitive": "^1.2.0",
        "function-bind": "^1.1.1",
@@ -6694,10 +6955,30 @@
        "object-keys": "^1.0.12"
      }
    },
+    "es-check": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es-check/-/es-check-5.0.0.tgz",
+      "integrity": "sha512-30n+EZt5KjazXEvyYr2DXJCOJJWfdT1unRp5+Szlcja6uGAB3Sh3QPjRsxd2xgN9SFj4S5P8pdBISwGcDdS45Q==",
+      "dev": true,
+      "requires": {
+        "acorn": "6.0.4",
+        "caporal": "1.1.0",
+        "glob": "^7.1.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz",
+          "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==",
+          "dev": true
+        }
+      }
+    },
    "es-to-primitive": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "dev": true,
      "requires": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -6728,7 +7009,8 @@
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
    },
    "escodegen": {
      "version": "1.11.0",
@@ -7878,6 +8160,12 @@
      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
      "dev": true
    },
+    "eyes": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz",
+      "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=",
+      "dev": true
+    },
    "fast-deep-equal": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -8756,7 +9044,8 @@
    "font-awesome": {
      "version": "4.7.0",
      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
+      "dev": true
    },
    "for-in": {
      "version": "1.0.2",
@@ -9425,12 +9714,14 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
    },
    "function.prototype.name": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.0.tgz",
      "integrity": "sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.2",
        "function-bind": "^1.1.1",
@@ -9827,6 +10118,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@@ -9843,7 +10135,8 @@
    "has-flag": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
    },
    "has-symbol-support-x": {
      "version": "1.4.2",
@@ -9854,7 +10147,8 @@
    "has-symbols": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
    },
    "has-to-string-tag-x": {
      "version": "1.4.1",
@@ -9969,9 +10263,13 @@
      }
    },
    "hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+      "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+      "dev": true,
+      "requires": {
+        "react-is": "^16.7.0"
+      }
    },
    "home-or-tmp": {
      "version": "2.0.0",
@@ -10099,6 +10397,7 @@
      "version": "3.10.0",
      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
      "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
+      "dev": true,
      "requires": {
        "domelementtype": "^1.3.0",
        "domhandler": "^2.3.0",
@@ -10112,6 +10411,7 @@
          "version": "3.1.1",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+          "dev": true,
          "requires": {
            "inherits": "^2.0.3",
            "string_decoder": "^1.1.1",
@@ -10555,9 +10855,16 @@
      }
    },
    "hyphenate-style-name": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
-      "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz",
+      "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==",
+      "dev": true
+    },
+    "i18n-iso-countries": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-4.1.0.tgz",
+      "integrity": "sha512-ttqCFBUvVSwUCgyjjIG95lilFg/61INah89ih/znBYHrZAcD5HsFUr8CJBmEgIOPbw0jZFgAPAsYRPGQexMTeA==",
+      "dev": true
    },
    "iconv-lite": {
      "version": "0.4.24",
@@ -10979,7 +11286,8 @@
    "inherits": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
    },
    "ini": {
      "version": "1.3.5",
@@ -11057,14 +11365,16 @@
      "dev": true
    },
    "intl-format-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.1.0.tgz",
-      "integrity": "sha1-BKNp/sv61tpgBbrh8UMzMy3PkxY="
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz",
+      "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==",
+      "dev": true
    },
    "intl-messageformat": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz",
      "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=",
+      "dev": true,
      "requires": {
        "intl-messageformat-parser": "1.4.0"
      }
@@ -11072,12 +11382,14 @@
    "intl-messageformat-parser": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz",
-      "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU="
+      "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=",
+      "dev": true
    },
    "intl-relativeformat": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz",
-      "integrity": "sha1-AQ8RBYAiUfQKxH0OPhogE0iiVd8=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz",
+      "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==",
+      "dev": true,
      "requires": {
        "intl-messageformat": "^2.0.0"
      }
@@ -11096,6 +11408,7 @@
      "version": "2.2.4",
      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
      "requires": {
        "loose-envify": "^1.0.0"
      }
@@ -11178,7 +11491,8 @@
    "is-callable": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
    },
    "is-ci": {
      "version": "1.2.1",
@@ -11210,7 +11524,8 @@
    "is-date-object": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
    },
    "is-descriptor": {
      "version": "0.1.6",
@@ -11450,6 +11765,7 @@
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
      "requires": {
        "has": "^1.0.1"
      }
@@ -11503,6 +11819,7 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
      "requires": {
        "has-symbols": "^1.0.0"
      }
@@ -11552,6 +11869,12 @@
      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
      "dev": true
    },
+    "iso-countries-languages": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/iso-countries-languages/-/iso-countries-languages-0.2.1.tgz",
+      "integrity": "sha512-MSLwTToJmw0VS/NdCvwsgt28zE5A/rGsPpdPOrepFgAanVDBUguAgGj/73NTIrLifICz2pTmJNHZNPwDXmAMTw==",
+      "dev": true
+    },
    "isobject": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
@@ -12137,11 +12460,6 @@
        "merge-stream": "^1.0.1"
      }
    },
-    "jquery": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
-      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
-    },
    "js-base64": {
      "version": "2.5.0",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz",
@@ -12157,7 +12475,8 @@
    "js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
    },
    "js-yaml": {
      "version": "3.12.1",
@@ -12484,7 +12803,8 @@
    "lodash.clonedeep": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
    },
    "lodash.debounce": {
      "version": "4.0.8",
@@ -12492,6 +12812,12 @@
      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
      "dev": true
    },
+    "lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
+      "dev": true
+    },
    "lodash.escape": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
@@ -12501,7 +12827,8 @@
    "lodash.escaperegexp": {
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c="
+      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=",
+      "dev": true
    },
    "lodash.flattendeep": {
      "version": "4.4.0",
@@ -12524,12 +12851,14 @@
    "lodash.isplainobject": {
      "version": "4.0.6",
      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
    },
    "lodash.isstring": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
+      "dev": true
    },
    "lodash.kebabcase": {
      "version": "4.1.1",
@@ -12552,7 +12881,8 @@
    "lodash.mergewith": {
      "version": "4.6.1",
      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true
    },
    "lodash.omit": {
      "version": "4.5.0",
@@ -12560,6 +12890,24 @@
      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=",
      "dev": true
    },
+    "lodash.pad": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz",
+      "integrity": "sha1-QzCUmoM6fI2iLMIPaibE1Z3runA=",
+      "dev": true
+    },
+    "lodash.padend": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
+      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
+      "dev": true
+    },
+    "lodash.padstart": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz",
+      "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=",
+      "dev": true
+    },
    "lodash.pick": {
      "version": "4.4.0",
      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
@@ -12687,6 +13035,7 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
      "requires": {
        "js-tokens": "^3.0.0 || ^4.0.0"
      }
@@ -12915,11 +13264,23 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/mailto-link/-/mailto-link-1.0.0.tgz",
      "integrity": "sha1-9Sqp/MEXPLOAkV3xZNsxSRiRUl0=",
+      "dev": true,
      "requires": {
        "assert-ok": "~1.0.0",
        "cast-array": "~1.0.0",
        "object-filter": "~1.0.2",
        "query-string": "~2.4.1"
+      },
+      "dependencies": {
+        "query-string": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-2.4.2.tgz",
+          "integrity": "sha1-fbBmZCCAS6qSrp8miWKFWnYUPfs=",
+          "dev": true,
+          "requires": {
+            "strict-uri-encode": "^1.0.0"
+          }
+        }
      }
    },
    "make-dir": {
@@ -13006,6 +13367,7 @@
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/matchmediaquery/-/matchmediaquery-0.3.0.tgz",
      "integrity": "sha512-u0dlv+VENJ+3YepvwSPBieuvnA6DWfaYa/ctwysAR13y4XLJNyt7bEVKzNj/Nvjo+50d88Pj+xL9xaSo6JmX/w==",
+      "dev": true,
      "requires": {
        "css-mediaquery": "^0.1.2"
      }
@@ -13135,6 +13497,15 @@
        "regex-cache": "^0.4.2"
      }
    },
+    "micromist": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/micromist/-/micromist-1.1.0.tgz",
+      "integrity": "sha512-+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg==",
+      "dev": true,
+      "requires": {
+        "lodash.camelcase": "^4.3.0"
+      }
+    },
    "miller-rabin": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
@@ -17036,7 +17407,8 @@
    "number-is-nan": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
    },
    "nwsapi": {
      "version": "2.0.9",
@@ -17080,7 +17452,8 @@
    "object-filter": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
-      "integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g="
+      "integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g=",
+      "dev": true
    },
    "object-inspect": {
      "version": "1.6.0",
@@ -17091,12 +17464,14 @@
    "object-is": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+      "dev": true
    },
    "object-keys": {
      "version": "1.0.12",
      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag=="
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
    },
    "object-visit": {
      "version": "1.0.1",
@@ -17119,6 +17494,7 @@
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.2",
        "function-bind": "^1.1.1",
@@ -17130,6 +17506,7 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
      "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "es-abstract": "^1.12.0",
@@ -17366,6 +17743,12 @@
        "windows-release": "^3.1.0"
      }
    },
+    "os-shim": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz",
+      "integrity": "sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc=",
+      "dev": true
+    },
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -17833,11 +18216,6 @@
        }
      }
    },
-    "popper.js": {
-      "version": "1.14.6",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.6.tgz",
-      "integrity": "sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA=="
-    },
    "portfinder": {
      "version": "1.0.20",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
@@ -17864,23 +18242,45 @@
      "dev": true
    },
    "postcss": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.7.tgz",
-      "integrity": "sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==",
+      "version": "7.0.16",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz",
+      "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==",
+      "dev": true,
      "requires": {
-        "chalk": "^2.4.1",
+        "chalk": "^2.4.2",
        "source-map": "^0.6.1",
-        "supports-color": "^5.5.0"
+        "supports-color": "^6.1.0"
      },
      "dependencies": {
        "chalk": {
          "version": "2.4.2",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
          "requires": {
            "ansi-styles": "^3.2.1",
            "escape-string-regexp": "^1.0.5",
            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
          }
        }
      }
@@ -19909,6 +20309,16 @@
        }
      }
    },
+    "prettyjson": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz",
+      "integrity": "sha1-/P+rQdGcq0365eV15kJGYZsS0ok=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.1.2",
+        "minimist": "^1.2.0"
+      }
+    },
    "private": {
      "version": "0.1.8",
      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -19953,6 +20363,7 @@
      "version": "15.6.2",
      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
      "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
+      "dev": true,
      "requires": {
        "loose-envify": "^1.3.1",
        "object-assign": "^4.1.1"
@@ -19962,6 +20373,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
      "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "dev": true,
      "requires": {
        "has": "^1.0.3",
        "object.assign": "^4.1.0",
@@ -20068,10 +20480,12 @@
      "dev": true
    },
    "query-string": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-2.4.2.tgz",
-      "integrity": "sha1-fbBmZCCAS6qSrp8miWKFWnYUPfs=",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
        "strict-uri-encode": "^1.0.0"
      }
    },
@@ -20213,6 +20627,7 @@
      "version": "16.7.0",
      "resolved": "https://registry.npmjs.org/react/-/react-16.7.0.tgz",
      "integrity": "sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==",
+      "dev": true,
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1",
@@ -20459,6 +20874,7 @@
      "version": "16.7.0",
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz",
      "integrity": "sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==",
+      "dev": true,
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1",
@@ -20466,11 +20882,6 @@
        "scheduler": "^0.12.0"
      }
    },
-    "react-element-proptypes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/react-element-proptypes/-/react-element-proptypes-1.0.0.tgz",
-      "integrity": "sha1-ygpafBYk646CrQjqeIzfyWvBpRc="
-    },
    "react-error-overlay": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.1.tgz",
@@ -20478,11 +20889,12 @@
      "dev": true
    },
    "react-intl": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.8.0.tgz",
-      "integrity": "sha512-1cSasNkHxZOXYYhms9Q1tSEWF8AWZQNq3nPLB/j8mYV0ZTSt2DhGQXHfKrKQMu4cgj9J1Crqg7xFPICTBgzqtQ==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz",
+      "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==",
+      "dev": true,
      "requires": {
-        "hoist-non-react-statics": "^2.5.5",
+        "hoist-non-react-statics": "^3.3.0",
        "intl-format-cache": "^2.0.5",
        "intl-messageformat": "^2.1.0",
        "intl-relativeformat": "^2.1.0",
@@ -20498,12 +20910,14 @@
    "react-proptype-conditional-require": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz",
-      "integrity": "sha1-acLVdB5t9eCPIw82u8KUTuEiJVU="
+      "integrity": "sha1-acLVdB5t9eCPIw82u8KUTuEiJVU=",
+      "dev": true
    },
    "react-responsive": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-5.0.0.tgz",
-      "integrity": "sha512-oEimZ0FTCC3/pjGDEBHOz06nWbBNDIbMGOdRYp6K9SBUmrqgNAX77hTiqvmRQeLyI97zz4F4kiaFRxFspDxE+w==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-6.1.2.tgz",
+      "integrity": "sha512-AXentVC/kN3KED9zhzJv2pu4vZ0i6cSHdTtbCScVV1MT6F5KXaG2qs5D7WLmhdaOvmiMX8UfmS4ZSO+WPwDt4g==",
+      "dev": true,
      "requires": {
        "hyphenate-style-name": "^1.0.0",
        "matchmediaquery": "^0.3.0",
@@ -20522,6 +20936,17 @@
        "scheduler": "^0.12.0"
      }
    },
+    "react-transition-group": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.0.1.tgz",
+      "integrity": "sha512-SsLcBYhO4afXJC9esL8XMxi/y0ZvEc7To0TvtrBELqzpjXQHPZOTxvuPh2/4EhYc0uSMfp2SExIxsyJ0pBdNzg==",
+      "dev": true,
+      "requires": {
+        "dom-helpers": "^3.4.0",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.6.2"
+      }
+    },
    "reactifex": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/reactifex/-/reactifex-1.1.1.tgz",
@@ -20949,7 +21374,8 @@
    "reflect.ownkeys": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
-      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA="
+      "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=",
+      "dev": true
    },
    "regenerate": {
      "version": "1.4.0",
@@ -20969,7 +21395,8 @@
    "regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
    },
    "regenerator-transform": {
      "version": "0.10.1",
@@ -21399,6 +21826,12 @@
        "aproba": "^1.1.1"
      }
    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
+      "dev": true
+    },
    "rx-lite": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
@@ -21426,7 +21859,8 @@
    "safe-buffer": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
    },
    "safe-regex": {
      "version": "1.1.0",
@@ -21757,9 +22191,10 @@
      }
    },
    "sanitize-html": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.20.0.tgz",
-      "integrity": "sha512-BpxXkBoAG+uKCHjoXFmox6kCSYpnulABoGcZ/R3QyY9ndXbIM5S94eOr1IqnzTG8TnbmXaxWoDDzKC5eJv7fEQ==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.20.1.tgz",
+      "integrity": "sha512-txnH8TQjaQvg2Q0HY06G6CDJLVYCpbnxrdO0WN8gjCKaU5J0KbyGYhZxx5QJg3WLZ1lB7XU9kDkfrCXUozqptA==",
+      "dev": true,
      "requires": {
        "chalk": "^2.4.1",
        "htmlparser2": "^3.10.0",
@@ -21777,6 +22212,7 @@
          "version": "2.4.2",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
          "requires": {
            "ansi-styles": "^3.2.1",
            "escape-string-regexp": "^1.0.5",
@@ -21972,6 +22408,7 @@
      "version": "0.12.0",
      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz",
      "integrity": "sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==",
+      "dev": true,
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1"
@@ -22785,7 +23222,8 @@
    "source-map": {
      "version": "0.6.1",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
    },
    "source-map-loader": {
      "version": "0.2.4",
@@ -22839,6 +23277,16 @@
      "integrity": "sha1-Gv2Uc46ZmwNG17n8NzvlXgdXcCk=",
      "dev": true
    },
+    "spawn-sync": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz",
+      "integrity": "sha1-sAeZVX63+wyDdsKdROih6mfldHY=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.4.7",
+        "os-shim": "^0.1.2"
+      }
+    },
    "spdx-correct": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -23018,6 +23466,7 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz",
      "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=",
+      "dev": true,
      "requires": {
        "array-uniq": "^1.0.2",
        "number-is-nan": "^1.0.0"
@@ -23055,6 +23504,12 @@
      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
      "dev": true
    },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
    "stack-utils": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
@@ -23210,6 +23665,7 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
      "requires": {
        "safe-buffer": "~5.1.0"
      }
@@ -23279,6 +23735,7 @@
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
      "requires": {
        "has-flag": "^3.0.0"
      }
@@ -23367,6 +23824,136 @@
        }
      }
    },
+    "tabtab": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz",
+      "integrity": "sha1-egR/FDsBC0y9MfhX6ClhUSy/ThQ=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.2.0",
+        "inquirer": "^1.0.2",
+        "lodash.difference": "^4.5.0",
+        "lodash.uniq": "^4.5.0",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "npmlog": "^2.0.3",
+        "object-assign": "^4.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "cli-width": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+          "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+          "dev": true
+        },
+        "external-editor": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz",
+          "integrity": "sha1-Etew24UPf/fnCBuvQAVwAGDEYAs=",
+          "dev": true,
+          "requires": {
+            "extend": "^3.0.0",
+            "spawn-sync": "^1.0.15",
+            "tmp": "^0.0.29"
+          }
+        },
+        "gauge": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz",
+          "integrity": "sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=",
+          "dev": true,
+          "requires": {
+            "ansi": "^0.3.0",
+            "has-unicode": "^2.0.0",
+            "lodash.pad": "^4.1.0",
+            "lodash.padend": "^4.1.0",
+            "lodash.padstart": "^4.1.0"
+          }
+        },
+        "inquirer": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz",
+          "integrity": "sha1-TexvMvN+97sLLtPx0aXD9UUHSRg=",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^1.1.0",
+            "chalk": "^1.0.0",
+            "cli-cursor": "^1.0.1",
+            "cli-width": "^2.0.0",
+            "external-editor": "^1.1.0",
+            "figures": "^1.3.5",
+            "lodash": "^4.3.0",
+            "mute-stream": "0.0.6",
+            "pinkie-promise": "^2.0.0",
+            "run-async": "^2.2.0",
+            "rx": "^4.1.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "mute-stream": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz",
+          "integrity": "sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s=",
+          "dev": true
+        },
+        "npmlog": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz",
+          "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=",
+          "dev": true,
+          "requires": {
+            "ansi": "~0.3.1",
+            "are-we-there-yet": "~1.1.2",
+            "gauge": "~1.2.5"
+          }
+        },
+        "run-async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+          "dev": true,
+          "requires": {
+            "is-promise": "^2.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "tmp": {
+          "version": "0.0.29",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
+          "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.1"
+          }
+        }
+      }
+    },
    "tapable": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
@@ -24343,6 +24930,18 @@
        "crypto-random-string": "^1.0.0"
      }
    },
+    "universal-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.0.tgz",
+      "integrity": "sha512-6JVx+3oGPjslGqFhQ8YSIBHmYTx8HbyAEH++2/b6SKNXsbsdQ7lU7wRG2bYcRB5JVCz8GYgQ+Ixew91hn3Dy9w==",
+      "dev": true,
+      "requires": {
+        "@types/cookie": "^0.3.1",
+        "@types/object-assign": "^4.0.30",
+        "cookie": "^0.3.1",
+        "object-assign": "^4.1.0"
+      }
+    },
    "universal-user-agent": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.0.2.tgz",
@@ -24554,7 +25153,8 @@
    "util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
    },
    "util.promisify": {
      "version": "1.0.0",
@@ -26479,6 +27079,34 @@
        }
      }
    },
+    "winston": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz",
+      "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==",
+      "dev": true,
+      "requires": {
+        "async": "~1.0.0",
+        "colors": "1.0.x",
+        "cycle": "1.0.x",
+        "eyes": "0.1.x",
+        "isstream": "0.1.x",
+        "stack-trace": "0.0.x"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
+          "dev": true
+        },
+        "colors": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+          "dev": true
+        }
+      }
+    },
    "wordwrap": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -26560,7 +27188,8 @@
    "xtend": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
    },
    "y18n": {
      "version": "3.2.1",
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
    "gc": "commit",
    "commitmsg": "commitlint -e $GIT_PARAMS",
    "coveralls": "cat ./coverage/lcov.info | coveralls",
+    "is-es5": "es-check es5 ./dist/*.js",
    "i18n_extract": "BABEL_ENV=i18n babel src --quiet > /dev/null",
    "lint": "eslint --ext .js --ext .jsx .",
    "precommit": "npm run lint",
@@ -39,6 +40,10 @@
    "@commitlint/config-angular": "^6.0.2",
    "@commitlint/prompt": "^6.0.2",
    "@commitlint/prompt-cli": "^6.0.2",
+    "@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",
@@ -57,6 +62,7 @@
    "css-loader": "^0.28.9",
    "enzyme": "^3.3.0",
    "enzyme-adapter-react-16": "^1.1.1",
+    "es-check": "^5.0.0",
    "eslint": "^5.2.0",
    "eslint-config-edx": "^4.0.4",
    "eslint-plugin-jsx-a11y": "^6.1.2",
@@ -67,7 +73,10 @@
    "image-webpack-loader": "^4.2.0",
    "jest": "23.6.0",
    "node-sass": "^4.7.2",
+    "prop-types": "^15.5.10",
+    "react": "^16.4.2",
    "react-dev-utils": "^5.0.0",
+    "react-dom": "^16.2.0",
    "react-test-renderer": "^16.6.0",
    "reactifex": "^1.1.1",
    "sass-loader": "^6.0.6",
@@ -82,11 +91,15 @@
    "webpack-merge": "^4.2.1"
  },
  "dependencies": {
-    "@edx/paragon": "^3.8.0",
+    "query-string": "^5.1.1"
+  },
+  "peerDependencies": {
+    "@edx/frontend-i18n": "^2.1.0",
+    "@edx/frontend-logging": "^2.0.2",
+    "@edx/paragon": "^4.2.4",
    "prop-types": "^15.5.10",
    "react": "^16.4.2",
-    "react-dom": "^16.2.0",
-    "react-intl": "2.x"
+    "react-dom": "^16.2.0"
  },
  "jest": {
    "setupFiles": [
--- a/src/i18n/i18n-concat.js
+++ b/src/i18n/i18n-concat.js
@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * See the Makefile for how the required hash file is downloaded from Transifex.
- */
-
-// NOTE: This script is called from Jenkins using devDependencies, so eslint is being
-// disabled so it doesn't force you to make these real dependencies.
-const fs = require('fs'); // eslint-disable-line import/no-extraneous-dependencies
-const glob = require('glob'); // eslint-disable-line import/no-extraneous-dependencies
-const path = require('path'); // eslint-disable-line import/no-extraneous-dependencies
-
-// Expected input: a directory, possibly containing subdirectories, with .json files.  Each .json
-// file is an array of translation triplets (id, description, defaultMessage).
-function gatherJson(dir) {
-  const ret = [];
-  const files = glob.sync(`${dir}/**/*.json`);
-
-  files.forEach((filename) => {
-    const messages = JSON.parse(fs.readFileSync(filename));
-    ret.push(...messages);
-  });
-  return ret;
-}
-
-// the hash file returns ids whose periods are "escaped" (sort of), like this:
-// "key": "profile\\.sociallinks\\.social\\.links"
-// so our regular messageIds won't match them out of the box
-function escapeDots(messageId) {
-  return messageId.replace(/\./g, '\\.');
-}
-
-const jsonDir = process.argv[2];
-const messageObjects = gatherJson(jsonDir);
-
-if (process.argv[3] === '--comments') { // prepare to handle the translator notes
-  const loggingPrefix = path.basename(`${__filename}`); // the name of this JS file
-  const bashScriptsPath = './node_modules/reactifex/bash_scripts';
-
-  const hashFile = `${bashScriptsPath}/hashmap.json`;
-  process.stdout.write(`${loggingPrefix}: reading hash file ${hashFile}\n`);
-  const messageInfo = JSON.parse(fs.readFileSync(hashFile));
-
-  const outputFile = `${bashScriptsPath}/hashed_data.txt`;
-  process.stdout.write(`${loggingPrefix}: writing to output file ${outputFile}\n`);
-  fs.writeFileSync(outputFile, '');
-
-  messageObjects.forEach((message) => {
-    const transifexFormatId = escapeDots(message.id);
-
-    const info = messageInfo.find(mi => mi.key === transifexFormatId);
-    if (info) {
-      fs.appendFileSync(outputFile, `${info.string_hash}|${message.description}\n`);
-    } else {
-      process.stdout.write(`${loggingPrefix}: string ${message.id} does not yet exist on transifex!\n`);
-    }
-  });
-} else {
-  const output = {};
-
-  messageObjects.forEach((message) => {
-    output[message.id] = message.defaultMessage;
-  });
-  fs.writeFileSync(process.argv[3], JSON.stringify(output, null, 2));
-}
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -0,0 +1,32 @@
+import arMessages from './messages/ar.json';
+import caMessages from './messages/ca.json';
+// no need to import en messages-- they are in the defaultMessage field
+import es419Messages from './messages/es_419.json';
+import frMessages from './messages/fr.json';
+import zhcnMessages from './messages/zh_CN.json';
+import heMessages from './messages/he.json';
+import idMessages from './messages/id.json';
+import kokrMessages from './messages/ko_kr.json';
+import plMessages from './messages/pl.json';
+import ptbrMessages from './messages/pt_br.json';
+import ruMessages from './messages/ru.json';
+import thMessages from './messages/th.json';
+import ukMessages from './messages/uk.json';
+
+const messages = {
+  ar: arMessages,
+  'es-419': es419Messages,
+  fr: frMessages,
+  'zh-cn': zhcnMessages,
+  ca: caMessages,
+  he: heMessages,
+  id: idMessages,
+  'ko-kr': kokrMessages,
+  pl: plMessages,
+  'pt-br': ptbrMessages,
+  ru: ruMessages,
+  th: thMessages,
+  uk: ukMessages,
+};
+
+export default messages;
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "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/ca.json
+++ b/src/i18n/messages/ca.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "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.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "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/he.json
+++ b/src/i18n/messages/he.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/id.json
+++ b/src/i18n/messages/id.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/ko_kr.json
+++ b/src/i18n/messages/ko_kr.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/pl.json
+++ b/src/i18n/messages/pl.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/pt_br.json
+++ b/src/i18n/messages/pt_br.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/th.json
+++ b/src/i18n/messages/th.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -0,0 +1 @@
+{}
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -1,39 +1 @@
-{
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "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/transifex_input.json
+++ b/src/i18n/transifex_input.json
@@ -1,39 +0,0 @@
-{
-  "footer.site-footer.link.about": "About",
-  "footer.site-footer.link.business": "{siteName} for Business",
-  "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/index.jsx
+++ b/src/index.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { render } from 'react-dom';
-import { IntlProvider } from 'react-intl';

 /* eslint-disable import/no-extraneous-dependencies */
 import {
@@ -8,7 +7,6 @@ import {
  faTwitterSquare,
  faYoutubeSquare,
  faLinkedin,
-  faGooglePlusSquare,
  faRedditSquare,
 } from '@fortawesome/free-brands-svg-icons';
 import { faLanguage } from '@fortawesome/free-solid-svg-icons';
@@ -20,6 +18,80 @@ import './index.scss';
 import FooterLogo from './edx-footer.png';


+const edXLinks = [
+  {
+    title: 'About',
+    url: 'https://www.example.com/about-us',
+  },
+  {
+    title: 'edX for Business',
+    url: 'https://business.edx.org',
+    queryParams: { utm_test: 'utm_test_value' },
+  },
+  {
+    title: 'Affiliates',
+    url: 'https://www.example.com/affiliate-program',
+  },
+  {
+    title: 'Open edX',
+    url: 'https://www.example.com/open',
+  },
+  {
+    title: 'Careers',
+    url: 'https://www.example.com/careers',
+  },
+  {
+    title: 'News',
+    url: 'https://www.example.com/news-announcements',
+  },
+];
+
+const legalLinks = [
+  {
+    title: 'Terms of Service & Honor Code',
+    url: 'https://www.example.com/terms-of-service',
+  },
+  {
+    title: 'Privacy Policy',
+    url: 'https://www.example.com/privacy-policy',
+  },
+  {
+    title: 'Accessibility Policy',
+    url: 'https://www.example.com/accessibility',
+  },
+  {
+    title: 'Trademark Policy',
+    url: 'https://www.example.com/trademarks',
+  },
+  {
+    title: 'Sitemap',
+    url: 'https://www.example.com/sitemap',
+  },
+];
+
+const connectLinks = [
+  {
+    title: 'Blog',
+    url: 'https://www.example.com/blog',
+  },
+  {
+    title: 'Contact Us',
+    url: 'https://www.example.com/contact',
+  },
+  {
+    title: 'Help Center',
+    url: 'https://www.example.com/support',
+  },
+  {
+    title: 'Media Kit',
+    url: 'https://www.example.com/media-kit',
+  },
+  {
+    title: 'Donate',
+    url: 'https://www.example.com/donate',
+  },
+];
+
 const socialLinks = [
  {
    title: 'Facebook',
@@ -45,12 +117,6 @@ const socialLinks = [
    icon: <FontAwesomeIcon icon={faLinkedin} className="social-icon" size="2x" />,
    screenReaderText: 'Follow edX on LinkedIn',
  },
-  {
-    title: 'Google+',
-    url: 'https://plus.google.com',
-    icon: <FontAwesomeIcon icon={faGooglePlusSquare} className="social-icon" size="2x" />,
-    screenReaderText: 'Follow edX on Google+',
-  },
  {
    title: 'Reddit',
    url: 'https://reddit.com',
@@ -61,38 +127,57 @@ const socialLinks = [


 const App = () => (
-  <IntlProvider locale="en">
-    <SiteFooter
-      siteName="edX"
-      siteLogo={FooterLogo}
-      marketingSiteBaseUrl="https://www.example.com"
-      supportUrl="https://www.example.com/support"
-      contactUrl="https://www.example.com/contact"
-      openSourceUrl="https://www.example.com/open"
-      termsOfServiceUrl="https://www.example.com/terms-of-service"
-      privacyPolicyUrl="https://www.example.com/privacy-policy"
-      appleAppStoreUrl="https://store.apple.com"
-      googlePlayUrl="https://play.google.com"
-      handleAllTrackEvents={() => {}}
-      socialLinks={socialLinks}
-      supportedLanguages={[
-        {
-          label: 'English',
-          value: 'en',
-        }, {
-          label: 'español',
-          value: 'es-419',
-        },
-      ]}
-      languageForm={{
-        activeLanguage: 'en',
-        screenReaderLabel: 'Choose Language',
-        submitLabel: 'Apply',
-        icon: <FontAwesomeIcon icon={faLanguage} size="2x" className="text-primary" />,
-        onLanguageSelected: () => {},
-      }}
-    />
-  </IntlProvider>
+  <SiteFooter
+    siteLogo={{
+      src: FooterLogo,
+      altText: 'edx Logo',
+      ariaLabel: 'edX Home',
+    }}
+    ariaLabel="Page Footer"
+    marketingSiteBaseUrl="https://www.example.com"
+    appleAppStore={{
+      url: 'https://store.apple.com',
+      altText: 'Download the edX mobile app from the Apple App Store',
+    }}
+    googlePlay={{
+      url: 'https://play.google.com',
+      altText: 'Download the edX mobile app from Google Play',
+    }}
+    handleAllTrackEvents={() => {}}
+    linkSectionOne={{
+      title: 'edX',
+      linkList: edXLinks,
+    }}
+    linkSectionTwo={{
+      title: 'Legal',
+      linkList: legalLinks,
+    }}
+    linkSectionThree={{
+      title: 'Connect',
+      linkList: connectLinks,
+    }}
+    socialLinks={socialLinks}
+    supportedLanguages={[
+      {
+        label: 'English',
+        value: 'en',
+      }, {
+        label: 'español',
+        value: 'es-419',
+      },
+    ]}
+    languageForm={{
+      activeLanguage: 'en',
+      screenReaderLabel: 'Choose Language',
+      submitLabel: 'Apply',
+      icon: <FontAwesomeIcon icon={faLanguage} size="2x" className="text-primary" />,
+      onLanguageSelected: () => {},
+    }}
+    copyright="© 2012–2019 edX Inc."
+    trademark={(
+      <React.Fragment>EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a></React.Fragment>
+    )}
+  />
 );

 render(<App />, document.getElementById('root'));
--- a/src/lib/components/SiteFooter/SiteFooter.messages.js
+++ b/src/lib/components/SiteFooter/SiteFooter.messages.js
@@ -1,91 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  'footer.site-footer.site-logo.alt-text': {
-    id: 'footer.site-footer.site-logo.alt-text',
-    defaultMessage: '{siteName} logo',
-    description: 'The alt description of the site logo',
-  },
-  'footer.site-footer.site-logo.aria-label': {
-    id: 'footer.site-footer.site-logo.aria-label',
-    defaultMessage: '{siteName} Home',
-    description: 'Aria label for the site logo which goes to the marketing site',
-  },
-  'footer.site-footer.facebook.title': {
-    id: 'footer.site-footer.facebook.title',
-    defaultMessage: 'Facebook',
-    description: 'Facebook button title',
-  },
-  'footer.site-footer.facebook.screen-reader-text': {
-    id: 'footer.site-footer.facebook.screen-reader-text',
-    defaultMessage: 'Like {siteName} on Facebook',
-    description: 'Facebook button screen reader text',
-  },
-  'footer.site-footer.twitter.title': {
-    id: 'footer.site-footer.twitter.title',
-    defaultMessage: 'Twitter',
-    description: 'Twitter button title',
-  },
-  'footer.site-footer.twitter.screen-reader-text': {
-    id: 'footer.site-footer.twitter.screen-reader-text',
-    defaultMessage: 'Follow {siteName} on Twitter',
-    description: 'Twitter button screen reader text',
-  },
-  'footer.site-footer.youtube.title': {
-    id: 'footer.site-footer.youtube.title',
-    defaultMessage: 'Youtube',
-    description: 'Youtube button title',
-  },
-  'footer.site-footer.youtube.screen-reader-text': {
-    id: 'footer.site-footer.youtube.screen-reader-text',
-    defaultMessage: 'Subscribe to the {siteName} YouTube channel',
-    description: 'Youtube button screen reader text',
-  },
-  'footer.site-footer.linkedin.title': {
-    id: 'footer.site-footer.linkedin.title',
-    defaultMessage: 'LinkedIn',
-    description: 'LinkedIn button title',
-  },
-  'footer.site-footer.linkedin.screen-reader-text': {
-    id: 'footer.site-footer.linkedin.screen-reader-text',
-    defaultMessage: 'Follow {siteName} on LinkedIn',
-    description: 'LinkedIn button screen reader text',
-  },
-  'footer.site-footer.google-plus.title': {
-    id: 'footer.site-footer.google-plus.title',
-    defaultMessage: 'Google+',
-    description: 'Google+ button title',
-  },
-  'footer.site-footer.google-plus.screen-reader-text': {
-    id: 'footer.site-footer.google-plus.screen-reader-text',
-    defaultMessage: 'Follow {siteName} on Google+',
-    description: 'Google+ button screen reader text',
-  },
-  'footer.site-footer.reddit.title': {
-    id: 'footer.site-footer.reddit.title',
-    defaultMessage: 'Reddit',
-    description: 'Reddit button title',
-  },
-  'footer.site-footer.reddit.screen-reader-text': {
-    id: 'footer.site-footer.reddit.screen-reader-text',
-    defaultMessage: 'Subscribe to the {siteName} subreddit',
-    description: 'Reddit button screen reader text',
-  },
-  'footer.site-footer.apple-app-store.alt-text': {
-    id: 'footer.site-footer.apple-app-store.alt-text',
-    defaultMessage: 'Download the {siteName} mobile app from the Apple App Store',
-    description: 'Apple App Store button alt description',
-  },
-  'footer.site-footer.google-play.alt-text': {
-    id: 'footer.site-footer.google-play.alt-text',
-    defaultMessage: 'Download the {siteName} mobile app from Google Play',
-    description: 'Google Play button alt description',
-  },
-  'footer.site-footer.footer.aria-label': {
-    id: 'footer.site-footer.footer.aria-label',
-    defaultMessage: 'Page Footer',
-    description: 'Aria label for the footer',
-  },
-});
-
-export default messages;
--- a/src/lib/components/SiteFooter/SiteFooter.test.jsx
+++ b/src/lib/components/SiteFooter/SiteFooter.test.jsx
@@ -1,14 +1,12 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 import { mount } from 'enzyme';
-import { IntlProvider } from 'react-intl';

 import {
  faFacebookSquare,
  faTwitterSquare,
  faYoutubeSquare,
  faLinkedin,
-  faGooglePlusSquare,
  faRedditSquare,
 } from '@fortawesome/free-brands-svg-icons';
 import { faLanguage } from '@fortawesome/free-solid-svg-icons';
@@ -18,6 +16,80 @@ import FooterLogo from '../../../edx-footer.png';
 import SiteFooter, { EVENT_NAMES } from './index';


+const edXLinks = [
+  {
+    title: 'About',
+    url: 'https://www.example.com/about-us',
+  },
+  {
+    title: 'edX for Business',
+    url: 'https://business.edx.org',
+    queryParams: { utm_test: 'utm_test_value' },
+  },
+  {
+    title: 'Affiliates',
+    url: 'https://www.example.com/affiliate-program',
+  },
+  {
+    title: 'Open edX',
+    url: 'https://www.example.com/open',
+  },
+  {
+    title: 'Careers',
+    url: 'https://www.example.com/careers',
+  },
+  {
+    title: 'News',
+    url: 'https://www.example.com/news-announcements',
+  },
+];
+
+const legalLinks = [
+  {
+    title: 'Terms of Service & Honor Code',
+    url: 'https://www.example.com/terms-of-service',
+  },
+  {
+    title: 'Privacy Policy',
+    url: 'https://www.example.com/privacy-policy',
+  },
+  {
+    title: 'Accessibility Policy',
+    url: 'https://www.example.com/accessibility',
+  },
+  {
+    title: 'Trademark Policy',
+    url: 'https://www.example.com/trademarks',
+  },
+  {
+    title: 'Sitemap',
+    url: 'https://www.example.com/sitemap',
+  },
+];
+
+const connectLinks = [
+  {
+    title: 'Blog',
+    url: 'https://www.example.com/blog',
+  },
+  {
+    title: 'Contact Us',
+    url: 'https://www.example.com/contact',
+  },
+  {
+    title: 'Help Center',
+    url: 'https://www.example.com/support',
+  },
+  {
+    title: 'Media Kit',
+    url: 'https://www.example.com/media-kit',
+  },
+  {
+    title: 'Donate',
+    url: 'https://www.example.com/donate',
+  },
+];
+
 const socialLinks = [
  {
    title: 'Facebook',
@@ -43,12 +115,6 @@ const socialLinks = [
    icon: <FontAwesomeIcon icon={faLinkedin} className="social-icon" size="2x" />,
    screenReaderText: 'Follow edX on LinkedIn',
  },
-  {
-    title: 'Google+',
-    url: 'https://plus.google.com',
-    icon: <FontAwesomeIcon icon={faGooglePlusSquare} className="social-icon" size="2x" />,
-    screenReaderText: 'Follow edX on Google+',
-  },
  {
    title: 'Reddit',
    url: 'https://reddit.com',
@@ -77,24 +143,43 @@ const languageForm = {

 const completeSiteFooterComponent = mockHandleAllTrackEvents =>
  (
-    <IntlProvider locale="en">
-      <SiteFooter
-        siteName="example"
-        siteLogo={FooterLogo}
-        marketingSiteBaseUrl="https://www.example.com"
-        supportUrl="https://www.example.com/support"
-        contactUrl="https://www.example.com/contact"
-        openSourceUrl="https://www.example.com/open"
-        termsOfServiceUrl="https://www.example.com/terms-of-service"
-        privacyPolicyUrl="https://www.example.com/privacy-policy"
-        socialLinks={socialLinks}
-        appleAppStoreUrl="https://store.apple.com"
-        googlePlayUrl="https://play.google.com"
-        handleAllTrackEvents={mockHandleAllTrackEvents}
-        supportedLanguages={supportedLanguages}
-        languageForm={languageForm}
-      />
-    </IntlProvider>
+    <SiteFooter
+      siteLogo={{
+        src: FooterLogo,
+        altText: 'edx Logo',
+        ariaLabel: 'edX Home',
+      }}
+      ariaLabel="Page Footer"
+      marketingSiteBaseUrl="https://www.example.com"
+      appleAppStore={{
+        url: 'https://store.apple.com',
+        altText: 'Download the edX mobile app from the Apple App Store',
+      }}
+      googlePlay={{
+        url: 'https://play.google.com',
+        altText: 'Download the edX mobile app from Google Play',
+      }}
+      handleAllTrackEvents={mockHandleAllTrackEvents}
+      linkSectionOne={{
+        title: 'edX',
+        linkList: edXLinks,
+      }}
+      linkSectionTwo={{
+        title: 'Legal',
+        linkList: legalLinks,
+      }}
+      linkSectionThree={{
+        title: 'Connect',
+        linkList: connectLinks,
+      }}
+      socialLinks={socialLinks}
+      supportedLanguages={supportedLanguages}
+      languageForm={languageForm}
+      copyright="© 2012–2019 edX Inc."
+      trademark={(
+        <React.Fragment>EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a></React.Fragment>
+      )}
+    />
  );

 describe('<SiteFooter />', () => {
@@ -110,23 +195,42 @@ describe('<SiteFooter />', () => {
    it('does not render social links', () => {
      const tree = renderer
        .create((
-          <IntlProvider locale="en">
-            <SiteFooter
-              siteName="example"
-              siteLogo={FooterLogo}
-              marketingSiteBaseUrl="https://www.example.com"
-              supportUrl="https://www.example.com/support"
-              contactUrl="https://www.example.com/contact"
-              openSourceUrl="https://www.example.com/open"
-              termsOfServiceUrl="https://www.example.com/terms-of-service"
-              privacyPolicyUrl="https://www.example.com/privacy-policy"
-              appleAppStoreUrl="https://store.apple.com"
-              googlePlayUrl="https://play.google.com"
-              supportedLanguages={supportedLanguages}
-              languageForm={languageForm}
-              handleAllTrackEvents={jest.fn()}
-            />
-          </IntlProvider>
+          <SiteFooter
+            siteLogo={{
+              src: FooterLogo,
+              altText: 'edx Logo',
+              ariaLabel: 'edX Home',
+            }}
+            ariaLabel="Page Footer"
+            marketingSiteBaseUrl="https://www.example.com"
+            appleAppStore={{
+              url: 'https://store.apple.com',
+              altText: 'Download the edX mobile app from the Apple App Store',
+            }}
+            googlePlay={{
+              url: 'https://play.google.com',
+              altText: 'Download the edX mobile app from Google Play',
+            }}
+            handleAllTrackEvents={jest.fn()}
+            linkSectionOne={{
+              title: 'edX',
+              linkList: edXLinks,
+            }}
+            linkSectionTwo={{
+              title: 'Legal',
+              linkList: legalLinks,
+            }}
+            linkSectionThree={{
+              title: 'Connect',
+              linkList: connectLinks,
+            }}
+            supportedLanguages={supportedLanguages}
+            languageForm={languageForm}
+            copyright="© 2012–2019 edX Inc."
+            trademark={(
+              <React.Fragment>EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a></React.Fragment>
+            )}
+          />
        )).toJSON();
      expect(tree).toMatchSnapshot();
    });
@@ -134,25 +238,44 @@ describe('<SiteFooter />', () => {
    it('does not render mobile links', () => {
      const tree = renderer
        .create((
-          <IntlProvider locale="en">
-            <SiteFooter
-              siteName="example"
-              siteLogo={FooterLogo}
-              marketingSiteBaseUrl="https://www.example.com"
-              supportUrl="https://www.example.com/support"
-              contactUrl="https://www.example.com/contact"
-              openSourceUrl="https://www.example.com/open"
-              termsOfServiceUrl="https://www.example.com/terms-of-service"
-              privacyPolicyUrl="https://www.example.com/privacy-policy"
-              socialLinks={socialLinks}
-              appleAppStoreUrl="https://store.apple.com"
-              googlePlayUrl="https://play.google.com"
-              supportedLanguages={supportedLanguages}
-              languageForm={languageForm}
-              handleAllTrackEvents={jest.fn()}
-              showMobileLinks={false}
-            />
-          </IntlProvider>
+          <SiteFooter
+            siteLogo={{
+              src: FooterLogo,
+              altText: 'edx Logo',
+              ariaLabel: 'edX Home',
+            }}
+            ariaLabel="Page Footer"
+            marketingSiteBaseUrl="https://www.example.com"
+            appleAppStore={{
+              url: 'https://store.apple.com',
+              altText: 'Download the edX mobile app from the Apple App Store',
+            }}
+            googlePlay={{
+              url: 'https://play.google.com',
+              altText: 'Download the edX mobile app from Google Play',
+            }}
+            handleAllTrackEvents={jest.fn()}
+            linkSectionOne={{
+              title: 'edX',
+              linkList: edXLinks,
+            }}
+            linkSectionTwo={{
+              title: 'Legal',
+              linkList: legalLinks,
+            }}
+            linkSectionThree={{
+              title: 'Connect',
+              linkList: connectLinks,
+            }}
+            socialLinks={socialLinks}
+            supportedLanguages={supportedLanguages}
+            languageForm={languageForm}
+            copyright="© 2012–2019 edX Inc."
+            trademark={(
+              <React.Fragment>EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a></React.Fragment>
+            )}
+            showMobileLinks={false}
+          />
        )).toJSON();
      expect(tree).toMatchSnapshot();
    });
@@ -160,21 +283,42 @@ describe('<SiteFooter />', () => {
    it('does not render language selector', () => {
      const tree = renderer
        .create((
-          <IntlProvider locale="en">
-            <SiteFooter
-              siteName="example"
-              siteLogo={FooterLogo}
-              marketingSiteBaseUrl="https://www.example.com"
-              supportUrl="https://www.example.com/support"
-              contactUrl="https://www.example.com/contact"
-              openSourceUrl="https://www.example.com/open"
-              termsOfServiceUrl="https://www.example.com/terms-of-service"
-              privacyPolicyUrl="https://www.example.com/privacy-policy"
-              appleAppStoreUrl="https://store.apple.com"
-              googlePlayUrl="https://play.google.com"
-              handleAllTrackEvents={jest.fn()}
-            />
-          </IntlProvider>
+          <SiteFooter
+            siteLogo={{
+              src: FooterLogo,
+              altText: 'edx Logo',
+              ariaLabel: 'edX Home',
+            }}
+            ariaLabel="Page Footer"
+            marketingSiteBaseUrl="https://www.example.com"
+            appleAppStore={{
+              url: 'https://store.apple.com',
+              altText: 'Download the edX mobile app from the Apple App Store',
+            }}
+            googlePlay={{
+              url: 'https://play.google.com',
+              altText: 'Download the edX mobile app from Google Play',
+            }}
+            handleAllTrackEvents={jest.fn()}
+            linkSectionOne={{
+              title: 'edX',
+              linkList: edXLinks,
+            }}
+            linkSectionTwo={{
+              title: 'Legal',
+              linkList: legalLinks,
+            }}
+            linkSectionThree={{
+              title: 'Connect',
+              linkList: connectLinks,
+            }}
+            socialLinks={socialLinks}
+            supportedLanguages={supportedLanguages}
+            copyright="© 2012–2019 edX Inc."
+            trademark={(
+              <React.Fragment>EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 <a href="http://www.beian.miit.gov.cn">粤ICP备17044299号-2</a></React.Fragment>
+            )}
+          />
        )).toJSON();
      expect(tree).toMatchSnapshot();
    });
@@ -186,7 +330,8 @@ describe('<SiteFooter />', () => {
      const footer = mount((completeSiteFooterComponent(mockHandleAllTrackEvents)));
      const externalLinks = footer.find("a[target='_blank']");

-      expect(externalLinks).toHaveLength(8);
+      expect(externalLinks.length).toEqual(socialLinks.length + 2);
+
      externalLinks.forEach((externalLink) => {
        const callIndex = mockHandleAllTrackEvents.mock.calls.length;
        externalLink.simulate('click');
--- a/src/lib/components/SiteFooter/snapshots/SiteFooter.test.jsx.snap
+++ b/src/lib/components/SiteFooter/snapshots/SiteFooter.test.jsx.snap
@@ -13,13 +13,13 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
      className="area-1"
    >
      <a
-        aria-label="example Home"
-        href="https://www.example.com/"
+        aria-label="edX Home"
+        href="https://www.example.com"
        onClick={[Function]}
        target="_self"
      >
        <img
-          alt="example logo"
+          alt="edx Logo"
          src="test-file-stub"
        />
      </a>
@@ -28,7 +28,7 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
      className="area-2"
    >
      <h2>
-        example
+        edX
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -37,54 +37,42 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
          <a
            href="https://www.example.com/about-us"
          >
-            <span>
-              About
-            </span>
+            About
          </a>
        </li>
        <li>
          <a
-            href="https://www.example.com/enterprise"
+            href="https://business.edx.org/?utm_test=utm_test_value"
          >
-            <span>
-              example for Business
-            </span>
+            edX for Business
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/affiliate-program"
          >
-            <span>
-              Affiliates
-            </span>
+            Affiliates
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/open"
          >
-            <span>
-              Open example
-            </span>
+            Open edX
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/careers"
          >
-            <span>
-              Careers
-            </span>
+            Careers
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/news-announcements"
          >
-            <span>
-              News
-            </span>
+            News
          </a>
        </li>
      </ul>
@@ -93,9 +81,7 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
      className="area-3"
    >
      <h2>
-        <span>
-          Legal
-        </span>
+        Legal
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -104,45 +90,35 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
          <a
            href="https://www.example.com/terms-of-service"
          >
-            <span>
-              Terms of Service & Honor Code
-            </span>
+            Terms of Service & Honor Code
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/privacy-policy"
          >
-            <span>
-              Privacy Policy
-            </span>
+            Privacy Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/accessibility"
          >
-            <span>
-              Accessibility Policy
-            </span>
+            Accessibility Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/trademarks"
          >
-            <span>
-              Trademark Policy
-            </span>
+            Trademark Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/sitemap"
          >
-            <span>
-              Sitemap
-            </span>
+            Sitemap
          </a>
        </li>
      </ul>
@@ -151,9 +127,7 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
      className="area-4"
    >
      <h2>
-        <span>
-          Connect
-        </span>
+        Connect
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -162,45 +136,35 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
          <a
            href="https://www.example.com/blog"
          >
-            <span>
-              Blog
-            </span>
+            Blog
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/contact"
          >
-            <span>
-              Contact Us
-            </span>
+            Contact Us
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/support"
          >
-            <span>
-              Help Center
-            </span>
+            Help Center
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/media-kit"
          >
-            <span>
-              Media Kit
-            </span>
+            Media Kit
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/donate"
          >
-            <span>
-              Donate
-            </span>
+            Donate
          </a>
        </li>
      </ul>
@@ -208,6 +172,170 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
    <div
      className="area-5"
    >
+      <ul
+        className="d-flex flex-row justify-content-between list-unstyled max-width-222 p-0 mb-4"
+      >
+        <li>
+          <a
+            href="https://www.facebook.com"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
+            title="Facebook"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-facebook-square fa-w-14 fa-2x social-icon"
+              data-icon="facebook-square"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M448 80v352c0 26.5-21.5 48-48 48h-85.3V302.8h60.6l8.7-67.6h-69.3V192c0-19.6 5.4-32.9 33.5-32.9H384V98.7c-6.2-.8-27.4-2.7-52.2-2.7-51.6 0-87 31.5-87 89.4v49.9H184v67.6h60.9V480H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+            <span
+              className="sr-only"
+            >
+              Like edX on Facebook
+            </span>
+          </a>
+        </li>
+        <li>
+          <a
+            href="https://www.twitter.com"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
+            title="Twitter"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-twitter-square fa-w-14 fa-2x social-icon"
+              data-icon="twitter-square"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-48.9 158.8c.2 2.8.2 5.7.2 8.5 0 86.7-66 186.6-186.6 186.6-37.2 0-71.7-10.8-100.7-29.4 5.3.6 10.4.8 15.8.8 30.7 0 58.9-10.4 81.4-28-28.8-.6-53-19.5-61.3-45.5 10.1 1.5 19.2 1.5 29.6-1.2-30-6.1-52.5-32.5-52.5-64.4v-.8c8.7 4.9 18.9 7.9 29.6 8.3a65.447 65.447 0 0 1-29.2-54.6c0-12.2 3.2-23.4 8.9-33.1 32.3 39.8 80.8 65.8 135.2 68.6-9.3-44.5 24-80.6 64-80.6 18.9 0 35.9 7.9 47.9 20.7 14.8-2.8 29-8.3 41.6-15.8-4.9 15.2-15.2 28-28.8 36.1 13.2-1.4 26-5.1 37.8-10.2-8.9 13.1-20.1 24.7-32.9 34z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+            <span
+              className="sr-only"
+            >
+              Follow edX on Twitter
+            </span>
+          </a>
+        </li>
+        <li>
+          <a
+            href="https://www.youtube.com"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
+            title="Youtube"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-youtube-square fa-w-14 fa-2x social-icon"
+              data-icon="youtube-square"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M186.8 202.1l95.2 54.1-95.2 54.1V202.1zM448 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48zm-42 176.3s0-59.6-7.6-88.2c-4.2-15.8-16.5-28.2-32.2-32.4C337.9 128 224 128 224 128s-113.9 0-142.2 7.7c-15.7 4.2-28 16.6-32.2 32.4-7.6 28.5-7.6 88.2-7.6 88.2s0 59.6 7.6 88.2c4.2 15.8 16.5 27.7 32.2 31.9C110.1 384 224 384 224 384s113.9 0 142.2-7.7c15.7-4.2 28-16.1 32.2-31.9 7.6-28.5 7.6-88.1 7.6-88.1z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+            <span
+              className="sr-only"
+            >
+              Subscribe to the edX YouTube channel
+            </span>
+          </a>
+        </li>
+        <li>
+          <a
+            href="https://www.linkedin.com"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
+            title="LinkedIn"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-linkedin fa-w-14 fa-2x social-icon"
+              data-icon="linkedin"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+            <span
+              className="sr-only"
+            >
+              Follow edX on LinkedIn
+            </span>
+          </a>
+        </li>
+        <li>
+          <a
+            href="https://reddit.com"
+            onClick={[Function]}
+            rel="noopener noreferrer"
+            target="_blank"
+            title="Reddit"
+          >
+            <svg
+              aria-hidden="true"
+              className="svg-inline--fa fa-reddit-square fa-w-14 fa-2x social-icon"
+              data-icon="reddit-square"
+              data-prefix="fab"
+              focusable="false"
+              role="img"
+              style={Object {}}
+              viewBox="0 0 448 512"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M283.2 345.5c2.7 2.7 2.7 6.8 0 9.2-24.5 24.5-93.8 24.6-118.4 0-2.7-2.4-2.7-6.5 0-9.2 2.4-2.4 6.5-2.4 8.9 0 18.7 19.2 81 19.6 100.5 0 2.4-2.3 6.6-2.3 9 0zm-91.3-53.8c0-14.9-11.9-26.8-26.5-26.8-14.9 0-26.8 11.9-26.8 26.8 0 14.6 11.9 26.5 26.8 26.5 14.6 0 26.5-11.9 26.5-26.5zm90.7-26.8c-14.6 0-26.5 11.9-26.5 26.8 0 14.6 11.9 26.5 26.5 26.5 14.9 0 26.8-11.9 26.8-26.5 0-14.9-11.9-26.8-26.8-26.8zM448 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48zm-99.7 140.6c-10.1 0-19 4.2-25.6 10.7-24.1-16.7-56.5-27.4-92.5-28.6l18.7-84.2 59.5 13.4c0 14.6 11.9 26.5 26.5 26.5 14.9 0 26.8-12.2 26.8-26.8 0-14.6-11.9-26.8-26.8-26.8-10.4 0-19.3 6.2-23.8 14.9l-65.7-14.6c-3.3-.9-6.5 1.5-7.4 4.8l-20.5 92.8c-35.7 1.5-67.8 12.2-91.9 28.9-6.5-6.8-15.8-11-25.9-11-37.5 0-49.8 50.4-15.5 67.5-1.2 5.4-1.8 11-1.8 16.7 0 56.5 63.7 102.3 141.9 102.3 78.5 0 142.2-45.8 142.2-102.3 0-5.7-.6-11.6-2.1-17 33.6-17.2 21.2-67.2-16.1-67.2z"
+                fill="currentColor"
+                style={Object {}}
+              />
+            </svg>
+            <span
+              className="sr-only"
+            >
+              Subscribe to the edX subreddit
+            </span>
+          </a>
+        </li>
+      </ul>
      <ul
        className="d-flex flex-row justify-content-between list-unstyled max-width-264 p-0 mb-5"
      >
@@ -219,7 +347,7 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from the Apple App Store"
+              alt="Download the edX mobile app from the Apple App Store"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/app_store_badge_135x40.d0558d910630.svg"
            />
@@ -233,7 +361,7 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from Google Play"
+              alt="Download the edX mobile app from Google Play"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/google_play_badge_45.6ea466e328da.png"
            />
@@ -241,13 +369,14 @@ exports[`<SiteFooter /> renders correctly does not render language selector 1`]
        </li>
      </ul>
      <p>
-        <span>
-          © 2012–2019 example Inc.
-        </span>
+        © 2012–2019 edX Inc.
        <br />
-        <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
-        </span>
+        EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+        <a
+          href="http://www.beian.miit.gov.cn"
+        >
+          粤ICP备17044299号-2
+        </a>
      </p>
    </div>
  </div>
@@ -267,13 +396,13 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
      className="area-1"
    >
      <a
-        aria-label="example Home"
-        href="https://www.example.com/"
+        aria-label="edX Home"
+        href="https://www.example.com"
        onClick={[Function]}
        target="_self"
      >
        <img
-          alt="example logo"
+          alt="edx Logo"
          src="test-file-stub"
        />
      </a>
@@ -340,7 +469,7 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
      className="area-2"
    >
      <h2>
-        example
+        edX
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -349,54 +478,42 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
          <a
            href="https://www.example.com/about-us"
          >
-            <span>
-              About
-            </span>
+            About
          </a>
        </li>
        <li>
          <a
-            href="https://www.example.com/enterprise"
+            href="https://business.edx.org/?utm_test=utm_test_value"
          >
-            <span>
-              example for Business
-            </span>
+            edX for Business
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/affiliate-program"
          >
-            <span>
-              Affiliates
-            </span>
+            Affiliates
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/open"
          >
-            <span>
-              Open example
-            </span>
+            Open edX
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/careers"
          >
-            <span>
-              Careers
-            </span>
+            Careers
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/news-announcements"
          >
-            <span>
-              News
-            </span>
+            News
          </a>
        </li>
      </ul>
@@ -405,9 +522,7 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
      className="area-3"
    >
      <h2>
-        <span>
-          Legal
-        </span>
+        Legal
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -416,45 +531,35 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
          <a
            href="https://www.example.com/terms-of-service"
          >
-            <span>
-              Terms of Service & Honor Code
-            </span>
+            Terms of Service & Honor Code
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/privacy-policy"
          >
-            <span>
-              Privacy Policy
-            </span>
+            Privacy Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/accessibility"
          >
-            <span>
-              Accessibility Policy
-            </span>
+            Accessibility Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/trademarks"
          >
-            <span>
-              Trademark Policy
-            </span>
+            Trademark Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/sitemap"
          >
-            <span>
-              Sitemap
-            </span>
+            Sitemap
          </a>
        </li>
      </ul>
@@ -463,9 +568,7 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
      className="area-4"
    >
      <h2>
-        <span>
-          Connect
-        </span>
+        Connect
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -474,45 +577,35 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
          <a
            href="https://www.example.com/blog"
          >
-            <span>
-              Blog
-            </span>
+            Blog
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/contact"
          >
-            <span>
-              Contact Us
-            </span>
+            Contact Us
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/support"
          >
-            <span>
-              Help Center
-            </span>
+            Help Center
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/media-kit"
          >
-            <span>
-              Media Kit
-            </span>
+            Media Kit
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/donate"
          >
-            <span>
-              Donate
-            </span>
+            Donate
          </a>
        </li>
      </ul>
@@ -651,38 +744,6 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
            </span>
          </a>
        </li>
-        <li>
-          <a
-            href="https://plus.google.com"
-            onClick={[Function]}
-            rel="noopener noreferrer"
-            target="_blank"
-            title="Google+"
-          >
-            <svg
-              aria-hidden="true"
-              className="svg-inline--fa fa-google-plus-square fa-w-14 fa-2x social-icon"
-              data-icon="google-plus-square"
-              data-prefix="fab"
-              focusable="false"
-              role="img"
-              style={Object {}}
-              viewBox="0 0 448 512"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM164 356c-55.3 0-100-44.7-100-100s44.7-100 100-100c27 0 49.5 9.8 67 26.2l-27.1 26.1c-7.4-7.1-20.3-15.4-39.8-15.4-34.1 0-61.9 28.2-61.9 63.2 0 34.9 27.8 63.2 61.9 63.2 39.6 0 54.4-28.5 56.8-43.1H164v-34.4h94.4c1 5 1.6 10.1 1.6 16.6 0 57.1-38.3 97.6-96 97.6zm220-81.8h-29v29h-29.2v-29h-29V245h29v-29H355v29h29v29.2z"
-                fill="currentColor"
-                style={Object {}}
-              />
-            </svg>
-            <span
-              className="sr-only"
-            >
-              Follow edX on Google+
-            </span>
-          </a>
-        </li>
        <li>
          <a
            href="https://reddit.com"
@@ -717,13 +778,14 @@ exports[`<SiteFooter /> renders correctly does not render mobile links 1`] = `
        </li>
      </ul>
      <p>
-        <span>
-          © 2012–2019 example Inc.
-        </span>
+        © 2012–2019 edX Inc.
        <br />
-        <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
-        </span>
+        EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+        <a
+          href="http://www.beian.miit.gov.cn"
+        >
+          粤ICP备17044299号-2
+        </a>
      </p>
    </div>
  </div>
@@ -743,13 +805,13 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
      className="area-1"
    >
      <a
-        aria-label="example Home"
-        href="https://www.example.com/"
+        aria-label="edX Home"
+        href="https://www.example.com"
        onClick={[Function]}
        target="_self"
      >
        <img
-          alt="example logo"
+          alt="edx Logo"
          src="test-file-stub"
        />
      </a>
@@ -816,7 +878,7 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
      className="area-2"
    >
      <h2>
-        example
+        edX
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -825,54 +887,42 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
          <a
            href="https://www.example.com/about-us"
          >
-            <span>
-              About
-            </span>
+            About
          </a>
        </li>
        <li>
          <a
-            href="https://www.example.com/enterprise"
+            href="https://business.edx.org/?utm_test=utm_test_value"
          >
-            <span>
-              example for Business
-            </span>
+            edX for Business
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/affiliate-program"
          >
-            <span>
-              Affiliates
-            </span>
+            Affiliates
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/open"
          >
-            <span>
-              Open example
-            </span>
+            Open edX
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/careers"
          >
-            <span>
-              Careers
-            </span>
+            Careers
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/news-announcements"
          >
-            <span>
-              News
-            </span>
+            News
          </a>
        </li>
      </ul>
@@ -881,9 +931,7 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
      className="area-3"
    >
      <h2>
-        <span>
-          Legal
-        </span>
+        Legal
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -892,45 +940,35 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
          <a
            href="https://www.example.com/terms-of-service"
          >
-            <span>
-              Terms of Service & Honor Code
-            </span>
+            Terms of Service & Honor Code
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/privacy-policy"
          >
-            <span>
-              Privacy Policy
-            </span>
+            Privacy Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/accessibility"
          >
-            <span>
-              Accessibility Policy
-            </span>
+            Accessibility Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/trademarks"
          >
-            <span>
-              Trademark Policy
-            </span>
+            Trademark Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/sitemap"
          >
-            <span>
-              Sitemap
-            </span>
+            Sitemap
          </a>
        </li>
      </ul>
@@ -939,9 +977,7 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
      className="area-4"
    >
      <h2>
-        <span>
-          Connect
-        </span>
+        Connect
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -950,45 +986,35 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
          <a
            href="https://www.example.com/blog"
          >
-            <span>
-              Blog
-            </span>
+            Blog
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/contact"
          >
-            <span>
-              Contact Us
-            </span>
+            Contact Us
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/support"
          >
-            <span>
-              Help Center
-            </span>
+            Help Center
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/media-kit"
          >
-            <span>
-              Media Kit
-            </span>
+            Media Kit
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/donate"
          >
-            <span>
-              Donate
-            </span>
+            Donate
          </a>
        </li>
      </ul>
@@ -1007,7 +1033,7 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from the Apple App Store"
+              alt="Download the edX mobile app from the Apple App Store"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/app_store_badge_135x40.d0558d910630.svg"
            />
@@ -1021,7 +1047,7 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from Google Play"
+              alt="Download the edX mobile app from Google Play"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/google_play_badge_45.6ea466e328da.png"
            />
@@ -1029,13 +1055,14 @@ exports[`<SiteFooter /> renders correctly does not render social links 1`] = `
        </li>
      </ul>
      <p>
-        <span>
-          © 2012–2019 example Inc.
-        </span>
+        © 2012–2019 edX Inc.
        <br />
-        <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
-        </span>
+        EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+        <a
+          href="http://www.beian.miit.gov.cn"
+        >
+          粤ICP备17044299号-2
+        </a>
      </p>
    </div>
  </div>
@@ -1055,13 +1082,13 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
      className="area-1"
    >
      <a
-        aria-label="example Home"
-        href="https://www.example.com/"
+        aria-label="edX Home"
+        href="https://www.example.com"
        onClick={[Function]}
        target="_self"
      >
        <img
-          alt="example logo"
+          alt="edx Logo"
          src="test-file-stub"
        />
      </a>
@@ -1128,7 +1155,7 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
      className="area-2"
    >
      <h2>
-        example
+        edX
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -1137,54 +1164,42 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
          <a
            href="https://www.example.com/about-us"
          >
-            <span>
-              About
-            </span>
+            About
          </a>
        </li>
        <li>
          <a
-            href="https://www.example.com/enterprise"
+            href="https://business.edx.org/?utm_test=utm_test_value"
          >
-            <span>
-              example for Business
-            </span>
+            edX for Business
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/affiliate-program"
          >
-            <span>
-              Affiliates
-            </span>
+            Affiliates
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/open"
          >
-            <span>
-              Open example
-            </span>
+            Open edX
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/careers"
          >
-            <span>
-              Careers
-            </span>
+            Careers
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/news-announcements"
          >
-            <span>
-              News
-            </span>
+            News
          </a>
        </li>
      </ul>
@@ -1193,9 +1208,7 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
      className="area-3"
    >
      <h2>
-        <span>
-          Legal
-        </span>
+        Legal
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -1204,45 +1217,35 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
          <a
            href="https://www.example.com/terms-of-service"
          >
-            <span>
-              Terms of Service & Honor Code
-            </span>
+            Terms of Service & Honor Code
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/privacy-policy"
          >
-            <span>
-              Privacy Policy
-            </span>
+            Privacy Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/accessibility"
          >
-            <span>
-              Accessibility Policy
-            </span>
+            Accessibility Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/trademarks"
          >
-            <span>
-              Trademark Policy
-            </span>
+            Trademark Policy
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/sitemap"
          >
-            <span>
-              Sitemap
-            </span>
+            Sitemap
          </a>
        </li>
      </ul>
@@ -1251,9 +1254,7 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
      className="area-4"
    >
      <h2>
-        <span>
-          Connect
-        </span>
+        Connect
      </h2>
      <ul
        className="list-unstyled p-0 m-0"
@@ -1262,45 +1263,35 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
          <a
            href="https://www.example.com/blog"
          >
-            <span>
-              Blog
-            </span>
+            Blog
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/contact"
          >
-            <span>
-              Contact Us
-            </span>
+            Contact Us
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/support"
          >
-            <span>
-              Help Center
-            </span>
+            Help Center
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/media-kit"
          >
-            <span>
-              Media Kit
-            </span>
+            Media Kit
          </a>
        </li>
        <li>
          <a
            href="https://www.example.com/donate"
          >
-            <span>
-              Donate
-            </span>
+            Donate
          </a>
        </li>
      </ul>
@@ -1439,38 +1430,6 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
            </span>
          </a>
        </li>
-        <li>
-          <a
-            href="https://plus.google.com"
-            onClick={[Function]}
-            rel="noopener noreferrer"
-            target="_blank"
-            title="Google+"
-          >
-            <svg
-              aria-hidden="true"
-              className="svg-inline--fa fa-google-plus-square fa-w-14 fa-2x social-icon"
-              data-icon="google-plus-square"
-              data-prefix="fab"
-              focusable="false"
-              role="img"
-              style={Object {}}
-              viewBox="0 0 448 512"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM164 356c-55.3 0-100-44.7-100-100s44.7-100 100-100c27 0 49.5 9.8 67 26.2l-27.1 26.1c-7.4-7.1-20.3-15.4-39.8-15.4-34.1 0-61.9 28.2-61.9 63.2 0 34.9 27.8 63.2 61.9 63.2 39.6 0 54.4-28.5 56.8-43.1H164v-34.4h94.4c1 5 1.6 10.1 1.6 16.6 0 57.1-38.3 97.6-96 97.6zm220-81.8h-29v29h-29.2v-29h-29V245h29v-29H355v29h29v29.2z"
-                fill="currentColor"
-                style={Object {}}
-              />
-            </svg>
-            <span
-              className="sr-only"
-            >
-              Follow edX on Google+
-            </span>
-          </a>
-        </li>
        <li>
          <a
            href="https://reddit.com"
@@ -1515,7 +1474,7 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from the Apple App Store"
+              alt="Download the edX mobile app from the Apple App Store"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/app_store_badge_135x40.d0558d910630.svg"
            />
@@ -1529,7 +1488,7 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
            target="_blank"
          >
            <img
-              alt="Download the example mobile app from Google Play"
+              alt="Download the edX mobile app from Google Play"
              className="max-height-39"
              src="https://prod-edxapp.edx-cdn.org/static/images/app/google_play_badge_45.6ea466e328da.png"
            />
@@ -1537,13 +1496,14 @@ exports[`<SiteFooter /> renders correctly renders with social and mobile links 1
        </li>
      </ul>
      <p>
-        <span>
-          © 2012–2019 example Inc.
-        </span>
+        © 2012–2019 edX Inc.
        <br />
-        <span>
-          EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 粤ICP备17044299号-2
-        </span>
+        EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 
+        <a
+          href="http://www.beian.miit.gov.cn"
+        >
+          粤ICP备17044299号-2
+        </a>
      </p>
    </div>
  </div>
--- a/src/lib/components/SiteFooter/index.jsx
+++ b/src/lib/components/SiteFooter/index.jsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { Hyperlink } from '@edx/paragon';
-
-import messages from './SiteFooter.messages';
+import qs from 'query-string';

 const EVENT_NAMES = {
  FOOTER_LINK: 'edx.bi.footer.link',
@@ -34,54 +32,57 @@ class SiteFooter extends React.Component {
    this.props.handleAllTrackEvents(eventName, properties);
  }

-  renderSiteLogo() {
-    return (
-      <img
-        src={this.props.siteLogo}
-        alt={this.props.intl.formatMessage(
-          messages['footer.site-footer.site-logo.alt-text'],
-          { siteName: this.props.siteName },
-        )}
-      />
-    );
+  formatUrl(linkData) {
+    const {
+      queryParams,
+      url,
+    } = linkData;
+    return queryParams ? `${url}/?${qs.stringify(queryParams)}` : url;
  }

-  renderMarketingSiteUrl(path) {
-    return `${this.props.marketingSiteBaseUrl}${path}`;
+  renderLinkList({ title, linkList }) {
+    if (linkList.length > 0) {
+      return (
+        <React.Fragment>
+          <h2>{title}</h2>
+          <ul className="list-unstyled p-0 m-0">
+            {linkList.map(link => (
+              <li key={link.url}>
+                <a href={this.formatUrl(link)}>{link.title}</a>
+              </li>
+            ))}
+          </ul>
+        </React.Fragment>
+      );
+    }
+
+    return null;
  }

  renderMobileLinks() {
    const {
-      intl,
-      siteName,
      showMobileLinks,
-      appleAppStoreUrl,
-      googlePlayUrl,
+      appleAppStore,
+      googlePlay,
    } = this.props;
-    let mobileLinks = null;
+
    if (showMobileLinks) {
-      mobileLinks = (
+      return (
        <ul className="d-flex flex-row justify-content-between list-unstyled max-width-264 p-0 mb-5">
          <li>
-            <a href={appleAppStoreUrl} rel="noopener noreferrer" target="_blank" onClick={this.externalLinkClickHandler}>
+            <a href={appleAppStore.url} rel="noopener noreferrer" target="_blank" onClick={this.externalLinkClickHandler}>
              <img
                className="max-height-39"
-                alt={intl.formatMessage(
-                  messages['footer.site-footer.apple-app-store.alt-text'],
-                  { siteName },
-                )}
+                alt={appleAppStore.altText}
                src="https://prod-edxapp.edx-cdn.org/static/images/app/app_store_badge_135x40.d0558d910630.svg"
              />
            </a>
          </li>
          <li>
-            <a href={googlePlayUrl} rel="noopener noreferrer" target="_blank" onClick={this.externalLinkClickHandler}>
+            <a href={googlePlay.url} rel="noopener noreferrer" target="_blank" onClick={this.externalLinkClickHandler}>
              <img
                className="max-height-39"
-                alt={intl.formatMessage(
-                  messages['footer.site-footer.google-play.alt-text'],
-                  { siteName },
-                )}
+                alt={googlePlay.altText}
                src="https://prod-edxapp.edx-cdn.org/static/images/app/google_play_badge_45.6ea466e328da.png"
              />
            </a>
@@ -89,39 +90,38 @@ class SiteFooter extends React.Component {
        </ul>
      );
    }
-    return mobileLinks;
+
+    return null;
  }

  render() {
    const {
-      intl,
-      siteName,
-      openSourceUrl,
-      termsOfServiceUrl,
-      privacyPolicyUrl,
-      contactUrl,
-      supportUrl,
+      ariaLabel,
+      linkSectionOne,
+      linkSectionTwo,
+      linkSectionThree,
+      siteLogo,
      socialLinks,
      supportedLanguages,
      languageForm,
+      marketingSiteBaseUrl,
+      copyright,
+      trademark,
    } = this.props;
    const showLanguageSelector = supportedLanguages.length > 0 &&
                                 languageForm;
    return (
      <footer
        role="contentinfo"
-        aria-label={intl.formatMessage(messages['footer.site-footer.footer.aria-label'])}
+        aria-label={ariaLabel}
        className="footer d-flex justify-content-center border-top py-3 px-4"
      >
        <div className="max-width-1180 d-grid">
          <div className="area-1">
            <Hyperlink
-              destination={this.renderMarketingSiteUrl('/')}
-              content={this.renderSiteLogo()}
-              aria-label={intl.formatMessage(
-                messages['footer.site-footer.site-logo.aria-label'],
-                { siteName },
-              )}
+              destination={marketingSiteBaseUrl}
+              content={<img src={siteLogo.src} alt={siteLogo.altText} />}
+              aria-label={siteLogo.ariaLabel}
            />
            {showLanguageSelector &&
              <div className="i18n d-flex mt-2">
@@ -148,164 +148,9 @@ class SiteFooter extends React.Component {
              </div>
            }
          </div>
-          <div className="area-2">
-            <h2>{siteName}</h2>
-            <ul className="list-unstyled p-0 m-0">
-              <li>
-                <a href={this.renderMarketingSiteUrl('/about-us')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.about"
-                    defaultMessage="About"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/enterprise')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.business"
-                    defaultMessage="{siteName} for Business"
-                    values={{ siteName }}
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/affiliate-program')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.affiliates"
-                    defaultMessage="Affiliates"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={openSourceUrl}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.open-source"
-                    defaultMessage="Open {siteName}"
-                    values={{ siteName }}
-                    description="Open Source link text"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/careers')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.careers"
-                    defaultMessage="Careers"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/news-announcements')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.news"
-                    defaultMessage="News"
-                  />
-                </a>
-              </li>
-            </ul>
-          </div>
-          <div className="area-3">
-            <h2>
-              <FormattedMessage
-                id="footer.site-footer.link.header.legal"
-                defaultMessage="Legal"
-                description="Header for legal links"
-              />
-            </h2>
-            <ul className="list-unstyled p-0 m-0">
-              <li>
-                <a href={termsOfServiceUrl}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.terms-of-service"
-                    defaultMessage="Terms of Service & Honor Code"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={privacyPolicyUrl}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.privacy"
-                    defaultMessage="Privacy Policy"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/accessibility')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.accessibility"
-                    defaultMessage="Accessibility Policy"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/trademarks')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.trademark"
-                    defaultMessage="Trademark Policy"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/sitemap')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.sitemap"
-                    defaultMessage="Sitemap"
-                  />
-                </a>
-              </li>
-            </ul>
-          </div>
-          <div className="area-4">
-            <h2>
-              <FormattedMessage
-                id="footer.site-footer.link.header.connect"
-                defaultMessage="Connect"
-                description="Header for connect links"
-              />
-            </h2>
-            <ul className="list-unstyled p-0 m-0">
-              <li>
-                <a href={this.renderMarketingSiteUrl('/blog')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.blog"
-                    defaultMessage="Blog"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={contactUrl}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.contact-us"
-                    defaultMessage="Contact Us"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={supportUrl}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.help-center"
-                    defaultMessage="Help Center"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/media-kit')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.media-kit"
-                    defaultMessage="Media Kit"
-                  />
-                </a>
-              </li>
-              <li>
-                <a href={this.renderMarketingSiteUrl('/donate')}>
-                  <FormattedMessage
-                    id="footer.site-footer.link.donate"
-                    defaultMessage="Donate"
-                  />
-                </a>
-              </li>
-            </ul>
-          </div>
+          <div className="area-2">{this.renderLinkList(linkSectionOne)}</div>
+          <div className="area-3">{this.renderLinkList(linkSectionTwo)}</div>
+          <div className="area-4">{this.renderLinkList(linkSectionThree)}</div>
          <div className="area-5">
            {socialLinks.length > 0 &&
              <ul className="d-flex flex-row justify-content-between list-unstyled max-width-222 p-0 mb-4">
@@ -327,24 +172,9 @@ class SiteFooter extends React.Component {
            }
            {this.renderMobileLinks()}
            <p>
-              <FormattedMessage
-                id="footer.site-footer.copyright-text"
-                defaultMessage="{copyrightSymbol} {startDate}–{endDate} {siteName} Inc."
-                values={{
-                  copyrightSymbol: '©',
-                  startDate: '2012',
-                  endDate: `${new Date().getFullYear()}`,
-                  siteName,
-                }}
-                description="Footer copyright text with copyright symbol and dates"
-              />
+              {copyright}
              <br />
-              <FormattedMessage
-                id="footer.site-footer.trademark-text"
-                defaultMessage="EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | {icpLicense}"
-                values={{ icpLicense: '粤ICP备17044299号-2' }}
-                description="Footer trademark text"
-              />
+              {trademark}
            </p>
          </div>
        </div>
@@ -353,15 +183,26 @@ class SiteFooter extends React.Component {
  }
 }

+const linkSectionShape = PropTypes.shape({
+  title: PropTypes.string,
+  linkList: PropTypes.arrayOf(PropTypes.shape({
+    title: PropTypes.string.isRequired,
+    url: PropTypes.string.isRequired,
+    queryParams: PropTypes.shape({}),
+  })),
+});
+
 SiteFooter.propTypes = {
-  siteName: PropTypes.string,
-  siteLogo: PropTypes.node,
+  ariaLabel: PropTypes.string.isRequired,
+  siteLogo: PropTypes.shape({
+    src: PropTypes.node,
+    altText: PropTypes.string,
+    ariaLabel: PropTypes.string,
+  }),
  marketingSiteBaseUrl: PropTypes.string,
-  supportUrl: PropTypes.string,
-  contactUrl: PropTypes.string,
-  openSourceUrl: PropTypes.string,
-  termsOfServiceUrl: PropTypes.string,
-  privacyPolicyUrl: PropTypes.string,
+  linkSectionOne: linkSectionShape,
+  linkSectionTwo: linkSectionShape,
+  linkSectionThree: linkSectionShape,
  socialLinks: PropTypes.arrayOf(PropTypes.shape({
    title: PropTypes.string.isRequired,
    url: PropTypes.string.isRequired,
@@ -369,8 +210,14 @@ SiteFooter.propTypes = {
    screenReaderText: PropTypes.string.isRequired,
  })),
  showMobileLinks: PropTypes.bool,
-  appleAppStoreUrl: PropTypes.string,
-  googlePlayUrl: PropTypes.string,
+  appleAppStore: PropTypes.shape({
+    url: PropTypes.string,
+    altText: PropTypes.string,
+  }),
+  googlePlay: PropTypes.shape({
+    url: PropTypes.string,
+    altText: PropTypes.string,
+  }),
  supportedLanguages: PropTypes.arrayOf(PropTypes.shape({
    label: PropTypes.string.isRequired,
    value: PropTypes.string.isRequired,
@@ -382,26 +229,37 @@ SiteFooter.propTypes = {
    icon: PropTypes.node.isRequired,
    activeLanguage: PropTypes.string,
  }),
+  copyright: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.node,
+  ]),
+  trademark: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.node,
+  ]),
  handleAllTrackEvents: PropTypes.func.isRequired,
-  intl: intlShape.isRequired,
+};
+
+const linkSectionDefault = {
+  title: null,
+  linkList: [],
 };

 SiteFooter.defaultProps = {
-  siteName: null,
  siteLogo: null,
  marketingSiteBaseUrl: null,
-  supportUrl: null,
-  contactUrl: null,
-  openSourceUrl: null,
-  termsOfServiceUrl: null,
-  privacyPolicyUrl: null,
+  linkSectionOne: linkSectionDefault,
+  linkSectionTwo: linkSectionDefault,
+  linkSectionThree: linkSectionDefault,
  socialLinks: [],
  showMobileLinks: true,
-  appleAppStoreUrl: null,
-  googlePlayUrl: null,
+  appleAppStore: null,
+  googlePlay: null,
  supportedLanguages: [],
  languageForm: null,
+  copyright: null,
+  trademark: null,
 };

-export default injectIntl(SiteFooter);
+export default SiteFooter;
 export { EVENT_NAMES };
Author	SHA1	Message	Date
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
David Joy	f32b0c8dcf	Merge pull request #40 from edx/djoy/upgrade_i18n fix: upgrade frontend-i18n library	2019-06-07 11:12:41 -04:00
David Joy	fb1f5c2d50	fix: delete old i18n concat file	2019-06-07 10:53:50 -04:00
David Joy	1a51d992cd	Update .gitignore	2019-06-07 10:07:30 -04:00
David Joy	e9c28163d9	fix: upgrade frontend-i18n library	2019-06-07 08:58:38 -04:00
AlasdairSwan	6db2d70e97	Merge pull request #37 from edx/alasdair/update-link-sections-to-accept-arrays fix(linkprops): update link props	2019-06-04 09:03:27 -04:00
AlasdairSwan	3ab4adf10b	fix(linkprops): update link props BREAKING CHANGE move to link arrays and remove strings from component (and thus the need for i18n)	2019-06-03 15:57:30 -04:00
edX Transifex Bot	a482325eac	fix(i18n): update translations	2019-06-02 17:33:12 -04:00
Douglas Hall	d919d1a577	Merge pull request #38 from edx/douglashall/finish_i18n_refactoring fix: modify babelrc for i18n	2019-05-31 14:17:28 -04:00
Douglas Hall	4b3a91138d	fix: modify babelrc for i18n	2019-05-31 14:11:48 -04:00
David Joy	7680ad3393	Merge pull request #36 from edx/djoy/is-es5 fix: adding es check	2019-05-28 13:33:09 -04:00
David Joy	061b41bee8	fix: adding es check	2019-05-28 09:42:04 -04:00
Douglas Hall	cacae4789f	fix: move to @edx/frontend-i18n dependency (#35 ) fix: move to @edx/frontend-i18n dependency	2019-05-24 14:20:22 -04:00
Douglas Hall	adceca6b53	fix: move to @edx/frontend-i18n dependency BREAKING CHANGE: consumers will now be required to supply @edx/frontend-i18n instead of react-intl	2019-05-24 12:06:17 -04:00
Douglas Hall	ab61fd35eb	Merge pull request #34 from edx/douglashall/reduce_bundle_size fix: remove paragon from bundle	2019-05-23 14:34:38 -04:00
Douglas Hall	4d739f2962	fix: remove paragon from bundle BREAKING CHANGE: Now requires containing app to provide `@edx/paragon`.	2019-05-23 14:28:28 -04:00
albemarle	28a6c85bc0	Merge pull request #30 from edx/aehsan/prod-277/update_the_edx_icp_license Updated ICP license in footer	2019-05-22 14:01:36 -04:00
adeelehsan	6125988bbd	Updated ICP license in footer	2019-05-22 00:33:19 +05:00
edX Transifex Bot	9eeccc63cb	fix(i18n): update translations	2019-05-19 17:33:41 -04:00
Robert Raposa	2f33c6718b	Merge pull request #31 from edx/robrap/ARCH-748-fix-i18n-jobs fix(i18n): fix i18n make targets	2019-05-16 13:20:46 -04:00
Adam Stankiewicz	89397fcfdb	Merge pull request #32 from edx/astankiewicz/downgrade-query-string fix(query-string): downgrade query-string to version 5 for es5	2019-05-16 12:57:21 -04:00
Adam Stankiewicz	278b4b1473	fix(query-string): downgrade query-string to version 5 for es5	2019-05-16 09:44:44 -07:00
Robert Raposa	7ff9039bb7	fix(i18n): fix i18n make targets ARCH-748	2019-05-16 12:27:27 -04:00
Chris Pappas	0cf3164901	Merge pull request #28 from edx/cpappas/ENT-1888 fix: updating enterprise marketing link logic	2019-05-10 16:55:50 -04:00
Christopher Pappas	bf8020dfac	fix: updating business marketing footer fix: adding https:// to business marketing link fix: fixing marketing link for business fix: fixing marketing link for business	2019-05-10 15:49:40 -04:00