Mark and allow word list timed out comments (#3097)

Will mark the comment's metdata as a word list
time out if it happens and also tag them with
suspect or banned word.

Then we show "possible suspect/banned word"
markers on the moderate card so moderators can
manually review them.

CORL-1264

Co-authored-by: Wyatt Johnson <wyattjoh@gmail.com>

.circleci/config.yml

@@ -1,8 +1,8 @@
 # job_environment will setup the environment for any job being executed.
 job_environment: &job_environment
-  NODE_ENV: test
-  WEBPACK_MAX_CORES: 4
-  NODE_OPTIONS: --max-old-space-size=8192
+  NODE_ENV: "test"
+  WEBPACK_MAX_CORES: "4"
+  NODE_OPTIONS: "--max-old-space-size=8192"
 
 # job_defaults applies all the defaults for each job.
 job_defaults: &job_defaults
@@ -13,7 +13,7 @@ job_defaults: &job_defaults
   environment:
     <<: *job_environment
 
-version: 2
+version: 2.1
 jobs:
   # npm_dependencies will install the dependencies used by all other steps.
   npm_dependencies:
@@ -49,7 +49,8 @@ jobs:
             - ~/.npm
       - persist_to_workspace:
           root: .
-          paths: node_modules
+          paths:
+            - node_modules
 
   # lint will perform file linting.
   lint:
@@ -78,7 +79,7 @@ jobs:
     <<: *job_defaults
     environment:
       <<: *job_environment
-      CI: true
+      CI: "true"
       JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
     steps:
       - checkout
@@ -115,14 +116,15 @@ jobs:
           no_output_timeout: 30m
       - run:
           name: Verify Bundle Size
-          command: npx bundlesize
+          command: npx bundlesize2 --enable-github-checks
       - save_cache:
           key: v1-build-cache-{{ .Branch }}-{{ .Revision }}
           paths:
             - ./dist
       - persist_to_workspace:
           root: .
-          paths: dist
+          paths:
+            - dist
 
   # docker_tests will test that the docker build process completes.
   docker_tests:
@@ -173,7 +175,6 @@ filter_develop: &filter_develop
         - next
 
 workflows:
-  version: 2
   build-test:
     jobs:
       - docker_tests:

.dockerignore

@@ -27,4 +27,3 @@ yarn.lock
 dist
 *.css.d.ts
 __generated__
-README.md.orig

.eslintrc.js

@@ -1,10 +1,11 @@
-const typescriptEslintRecommended = require('@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended').default.overrides[0];
-const typescriptRecommended = require('@typescript-eslint/eslint-plugin/dist/configs/recommended.json');
-const typescriptRecommendedTypeChecking = require('@typescript-eslint/eslint-plugin/dist/configs/recommended-requiring-type-checking.json');
-const typescriptEslintPrettier = require('eslint-config-prettier/@typescript-eslint');
-const react = require('eslint-plugin-react').configs.recommended;
-const jsxA11y = require('eslint-plugin-jsx-a11y').configs.recommended;
-const reactPrettier = require('eslint-config-prettier/react');
+const typescriptEslintRecommended = require("@typescript-eslint/eslint-plugin/dist/configs/eslint-recommended")
+  .overrides[0];
+const typescriptRecommended = require("@typescript-eslint/eslint-plugin/dist/configs/recommended.js");
+const typescriptRecommendedTypeChecking = require("@typescript-eslint/eslint-plugin/dist/configs/recommended-requiring-type-checking.js");
+const typescriptEslintPrettier = require("eslint-config-prettier/@typescript-eslint");
+const react = require("eslint-plugin-react").configs.recommended;
+const jsxA11y = require("eslint-plugin-jsx-a11y").configs.recommended;
+const reactPrettier = require("eslint-config-prettier/react");
 
 const typescriptOverrides = {
   files: ["*.ts", "*.tsx"],
@@ -20,11 +21,12 @@ const typescriptOverrides = {
     "@typescript-eslint/tslint",
     "react",
     "jsx-a11y",
+    "react-hooks",
   ],
   settings: {
     react: {
       version: "detect",
-    }
+    },
   },
   rules: Object.assign(
     typescriptEslintRecommended.rules,
@@ -36,32 +38,45 @@ const typescriptOverrides = {
     {
       "@typescript-eslint/adjacent-overload-signatures": "error",
       // TODO: (cvle) change `readonly` param to `array-simple` when upgraded typescript.
-      "@typescript-eslint/array-type": ["error", { "default": "array-simple", "readonly": "generic"}],
-      "@typescript-eslint/ban-types": "error",
+      "@typescript-eslint/array-type": [
+        "error",
+        { default: "array-simple", readonly: "generic" },
+      ],
+      "@typescript-eslint/ban-types": [
+        "error",
+        {
+          types: {
+            "{}": false,
+            object: false,
+            extendDefaults: true,
+          },
+        },
+      ],
       "@typescript-eslint/camelcase": "off",
       "@typescript-eslint/consistent-type-assertions": "error",
       "@typescript-eslint/consistent-type-definitions": "error",
-      "@typescript-eslint/class-name-casing": "error",
       "@typescript-eslint/explicit-function-return-type": "off",
+      "@typescript-eslint/explicit-module-boundary-types": "off",
       "@typescript-eslint/explicit-member-accessibility": [
         "error",
         {
-          "overrides": {
-            "constructors": "off",
+          overrides: {
+            constructors: "off",
           },
         },
       ],
       "@typescript-eslint/indent": "off",
-      "@typescript-eslint/interface-name-prefix": "error",
       "@typescript-eslint/member-delimiter-style": "off",
-      "@typescript-eslint/no-empty-function": "error",
+      "@typescript-eslint/no-empty-function": "off",
       "@typescript-eslint/no-empty-interface": "error",
       "@typescript-eslint/no-explicit-any": "off",
       "@typescript-eslint/no-misused-new": "error",
       "@typescript-eslint/no-namespace": "error",
       "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-parameter-properties": "off",
-      "@typescript-eslint/no-unused-vars": ["error", {"args": "none", "ignoreRestSiblings": true}],
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        { args: "none", ignoreRestSiblings: true },
+      ],
       "@typescript-eslint/no-use-before-define": "off", // TODO: (cvle) Should be on?
       "@typescript-eslint/no-use-before-declare": "off",
       "@typescript-eslint/no-var-requires": "error",
@@ -77,38 +92,59 @@ const typescriptOverrides = {
       "react/display-name": "error",
       "react/prop-types": "off",
       "react/no-unescaped-entities": "off",
+      "no-empty-function": "off",
+      // (tessalt) disabled because video elements are only used to display gifs, which have no audio
+      "jsx-a11y/media-has-caption": "off",
     }
   ),
 };
 
-let typescriptTypeCheckingOverrides = {
+const jestTypeCheckingOverrides = {
+  files: ["test/**/*.ts", "test/**/*.tsx"],
+  rules: {
+    "@typescript-eslint/no-floating-promises": "off",
+  },
+};
+
+const typescriptTypeCheckingOverrides = {
   files: ["*.ts", "*.tsx"],
   parserOptions: {
-    project: ["tsconfig.json", "./src/tsconfig.json", "./src/core/client/tsconfig.json"],
+    project: [
+      "./tsconfig.json",
+      "./src/tsconfig.json",
+      "./src/core/client/tsconfig.json",
+    ],
     // TODO: (cvle) this is a workaround, see: https://github.com/typescript-eslint/typescript-eslint/issues/1091.
     createDefaultProgram: true,
   },
-  rules: Object.assign(
-    typescriptRecommendedTypeChecking.rules,
-    {
-      "@typescript-eslint/tslint/config": ["error", {
-        "rules": {
+  rules: Object.assign(typescriptRecommendedTypeChecking.rules, {
+    "@typescript-eslint/tslint/config": [
+      "error",
+      {
+        rules: {
           "ordered-imports": {
-            "options": {
-              "import-sources-order": "case-insensitive",
+            options: {
+              // Legacy sorting until this is fixed: https://github.com/SoominHan/import-sorter/issues/60
+              "import-sources-order": "case-insensitive-legacy",
               "module-source-path": "full",
-              "named-imports-order": "case-insensitive",
+              "named-imports-order": "case-insensitive-legacy",
             },
           },
         },
-      }],
-      // 28.11.19: (cvle) Disabled because behavior of regexp.exec seems different than str.match?
-      "@typescript-eslint/prefer-regexp-exec": "off",
-      "@typescript-eslint/require-await": "off",
-      "@typescript-eslint/no-misused-promises": "off",
-      "@typescript-eslint/unbound-method": "off", // 10.10.19: (cvle) seems to give false positive.
-    }
-  ),
+      },
+    ],
+    "@typescript-eslint/no-misused-promises": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-return": "off",
+    // 28.11.19: (cvle) Disabled because behavior of regexp.exec seems different than str.match?
+    "@typescript-eslint/prefer-regexp-exec": "off",
+    "@typescript-eslint/require-await": "off",
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/unbound-method": "off", // 10.10.19: (cvle) seems to give false positive.
+  }),
+  overrides: [jestTypeCheckingOverrides],
 };
 
 const jestOverrides = {
@@ -117,8 +153,8 @@ const jestOverrides = {
   },
   files: ["test/**/*.ts", "test/**/*.tsx"],
   globals: {
-    "expectAndFail": "readonly",
-    "fail": "readonly",
+    expectAndFail: "readonly",
+    fail: "readonly",
   },
 };
 
@@ -140,35 +176,31 @@ module.exports = {
     "eslint:recommended",
     "plugin:jsdoc/recommended",
     "plugin:prettier/recommended",
+    "plugin:react-hooks/recommended",
   ],
   parserOptions: {
-    "ecmaVersion": 2018,
+    ecmaVersion: 2018,
   },
   rules: {
     "arrow-body-style": "off",
-    "arrow-parens": [
-      "off",
-      "as-needed",
-    ],
-    "camelcase": "off",
-    "complexity": "off",
+    "arrow-parens": ["off", "as-needed"],
+    camelcase: "off",
+    complexity: "off",
     "constructor-super": "error",
     "spaced-comment": ["error", "always"],
-    "curly": "error",
+    curly: "error",
     "dot-notation": "error",
     "eol-last": "off",
-    "eqeqeq": "error",
+    eqeqeq: "error",
     "guard-for-in": "error",
+    "jsdoc/check-param-names": "off",
     "jsdoc/require-jsdoc": "off",
     "jsdoc/require-returns": "off",
     "jsdoc/require-param": "off",
     "jsdoc/require-param-type": "off",
     "jsdoc/require-returns-type": "off",
     "linebreak-style": "off",
-    "max-classes-per-file": [
-      "error",
-      1,
-    ],
+    "max-classes-per-file": ["error", 1],
     "member-ordering": "off",
     "new-parens": "off",
     "newline-per-chained-call": "off",
@@ -185,7 +217,7 @@ module.exports = {
     "no-irregular-whitespace": "off",
     "no-multiple-empty-lines": "off",
     "no-new-wrappers": "error",
-    "no-prototype-builtins": "off",
+    "no-prototype-builtins": "error",
     "no-shadow": "error",
     "no-throw-literal": "error",
     "no-undef": "off",
@@ -193,14 +225,14 @@ module.exports = {
     "no-unsafe-finally": "error",
     "no-unused-expressions": "error",
     "no-unused-labels": "error",
-    "no-unused-vars": ["error", {"args": "none", "ignoreRestSiblings": true}],
+    "no-unused-vars": ["error", { args: "none", ignoreRestSiblings: true }],
     "no-var": "error",
     "object-shorthand": "error",
     "one-var": "off",
     "prefer-arrow-callback": "off",
     "prefer-const": "error",
     "quote-props": "off",
-    "radix": "error",
+    radix: "error",
     "require-atomic-updates": "off",
     "space-before-function-paren": "off",
     "sort-imports": "off",

.gitignore

@@ -20,5 +20,4 @@ yarn.lock
 dist
 *.css.d.ts
 __generated__
-README.md.orig
 persisted-queries.json

.kodiak.toml

@@ -0,0 +1,44 @@
+# .kodiak.toml
+
+# Kodiak's configuration file should be placed at `.kodiak.toml` (repository
+# root) or `.github/.kodiak.toml`.
+# docs: https://kodiakhq.com/docs/config-reference
+
+# version is the only required setting in a kodiak config.
+# `1` is the only valid setting for this field.
+version = 1
+
+[merge]
+# Label to enable Kodiak to merge a PR.
+
+# By default, Kodiak will only act on PRs that have this label. You can disable
+# this requirement via `merge.require_automerge_label`.
+automerge_label = "🚀 merge it!" # default: "automerge"
+
+# Kodiak will not merge a PR with any of these labels.
+blocking_labels = ["don't merge"] # default: [], options: list of label names (e.g. ["wip"])
+
+# Choose merge method for Kodiak to use.
+#
+# Kodiak will report a configuration error if the selected merge method is
+# disabled for a repository.
+#
+# If you're using the "Require signed commits" GitHub Branch Protection setting
+# to require commit signatures, _`"merge"` is the only compatible option_. Any
+# other option will cause Kodiak to raise a configuration error.
+method = "squash" # default: "merge", options: "merge", "squash", "rebase"
+
+# Once a PR is merged, delete the branch. This option behaves like the GitHub
+# repository setting "Automatically delete head branches", which automatically
+# deletes head branches after pull requests are merged.
+delete_branch_on_merge = true # default: false
+
+# Don't wait for in-progress status checks on a PR to finish before updating the
+# branch.
+optimistic_updates = false # default: true
+
+[merge.message]
+# Strip HTML comments (`<!-- some HTML comment -->`) from merge commit body.
+# This setting is useful for stripping HTML comments created by PR templates.
+# This option only applies when `merge.message.body_type = "markdown"`.
+strip_html_comments = true # default: false

.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "es5"
-}

.vscode/settings.json

@@ -54,5 +54,5 @@
   "search.exclude": {
     "package-lock.json": true
   },
-  "debug.node.autoAttach": "on"
+  "debug.node.autoAttach": "off"
 }

CLIENT_EVENTS.md

@@ -129,9 +129,11 @@ createComment.error
 - <a href="#showSharePopover">showSharePopover</a>
 - <a href="#showUserPopover">showUserPopover</a>
 - <a href="#signOut">signOut</a>
+- <a href="#signedIn">signedIn</a>
 - <a href="#unfeatureComment">unfeatureComment</a>
 - <a href="#updateNotificationSettings">updateNotificationSettings</a>
 - <a href="#updateStorySettings">updateStorySettings</a>
+- <a href="#updateUserMediaSettings">updateUserMediaSettings</a>
 - <a href="#viewConversation">viewConversation</a>
 - <a href="#viewFullDiscussion">viewFullDiscussion</a>
 - <a href="#viewNewComments">viewNewComments</a>
@@ -538,6 +540,7 @@ createComment.error
       };
   }
   ```
+- <a id="signedIn">**signedIn**</a>: This event is emitted when the viewer signed in (not applicable for SSO).
 - <a id="unfeatureComment">**unfeatureComment.success**, **unfeatureComment.error**</a>: This event is emitted when the viewer unfeatures a comment.
   ```ts
   {
@@ -585,6 +588,17 @@ createComment.error
       };
   }
   ```
+- <a id="updateUserMediaSettings">**updateUserMediaSettings.success**, **updateUserMediaSettings.error**</a>: 
+  ```ts
+  {
+      unfurlEmbeds?: boolean | null | undefined;
+      success: {};
+      error: {
+          message: string;
+          code?: string | undefined;
+      };
+  }
+  ```
 - <a id="viewConversation">**viewConversation**</a>: This event is emitted when the viewer changes to the single conversation view.
   ```ts
   {

CONTRIBUTING.md

@@ -174,6 +174,16 @@ also supports comments in specific languages. When the language is supported in
 Coral and supported by the Perspective API, the language should be added to the
 language map in `src/core/server/services/comments/pipeline/phases/toxic.ts`.
 
+To assist with the translation process, we have a script that is based on the
+work by @cristiandean in https://github.com/coralproject/talk/pull/2949 that
+will detect missing, new, or changed translation keys for the specified
+language. You can use this with:
+
+```sh
+# usage: ./scripts/i18n/validate.ts <locale>
+./scripts/i18n/validate.ts pt-BR
+```
+
 ## Documentation
 
 Documentation that is publicly shown on

CSS_VARIABLES.md

@@ -0,0 +1,272 @@
+
+# CSS Variables
+
+Coral defines a set of CSS Variables that you can use to broadly customize the
+look and feel of your comment stream. For example you can easily redefine the colors
+or fonts that are being used.
+
+To change the CSS Variables, use the following example in your custom CSS file:
+
+```
+:root {
+  --font-family-primary: 'Verdana';
+  --round-corners: 0px;
+}
+```
+
+The following list contains the CSS Variables that can be customized.
+
+**Info**: *Before 6.3.0 Coral uses a different set of CSS Variables. If you are still using
+the old CSS Variables, please upgrade. Currently we have a compatibility layer to bridge the old CSS Variables to the new ones. This mechanism will be removed in the future.*
+
+<!-- START docs:css-variables -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN npm run docs:css-variables -->
+### Index
+- <a href="#variables">Variables</a>
+  - <a href="#palette">palette</a>
+    - <a href="#palette-primary">palette-primary</a>
+    - <a href="#palette-background">palette-background</a>
+    - <a href="#palette-text">palette-text</a>
+    - <a href="#palette-grey">palette-grey</a>
+    - <a href="#palette-error">palette-error</a>
+    - <a href="#palette-success">palette-success</a>
+    - <a href="#palette-warning">palette-warning</a>
+  - <a href="#font-family">font-family</a>
+  - <a href="#font-weight">font-weight</a>
+    - <a href="#font-weight-primary">font-weight-primary</a>
+    - <a href="#font-weight-secondary">font-weight-secondary</a>
+  - <a href="#font-size">font-size</a>
+  - <a href="#shadow">shadow</a>
+  - <a href="#spacing">spacing</a>
+  - <a href="#mini-unit">mini-unit</a>
+
+
+### Variables
+
+Use this to remove round corners or make them more round.
+
+`--round-corners: 3px;`
+
+### palette
+
+`--palette-divider: rgba(0, 0, 0, 0.12);`
+
+#### palette-primary
+
+Color palette that is used as the primary color.
+
+`--palette-primary-100: #EBF6FF;  /* Before 6.3.0: --palette-primary-lightest */`
+
+`--palette-primary-200: #B7DCFF;  /* Before 6.3.0: --palette-primary-lighter */`
+
+`--palette-primary-300: #61B3FF;  /* Before 6.3.0: --palette-primary-light */`
+
+`--palette-primary-400: #2897FF;  /* Before 6.3.0: --palette-primary-main */`
+
+`--palette-primary-500: #0070D9;  /* Before 6.3.0: --palette-primary-main */`
+
+`--palette-primary-600: #0062BE;  /* Before 6.3.0: --palette-primary-main */`
+
+`--palette-primary-700: #005AAE;  /* Before 6.3.0: --palette-primary-main */`
+
+`--palette-primary-800: #004688;  /* Before 6.3.0: --palette-primary-dark */`
+
+`--palette-primary-900: #00386D;  /* Before 6.3.0: --palette-primary-darkest */`
+
+#### palette-background
+
+Color palette that is used for background colors.
+
+`--palette-background-body: #FFFFFF;`
+
+`--palette-background-popover: #FFFFFF;`
+
+`--palette-background-tooltip: #65696B;`
+
+`--palette-background-input: #FFFFFF;`
+
+`--palette-background-input-disabled: #EFEFEF;`
+
+#### palette-text
+
+Color palette that is used for text.
+
+`--palette-text-000: #FFFFFF;  /* Before 6.3.0: --palette-text-light */`
+
+`--palette-text-100: #65696B;  /* Before 6.3.0: --palette-text-secondary */`
+
+`--palette-text-500: #353F44;  /* Before 6.3.0: --palette-text-primary */`
+
+`--palette-text-900: #14171A;  /* Before 6.3.0: --palette-text-dark */`
+
+`--palette-text-placeholder: #9FA4A6;  /* Before 6.3.0: --palette-grey-lighter */`
+
+`--palette-text-input-disabled: #9FA4A6;  /* Before 6.3.0: --palette-grey-lighter */`
+
+#### palette-grey
+
+Color palette that is used for grey shades.
+
+`--palette-grey-100: #F4F7F7;  /* Before 6.3.0: --palette-grey-lightest */`
+
+`--palette-grey-200: #EAEFF0;  /* Before 6.3.0: --palette-grey-lightest */`
+
+`--palette-grey-300: #CBD1D2;  /* Before 6.3.0: --palette-grey-lighter */`
+
+`--palette-grey-400: #9FA4A6;  /* Before 6.3.0: --palette-grey-lighter */`
+
+`--palette-grey-500: #65696B;  /* Before 6.3.0: --palette-grey-main */`
+
+`--palette-grey-600: #49545C;  /* Before 6.3.0: --palette-grey-dark */`
+
+`--palette-grey-700: #32404D;  /* Before 6.3.0: --palette-grey-darkest */`
+
+`--palette-grey-800: #202E3E;  /* Before 6.3.0: --palette-grey-darkest */`
+
+`--palette-grey-900: #132033;  /* Before 6.3.0: --palette-grey-darkest */`
+
+#### palette-error
+
+Color palette that is used for indicating something is error red.
+
+`--palette-error-100: #FCE5D9;  /* Before 6.3.0: --palette-error-lightest */`
+
+`--palette-error-200: #FAC6B4;  /* Before 6.3.0: --palette-error-lighter */`
+
+`--palette-error-300: #F29D8B;  /* Before 6.3.0: --palette-error-lighter */`
+
+`--palette-error-400: #E5766C;  /* Before 6.3.0: --palette-error-light */`
+
+`--palette-error-500: #D53F3F;  /* Before 6.3.0: --palette-error-main */`
+
+`--palette-error-600: #B72E39;  /* Before 6.3.0: --palette-error-main */`
+
+`--palette-error-700: #991F34;  /* Before 6.3.0: --palette-error-dark */`
+
+`--palette-error-800: #7B142E;  /* Before 6.3.0: --palette-error-darkest */`
+
+`--palette-error-900: #660C2B;  /* Before 6.3.0: --palette-error-darkest */`
+
+#### palette-success
+
+Color palette that is used for indicating something is success green.
+
+`--palette-success-100: #D8F9D5;  /* Before 6.3.0: --palette-success-lightest */`
+
+`--palette-success-200: #ADF3AD;  /* Before 6.3.0: --palette-success-lighter */`
+
+`--palette-success-300: #7CDB85;  /* Before 6.3.0: --palette-success-lighter */`
+
+`--palette-success-400: #54B767;  /* Before 6.3.0: --palette-success-light */`
+
+`--palette-success-500: #268742;  /* Before 6.3.0: --palette-success-main */`
+
+`--palette-success-600: #1B743D;  /* Before 6.3.0: --palette-success-main */`
+
+`--palette-success-700: #136138;  /* Before 6.3.0: --palette-success-dark */`
+
+`--palette-success-800: #0C4E32;  /* Before 6.3.0: --palette-success-darkest */`
+
+`--palette-success-900: #07402E;  /* Before 6.3.0: --palette-success-darkest */`
+
+#### palette-warning
+
+Color palette that is used for indicating a warning and is usually yellow.
+
+`--palette-warning-100: #FFFACC;  /* Before 6.3.0: --palette-warning-main */`
+
+`--palette-warning-500: #FFE91F;  /* Before 6.3.0: --palette-warning-main */`
+
+### font-family
+
+Different font families currently in use.
+
+`--font-family-primary: "Open Sans";  /* Before 6.3.0: --font-family-sans-serif */`
+
+`--font-family-secondary: "Nunito";  /* Before 6.3.0: --font-family-serif */`
+
+### font-weight
+
+Different font weights with matching values for the fonts.
+
+#### font-weight-primary
+
+`--font-weight-primary-bold: 700;  /* Before 6.3.0: --font-weight-bold */`
+
+`--font-weight-primary-semi-bold: 600;  /* Before 6.3.0: --font-weight-medium */`
+
+`--font-weight-primary-regular: 300;  /* Before 6.3.0: --font-weight-light */`
+
+#### font-weight-secondary
+
+`--font-weight-secondary-bold: 700;  /* Before 6.3.0: --font-weight-bold */`
+
+`--font-weight-secondary-regular: 300;  /* Before 6.3.0: --font-weight-light */`
+
+### font-size
+
+`--font-size-1: 0.75rem;`
+
+`--font-size-2: 0.875rem;`
+
+`--font-size-3: 1rem;`
+
+`--font-size-4: 1.125rem;`
+
+`--font-size-5: 1.25rem;`
+
+`--font-size-6: 1.5rem;`
+
+`--font-size-7: 1.75rem;`
+
+`--font-size-8: 2rem;`
+
+`--font-size-9: 2.25rem;`
+
+`--font-size-icon-xl: 2.25rem;`
+
+`--font-size-icon-lg: 1.5rem;`
+
+`--font-size-icon-md: 1.125rem;`
+
+`--font-size-icon-sm: 0.875rem;`
+
+`--font-size-icon-xs: 0.75rem;`
+
+### shadow
+
+Different shadows that are currently used in Coral.
+
+`--shadow-popover: 1px 0px 4px rgba(0, 0, 0, 0.25);  /* Before 6.3.0: --elevation-main */`
+
+### spacing
+
+Different spacing units currenty used in Coral.
+
+`--spacing-1: 4px;`
+
+`--spacing-2: 8px;`
+
+`--spacing-3: 12px;`
+
+`--spacing-4: 16px;`
+
+`--spacing-5: 24px;`
+
+`--spacing-6: 32px;`
+
+`--spacing-7: 44px;`
+
+`--spacing-8: 60px;`
+
+`--spacing-9: 84px;`
+
+### mini-unit
+
+Grid units for smaller and larger screens.
+
+`--mini-unit-small: 4;`
+
+`--mini-unit-large: 8;`
+
+<!-- END docs:css-variables -->

EXTERNAL_MODERATION_PHASES.md

@@ -0,0 +1,240 @@
+# External Moderation Phases Guide
+
+This document is in reference to external moderation phases emitted by Coral.
+You can configure external moderation phases on your installation of Coral by
+visiting `/admin/configure/moderation/phases`.
+
+Once you've configured a external moderation phase in Coral, you will start to
+receive moderation requests in the form of a
+[External Moderation Requests](#external-moderation-request) at the provided
+callback URL. These will be in the form of `POST` requests with a `JSON`
+payload.
+
+When a comment is created or edited, it will be processed by moderation phases in
+a predefined order. Any external moderation phase is run last, and only if all
+other moderation phases before it do not return a status. The current set of
+moderation phases is listed in order [here](https://github.com/coralproject/talk/blob/master/src/core/server/services/comments/pipeline/phases/index.ts).
+
+Once you have received a moderation request, you must respond within the
+provided timeout else the phase will be skipped and it will continue. It is
+strongly recommended to [verify the request signature](#request-signing).
+
+The external moderation phase must respond with one of the following:
+
+1. Do not moderate the comment, and return a 204 without a body.
+2. Perform a moderation action and return a 200 with a [External Moderation Response](#external-moderation-response)
+   as a `JSON` encoded body containing the operations you want to perform on the
+   comment.
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+## Table of Contents
+
+- [Request Signing](#request-signing)
+- [Schema](#schema)
+  - [External Moderation Request](#external-moderation-request)
+  - [External Moderation Response](#external-moderation-response)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+## Request Signing
+
+Requests sent by Coral for external moderation phases use the same process as
+those used by webhooks. Refer to the [webhooks documentation](WEBHOOKS.md#webhook-signing)
+for instructions on how to verify signatures sent by Coral.
+
+## Schema
+
+### External Moderation Request
+
+```ts
+interface ExternalModerationRequest {
+  /**
+   * action refers to the specific operation being performed. If `NEW`, this
+   * is referring to a new comment being created. If `EDIT`, then this refers to
+   * an operation involving an edit operation on an existing Comment.
+   */
+  action: "NEW" | "EDIT";
+
+  /**
+   * comment refers to the actual Comment data for the Comment being
+   * created/edited.
+   */
+  comment: {
+    /**
+     * body refers to the actual body text of the Comment being created/edited.
+     */
+    body: string;
+
+    /**
+     * parentID is the identifier for the parent comment (if this Comment is a
+     * reply, null otherwise).
+     */
+    parentID: string | null;
+  };
+
+  /**
+   * author refers to the User that is creating/editing the Comment.
+   */
+  author: {
+    /**
+     * id is the identifier for this User.
+     */
+    id: string;
+
+    /**
+     * role refers to the role of this User.
+     */
+    role: "COMMENTER" | "STAFF" | "MODERATOR" | "ADMIN";
+  };
+
+  /**
+   * story refers to the Story being commented on.
+   */
+  story: {
+    /**
+     * id is the identifier for this Story.
+     */
+    id: string;
+
+    /**
+     * url is the URL for this Story.
+     */
+    url: string;
+  };
+
+  /**
+   * site refers to the Site that the story being commented on belongs to.
+   */
+  site: {
+    /**
+     * id is the identifier for this Site.
+     */
+    id: string;
+  };
+
+  /**
+   * tenantID is the identifer of the Tenant that this Comment is being
+   * created/edited on.
+   */
+  tenantID: string;
+
+  /**
+   * tenantDomain is the domain that is associated with this Tenant that this
+   * Comment is being created/edited on.
+   */
+  tenantDomain: string;
+}
+```
+
+#### Example
+
+New comment on a story:
+
+```json
+{
+  "action": "NEW",
+  "comment": {
+    "body": "Here's a comment!",
+    "parentID": null
+  },
+  "author": {
+    "id": "baf4e943-3594-4fcc-b2ba-3e8de7a76352",
+    "role": "COMMENTER"
+  },
+  "story": {
+    "id": "245b3856-b0a0-4d2f-a6bb-58c71f18d6a6",
+    "url": "http://localhost:1313/posts/a-story-url/"
+  },
+  "site": {
+    "id": "a4bede88-2d2c-4424-bc18-4322a9e285a6"
+  },
+  "tenantID": "19ba5794-7eeb-4d46-a81b-c00c61672501",
+  "tenantDomain": "localhost"
+}
+```
+
+New reply on a comment on a story:
+
+```json
+{
+  "action": "NEW",
+  "comment": {
+    "body": "Here's a reply!",
+    "parentID": "d79b787f-f406-49a0-a179-72e3652e54be"
+  },
+  "author": {
+    "id": "baf4e943-3594-4fcc-b2ba-3e8de7a76352",
+    "role": "COMMENTER"
+  },
+  "story": {
+    "id": "245b3856-b0a0-4d2f-a6bb-58c71f18d6a6",
+    "url": "http://localhost:1313/posts/a-story-url/"
+  },
+  "site": {
+    "id": "a4bede88-2d2c-4424-bc18-4322a9e285a6"
+  },
+  "tenantID": "19ba5794-7eeb-4d46-a81b-c00c61672501",
+  "tenantDomain": "localhost"
+}
+```
+
+### External Moderation Response
+
+```ts
+interface ExternalModerationResponse {
+  /**
+   * actions is an optional list of any flags to be added to this Comment.
+   */
+  actions?: Array<{
+    actionType: "FLAG";
+    reason: "COMMENT_DETECTED_TOXIC" | "COMMENT_DETECTED_SPAM";
+  }>;
+
+  /**
+   * tags are any listed tags that should be added to the comment.
+   */
+  tags?: Array<"FEATURED" | "STAFF">;
+
+  /**
+   * status when provided decides and terminates the moderation process by
+   * setting the status of the comment.
+   */
+  status?: "NONE" | "APPROVED" | "REJECTED" | "PREMOD" | "SYSTEM_WITHHELD";
+}
+```
+
+#### Examples
+
+Add a flag to a comment and do not set a status:
+
+```json
+{
+  "actions": [{ "actionType": "FLAG", "reason": "COMMENT_DETECTED_TOXIC" }]
+}
+```
+
+Reject a comment:
+
+```json
+{
+  "status": "REJECTED"
+}
+```
+
+Feature a comment and do not set a status:
+
+```json
+{
+  "tags": ["FEATURED"]
+}
+```
+
+Approve a comment and mark it as featured:
+
+```json
+{
+  "status": "APPROVED",
+  "tags": ["FEATURED"]
+}
+```

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Vox Media, Inc
+Copyright 2020 Vox Media, Inc
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -1,41 +1,52 @@
-# Coral ![CircleCI](https://img.shields.io/circleci/project/github/coralproject/talk.svg)
+<p align="center">
+  <a href="https://coralproject.net" target="_blank"><img width="250" src="https://docs.coralproject.net/coral/images/coralproject_by_voxmedia.svg" alt="Coral by Vox Media" /></a>
+</p>
 
-Online comments are broken. Our open-source commenting platform, Coral, rethinks
-how moderation, comment display, and conversation function, creating the
-opportunity for safer, smarter discussions around your work.
-[Read more about Coral here](https://coralproject.net/talk).
+<p align="center">
+  A better commenting experience from <a href="https://product.voxmedia.com/" target="_blank">Vox Media</a>.
+</p>
 
-Built with <3 by The Coral Project, a part of [Vox Media](https://product.voxmedia.com/).
+<p align="center">
+  <a href="https://circleci.com/gh/coralproject/talk" target="_blank"><img src="https://img.shields.io/circleci/build/gh/coralproject/talk?style=flat-square" alt="CircleCI" /></a>
+  <a href="https://hub.docker.com/r/coralproject/talk" target="_blank"><img src="https://img.shields.io/docker/v/coralproject/talk?label=docker%20hub&sort=semver&style=flat-square" alt="Docker Image Version" /></a>
+  <a href="https://hub.docker.com/r/coralproject/talk" target="_blank"><img src="https://img.shields.io/docker/image-size/coralproject/talk?label=docker%20image%20size&sort=semver&style=flat-square" alt="Docker Image Size" /></a>
+  <a href="https://twitter.com/coralproject" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/coralproject?style=flat-square"></a>
+</p>
 
-Preview Coral easily by running Coral via a Heroku App:
+## Description
 
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/coralproject/talk)
+Online comments are broken. Our open-source commenting platform,
+[Coral](https://coralproject.net), rethinks how moderation, comment display, and
+conversation function, creating the opportunity for safer, smarter discussions
+around your work.
 
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-## Table of Contents
-
-- [Documentation](#documentation)
-- [Pre-Launch Guide](#pre-launch-guide)
-- [More Resources](#more-resources)
-- [License](#license)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+We offer hosting and support packages for Coral, as well as exclusive,
+customer-only features. [Contact us](https://coralproject.net/pricing/) for more
+information or [sign up for a webinar](https://coralproject.net).
 
 ## Documentation
 
-You can get started with Coral using our [Documentation](https://docs.coralproject.net/talk/).
+If you're new to Coral, the [Coral documentation](https://docs.coralproject.net/)
+is a great place to start running and developing with Coral.
 
-## Pre-Launch Guide
+You’ve installed Coral, and you’re preparing to launch it on your site. The real
+community work starts now, before you go live. You have a unique opportunity
+pre-launch to set your community up for success. Read our
+[Community Guides](https://guides.coralproject.net/start-here/) to learn more.
 
-You’ve installed Talk on your server, and you’re preparing to launch it on your site. The real community work starts now, before you go live. You have a unique opportunity pre-launch to set your community up for success. Read our [Talk Community Guide](https://coralproject.net/blog/youve-installed-talk-now-what/).
+## Support
 
-## More Resources
+We can help you set up Coral, migrate your comments from another system,
+integrate your registration platform, pair with your programmers, and help you
+with bespoke installs. To learn more, [contact us](https://coralproject.net/pricing/).
 
-- [Our Blog](https://coralproject.net/blog)
-- [Community Guides for Journalism](https://guides.coralproject.net/)
-- [More About Us](https://coralproject.net/)
+## Contributing
+
+Coral is a Apache-2.0 licensed open-source project built with <3 by the Coral
+team, a part of [Vox Media](https://product.voxmedia.com/).
+
+If you are interested in contributing to Coral, check out our [Contributor's Guide](CONTRIBUTING.md).
 
 ## License
 
-Coral is released under the [Apache License, v2.0](/LICENSE).
+Coral is [Apache-2.0 licensed](LICENSE).

WEBHOOKS.md

@@ -174,6 +174,16 @@ function when comparing signatures.
    * date when this event was created.
    */
   createdAt: string;
+
+  /**
+   * tenantID is the ID of the Tenant that this event originated at.
+   */
+  tenantID: string;
+
+  /**
+   * tenantDomain is the domain that is associated with this Tenant that this event originated at.
+   */
+  tenantDomain: string;
 }
 ```
 
@@ -199,6 +209,11 @@ function when comparing signatures.
      * storyURL is the URL of the newly created Story.
      */
     storyURL: string;
+
+    /**
+     * siteID is the Site that the newly created Story was created on.
+     */
+    siteID: string;
   }
   createdAt: string;
 }

app.json

@@ -1,42 +0,0 @@
-{
-  "name": "Coral",
-  "description": "A better commenting experience from Vox Media.",
-  "env": {
-    "REWRITE_ENV": {
-      "description": "Used to rewrite the environment variables set by Heroku.",
-      "value": "REDIS_URI:REDIS_URL,MONGODB_URI:MONGO_URI"
-    },
-    "SIGNING_SECRET": {
-      "description": "The shared secret to use to sign JSON Web Tokens (JWT) with the selected signing algorithm.",
-      "generator": "secret"
-    },
-    "CONCURRENCY": {
-      "description": "The number of worker nodes to spawn to handle traffic.",
-      "value": "1"
-    },
-    "LOCALE": {
-      "description": "Specify the default locale to use for all requests without a locale specified",
-      "value": "en-US"
-    },
-    "ENABLE_GRAPHIQL": {
-      "description": "When true, this will enable the GraphiQL routes",
-      "value": "false"
-    },
-    "TRUST_PROXY": {
-      "description": "When set to 1, it instructs Coral to trust up to one proxy, this is needed for authentication support",
-      "value": "1"
-    }
-  },
-  "addons": [
-    {
-      "plan": "mongolab:sandbox",
-      "as": "MONGO"
-    },
-    {
-      "plan": "rediscloud:30",
-      "as": "REDIS"
-    }
-  ],
-  "success_url": "/install",
-  "website": "https://github.com/coralproject/talk"
-}

babel.config.js

@@ -10,7 +10,7 @@ const plugins =
 
 const environment =
   process.env.WEBPACK === "true"
-    ? { targets: "IE 11", modules: false }
+    ? { modules: false }
     : { targets: { node: "current" }, modules: "commonjs" };
 
 module.exports = {

config/jest/client.config.js

@@ -40,11 +40,9 @@ module.exports = {
   snapshotSerializers: ["enzyme-to-json/serializer"],
   globals: {
     "ts-jest": {
-      useBabelrc: true,
-      tsConfigFile: path.resolve(
-        __dirname,
-        "../../src/core/client/tsconfig.json"
-      ),
+      babelConfig: true,
+      tsConfig: path.resolve(__dirname, "../../src/core/client/tsconfig.json"),
     },
   },
+  preset: "ts-jest/presets/js-with-babel",
 };

config/jest/server.config.js

@@ -21,8 +21,9 @@ module.exports = {
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   globals: {
     "ts-jest": {
-      useBabelrc: true,
-      tsConfigFile: path.resolve(__dirname, "../../src/tsconfig.json"),
+      babelConfig: true,
+      tsConfig: path.resolve(__dirname, "../../src/tsconfig.json"),
     },
   },
+  preset: "ts-jest",
 };

doczrc.js

@@ -1,105 +1,10 @@
 // Apply all the configuration provided in the .env file.
 require("dotenv").config();
 
-const fs = require("fs");
-const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
-const extensions = [".ts", ".tsx", ".js"];
-// TODO: There is some weird issue with including paths.ts here
-const postCSSConfigPath = "./src/core/build/postcss.config";
-const appDirectory = fs.realpathSync(process.cwd());
-
-const styleLoader = {
-  loader: require.resolve("style-loader"),
-  options: {
-    sourceMap: true,
-    hmr: true,
-  },
-};
-
 module.exports = {
-  title: "Coral 5.0",
-  source: "./src",
-  typescript: true,
+  title: "Coral 5",
+  src: "./src",
   host: process.env.HOST || "0.0.0.0",
   port: parseInt(process.env.DOCZ_PORT, 10) || 3030,
-  codeSandbox: false, // Too large to create code sandboxes..
-  modifyBundlerConfig: config => {
-    config.entry.app.push(
-      `${appDirectory}/src/core/client/ui/theme/variables.css.ts`
-    );
-    config.module.rules.push({
-      test: /\.css\.ts$/,
-      use: [
-        styleLoader,
-        {
-          loader: require.resolve("css-loader"),
-          options: {
-            modules: true,
-            importLoaders: 2,
-            localIdentName: "[name]-[local]-[hash:base64:5]",
-            sourceMap: true,
-          },
-        },
-        {
-          loader: require.resolve("postcss-loader"),
-          options: {
-            config: {
-              path: postCSSConfigPath,
-            },
-            parser: "postcss-js",
-          },
-        },
-        {
-          loader: require.resolve("babel-loader"),
-          options: {
-            configFile: false,
-            babelrc: false,
-            presets: [
-              "@babel/typescript",
-              [
-                "@babel/env",
-                { targets: { node: "current" }, modules: "commonjs" },
-              ],
-            ],
-            // This is a feature of `babel-loader` for webpack (not Babel itself).
-            // It enables caching results in ./node_modules/.cache/babel-loader/
-            // directory for faster rebuilds.
-            cacheDirectory: true,
-          },
-        },
-      ],
-    });
-    config.module.rules.push({
-      test: /\.css$/,
-      use: [
-        styleLoader,
-        {
-          loader: require.resolve("css-loader"),
-          options: {
-            modules: true,
-            importLoaders: 1,
-            localIdentName: "[name]-[local]-[hash:base64:5]",
-            sourceMap: true,
-          },
-        },
-        {
-          loader: require.resolve("postcss-loader"),
-          options: {
-            config: {
-              path: postCSSConfigPath,
-            },
-          },
-        },
-      ],
-    });
-    config.resolve.plugins = [
-      new TsconfigPathsPlugin({
-        extensions,
-        // TODO: There is some weird issue with including paths.ts here
-        configFile: "./src/core/client/tsconfig.json",
-      }),
-    ];
-    // fs.writeFileSync(path.resolve(__dirname, "tmp"), stringify(config, null, 2));
-    return config;
-  },
+  files: "**/*.mdx",
 };

gatsby-node.js

@@ -0,0 +1,216 @@
+const fs = require("fs");
+const path = require("path");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+
+/** Path to postCSSConfig */
+const postCSSConfigPath = path.resolve(
+  __dirname,
+  "../src/core/build/postcss.config"
+);
+const rootDir = path.resolve(__dirname, "../");
+const srcDir = path.resolve(rootDir, "./src");
+const appTsconfig = path.resolve(rootDir, "./src/core/client/tsconfig.json");
+
+const CSS_PATTERN = /\.css$/;
+const MODULE_CSS_PATTERN = /\.module\.css$/;
+
+// Define `RegExp.toJSON` so that we can stringify RegExp.
+Object.defineProperty(RegExp.prototype, "toJSON", {
+  value: RegExp.prototype.toString,
+});
+
+const isCssRules = (rule) =>
+  rule.test &&
+  (rule.test.toString() === CSS_PATTERN.toString() ||
+    rule.test.toString() === MODULE_CSS_PATTERN.toString());
+
+const findCssRules = (config) =>
+  config.module.rules.find(
+    (rule) => Array.isArray(rule.oneOf) && rule.oneOf.every(isCssRules)
+  );
+
+exports.onCreateWebpackConfig = ({
+  stage,
+  rules,
+  loaders,
+  plugins,
+  actions,
+  getConfig,
+}) => {
+  // Get webpack config.
+  const config = getConfig();
+
+  if (stage === "develop") {
+    config.entry.commons.push(
+      // Add our stream css variables file.
+      `${srcDir}/core/client/ui/theme/stream.css.ts`
+    );
+  }
+
+  /*
+  TODO: (cvle) couldn't get build to work...
+  if (stage === "build-javascript") {
+    config.entry.app = [
+      config.entry.app,
+      `${appDir}/core/client/ui/theme/stream.css.ts`,
+    ];
+  }
+  */
+
+  // Find the gatsby CSS rules.
+  const cssRules = findCssRules(config);
+  // Exclude them from our src dir because they are incomaptible with our
+  // CSS rules.
+  cssRules.exclude = srcDir;
+  // Add .tx .tsx to modules
+  config.resolve.extensions.push(".ts", ".tsx");
+  actions.replaceWebpackConfig(config);
+
+  // Write out webpack config to .docz folder.
+  fs.writeFileSync(
+    path.resolve(__dirname, "webpack-" + stage),
+    JSON.stringify(config, {}, 2)
+  );
+
+  // Turn on sourceMap during develop.
+  const sourceMap = stage.startsWith("develop");
+
+  // CSS loaders to prepend.
+  const prependCSSLoaders = [];
+  if (stage === "develop") {
+    prependCSSLoaders.push(loaders.style());
+  }
+
+  /*
+  TODO: (cvle) couldn't get build to work...
+  if (stage === "build-javascript") {
+    moreLoaders.push(loaders.style());
+  }
+  */
+
+  actions.setWebpackConfig({
+    resolve: {
+      plugins: [
+        // Resolve our custom paths.
+        new TsconfigPathsPlugin({
+          extensions: [".ts", ".tsx", ".js"],
+          configFile: path.resolve(rootDir, "./src/core/client/tsconfig.json"),
+        }),
+      ],
+    },
+    module: {
+      rules: [
+        {
+          include: srcDir,
+          oneOf: [
+            {
+              test: /\.css\.ts$/,
+              use: [
+                ...prependCSSLoaders,
+                {
+                  loader: require.resolve("css-loader"),
+                  options: {
+                    modules: {
+                      localIdentName: "[name]-[local]-[hash:base64:5]",
+                    },
+                    importLoaders: 2,
+                    sourceMap,
+                  },
+                },
+                {
+                  loader: require.resolve("postcss-loader"),
+                  options: {
+                    config: {
+                      path: postCSSConfigPath,
+                    },
+                    parser: "postcss-js",
+                  },
+                },
+                {
+                  loader: require.resolve("babel-loader"),
+                  options: {
+                    configFile: false,
+                    babelrc: false,
+                    presets: [
+                      "@babel/typescript",
+                      [
+                        "@babel/env",
+                        { targets: { node: "current" }, modules: "commonjs" },
+                      ],
+                    ],
+                    // This is a feature of `babel-loader` for webpack (not Babel itself).
+                    // It enables caching results in ./node_modules/.cache/babel-loader/
+                    // directory for faster rebuilds.
+                    cacheDirectory: true,
+                  },
+                },
+              ],
+            },
+            {
+              test: /\.css$/,
+              use: [
+                ...prependCSSLoaders,
+                {
+                  loader: require.resolve("css-loader"),
+                  options: {
+                    modules: {
+                      localIdentName: "[name]-[local]-[hash:base64:5]",
+                    },
+                    importLoaders: 1,
+                    sourceMap,
+                  },
+                },
+                {
+                  loader: require.resolve("postcss-loader"),
+                  options: {
+                    config: {
+                      path: postCSSConfigPath,
+                    },
+                  },
+                },
+              ],
+            },
+            {
+              test: /\.tsx?$/,
+              use: [
+                {
+                  loader: require.resolve("babel-loader"),
+                  options: {
+                    root: rootDir,
+                    // This is a feature of `babel-loader` for webpack (not Babel itself).
+                    // It enables caching results in ./node_modules/.cache/babel-loader/
+                    // directory for faster rebuilds.
+                    cacheDirectory: true,
+                  },
+                },
+                {
+                  loader: require.resolve("ts-loader"),
+                  options: {
+                    configFile: appTsconfig,
+                    compilerOptions: {
+                      target: "es2015",
+                      module: "esnext",
+                      jsx: "preserve",
+                      noEmit: false,
+                    },
+                    transpileOnly: true,
+                    // Overwrites the behavior of `include` and `exclude` to only
+                    // include files that are actually being imported and which
+                    // are necessary to compile the bundle.
+                    onlyCompileBundledFiles: true,
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  });
+
+  // Write out processed webpack config to .docz folder.
+  fs.writeFileSync(
+    path.resolve(__dirname, "webpack-" + stage + "-processed"),
+    JSON.stringify(getConfig(), {}, 2)
+  );
+};

package.json

@@ -1,9 +1,10 @@
 {
   "name": "@coralproject/talk",
-  "version": "6.0.3",
+  "version": "6.3.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
+    "*.css.ts",
     "*.css"
   ],
   "repository": {
@@ -18,15 +19,17 @@
   "contributors": [
     "https://github.com/coralproject/talk/graphs/contributors"
   ],
-  "description": "A better commenting experience from Mozilla, The Washington Post, and The New York Times.",
+  "description": "A better commenting experience from Vox Media.",
   "scripts": {
+    "clean": "gulp clean",
     "build": "NODE_ENV=production npm-run-all generate-persist --parallel build:client build:server",
     "build:development": "NODE_ENV=development npm-run-all generate --parallel build:client build:server",
     "build:client": "ts-node --transpile-only ./scripts/build.ts",
     "build:server": "gulp server",
     "migration:create": "ts-node --transpile-only ./scripts/migration/create.ts",
     "docs:events": "ts-node ./scripts/generateEventDocs.ts ./src/core/client/stream/events.ts ./CLIENT_EVENTS.md",
-    "doctoc": "doctoc --maxlevel=3 --title '## Table of Contents' README.md CLIENT_EVENTS.md CONTRIBUTING.md WEBHOOKS.md",
+    "docs:css-variables": "ts-node ./scripts/generateCSSVariablesDocs.ts ./src/core/client/ui/theme/streamVariables.ts ./CSS_VARIABLES.md",
+    "doctoc": "doctoc --maxlevel=3 --title '## Table of Contents' CLIENT_EVENTS.md CONTRIBUTING.md WEBHOOKS.md EXTERNAL_MODERATION_PHASES.md",
     "generate": "npm-run-all generate:css-types generate:schema generate:relay",
     "generate-persist": "npm-run-all generate:css-types generate:schema generate:relay-persist",
     "generate:css-types": "tcm src/core/client/",
@@ -40,7 +43,7 @@
     "generate:schema": "node ./scripts/generateSchemaTypes.js",
     "docz": "docz",
     "start": "NODE_ENV=production node dist/index.js",
-    "start:development": "NODE_ENV=development CONCURRENCY=${CONCURRENCY:-1} TS_NODE_PROJECT=./src/tsconfig.json ts-node-dev --inspect --transpile-only --no-notify -r tsconfig-paths/register ./src/index.ts",
+    "start:development": "NODE_ENV=development TS_NODE_PROJECT=./src/tsconfig.json ts-node-dev --inspect --transpile-only --no-notify -r tsconfig-paths/register ./src/index.ts",
     "start:webpackDevServer": "ts-node --transpile-only ./scripts/start.ts",
     "lint": "npm-run-all --parallel lint:* tscheck:*",
     "lint:server": "eslint 'src/**/*.{js,ts,tsx}' --ignore-pattern 'src/core/client/**'",
@@ -58,336 +61,361 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@coralproject/bunyan-prettystream": "^0.1.4",
-    "@fluent/bundle": "^0.14.0",
+    "@emotion/core": "^10.0.28",
+    "@fluent/bundle": "^0.15.0",
     "@fluent/dom": "^0.6.0",
-    "@metascraper/helpers": "^5.7.21",
+    "@hapi/joi": "^17.1.1",
+    "@metascraper/helpers": "^5.11.6",
+    "@rudderstack/rudder-sdk-node": "0.0.2",
     "abort-controller": "^3.0.0",
-    "akismet-api": "^4.2.0",
-    "apollo-server-express": "^2.8.1",
-    "archiver": "^3.0.3",
+    "akismet-api": "^5.0.0",
+    "apollo-server-core": "^2.14.4",
+    "apollo-server-express": "^2.14.2",
+    "archiver": "^3.1.1",
     "basic-auth": "^2.0.1",
     "bcryptjs": "^2.4.3",
-    "bull": "^3.8.1",
+    "bull": "^3.13.0",
     "bunyan": "^1.8.12",
-    "cheerio": "^1.0.0-rc.2",
+    "bytes": "^3.1.0",
+    "cheerio": "^1.0.0-rc.3",
     "consolidate": "0.14.0",
-    "content-security-policy-builder": "^2.0.0",
-    "convict": "^4.3.1",
+    "content-security-policy-builder": "^2.1.0",
+    "convict": "^5.2.0",
     "cookie": "^0.4.0",
-    "cookie-parser": "^1.4.4",
-    "cors": "^2.8.4",
-    "cron": "^1.7.1",
-    "csv-stringify": "^5.3.0",
-    "dataloader": "^1.4.0",
-    "dompurify": "^2.0.7",
-    "dotenv": "^6.0.0",
-    "dotenv-expand": "^4.2.0",
+    "cookie-parser": "^1.4.5",
+    "cors": "^2.8.5",
+    "cron": "^1.8.2",
+    "csv-stringify": "^5.3.6",
+    "dataloader": "1.4.0",
+    "dompurify": "^2.0.8",
+    "dotenv": "^8.2.0",
+    "emailjs": "^3.2.0",
     "env-rewrite": "^1.0.2",
     "express": "^4.17.1",
     "express-enforces-ssl": "^1.1.0",
-    "express-static-gzip": "^0.3.2",
-    "fs-extra": "^6.0.1",
-    "graphql": "^0.13.2",
-    "graphql-config": "^2.0.1",
-    "graphql-extensions": "^0.2.1",
-    "graphql-fields": "^1.1.0",
-    "graphql-import": "^0.7.1",
-    "graphql-playground-html": "^1.6.0",
-    "graphql-redis-subscriptions": "^2.1.0",
+    "express-static-gzip": "^2.0.6",
+    "fs-extra": "^8.1.0",
+    "graphql": "^14.6.0",
+    "graphql-config": "^2.2.2",
+    "graphql-extensions": "^0.11.0",
+    "graphql-fields": "2.0.3",
+    "graphql-playground-html": "1.6.13",
+    "graphql-redis-subscriptions": "^2.2.1",
     "graphql-subscriptions": "^1.1.0",
-    "graphql-tools": "^3.0.5",
-    "helmet": "^3.21.2",
-    "html-minifier": "^3.5.21",
-    "html-to-text": "^4.0.0",
-    "ioredis": "^4.9.0",
-    "joi": "^13.4.0",
-    "jsdom": "^15.0.0",
+    "graphql-tools": "^4.0.7",
+    "helmet": "^3.22.0",
+    "html-minifier": "^4.0.0",
+    "html-to-text": "^5.1.1",
+    "ioredis": "^4.16.1",
+    "jsdom": "^16.2.2",
     "jsonwebtoken": "^8.5.1",
-    "juice": "^5.2.0",
-    "jwks-rsa": "^1.6.0",
-    "keymaster": "^1.6.2",
-    "linkifyjs": "^2.1.8",
-    "lodash": "^4.17.15",
+    "juice": "^6.0.0",
+    "jwks-rsa": "^1.7.0",
+    "linkifyjs": "^2.1.9",
+    "lodash": "^4.17.19",
+    "long-settimeout": "^1.0.1",
     "lru-cache": "^5.1.1",
-    "luxon": "^1.12.0",
-    "metascraper-author": "^5.8.0",
-    "metascraper-description": "^5.8.0",
-    "metascraper-image": "^5.8.0",
-    "metascraper-title": "^5.8.0",
-    "mongodb": "^3.2.7",
+    "luxon": "^1.22.2",
+    "metascraper-author": "^5.11.6",
+    "metascraper-description": "^5.11.6",
+    "metascraper-image": "^5.11.6",
+    "metascraper-title": "^5.11.6",
+    "mongodb": "^3.5.9",
     "mongodb-core": "^3.2.7",
-    "ms": "^2.1.1",
+    "ms": "^2.1.2",
     "node-fetch": "^2.6.0",
-    "nodemailer": "^4.6.7",
-    "nunjucks": "^3.1.3",
+    "nunjucks": "^3.2.1",
     "on-finished": "^2.3.0",
     "passport": "^0.4.1",
     "passport-facebook": "^3.0.0",
     "passport-google-oauth2": "^0.2.0",
     "passport-local": "^1.0.0",
-    "passport-oauth2": "^1.4.0",
+    "passport-oauth2": "^1.5.0",
     "passport-strategy": "^1.0.0",
-    "performance-now": "^2.1.0",
     "permit": "^0.2.4",
-    "prom-client": "^11.3.0",
+    "prom-client": "^12.0.0",
     "proxy-agent": "^3.1.1",
     "querystringify": "^2.1.1",
-    "react-helmet": "^5.2.1",
-    "source-map-support": "^0.5.12",
-    "stack-utils": "^1.0.2",
+    "source-map-support": "^0.5.16",
+    "stack-utils": "^2.0.1",
     "striptags": "^3.1.1",
-    "throng": "^4.0.0",
     "tsscmp": "^1.0.6",
     "url-regex": "^5.0.0",
-    "uuid": "^3.3.3",
-    "verror": "^1.10.0"
+    "uuid": "^7.0.3",
+    "verror": "^1.10.0",
+    "xregexp": "^4.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "@babel/preset-typescript": "^7.8.3",
-    "@babel/runtime-corejs3": "^7.8.3",
+    "@babel/core": "^7.10.3",
+    "@babel/preset-env": "^7.10.3",
+    "@babel/preset-react": "^7.10.1",
+    "@babel/preset-typescript": "^7.10.1",
+    "@babel/runtime-corejs3": "^7.10.3",
     "@coralproject/npm-run-all": "^4.1.5",
-    "@coralproject/rte": "^0.11.1",
-    "@fluent/react": "^0.10.0",
+    "@coralproject/rte": "^1.1.1",
+    "@fluent/react": "^0.11.1",
     "@intervolga/optimize-cssnano-plugin": "^1.0.6",
-    "@types/agent-base": "^4.2.0",
-    "@types/archiver": "^3.0.0",
-    "@types/basic-auth": "^1.1.2",
-    "@types/bcryptjs": "^2.4.1",
-    "@types/bull": "^3.5.12",
-    "@types/bunyan": "^1.8.4",
-    "@types/case-sensitive-paths-webpack-plugin": "^2.1.2",
-    "@types/cheerio": "^0.22.8",
-    "@types/classnames": "^2.2.7",
-    "@types/commander": "^2.12.2",
+    "@types/archiver": "^3.1.0",
+    "@types/basic-auth": "^1.1.3",
+    "@types/bcryptjs": "^2.4.2",
+    "@types/bull": "^3.12.1",
+    "@types/bunyan": "^1.8.6",
+    "@types/bytes": "^3.1.0",
+    "@types/case-sensitive-paths-webpack-plugin": "^2.1.4",
+    "@types/cheerio": "^0.22.17",
+    "@types/classnames": "^2.2.10",
     "@types/common-tags": "^1.8.0",
-    "@types/compression-webpack-plugin": "^2.0.0",
-    "@types/consolidate": "0.0.34",
-    "@types/convict": "^4.2.0",
+    "@types/compression-webpack-plugin": "^2.0.1",
+    "@types/consolidate": "0.14.0",
+    "@types/convict": "^5.2.1",
     "@types/cookie": "^0.3.3",
-    "@types/cookie-parser": "^1.4.1",
-    "@types/cors": "^2.8.4",
-    "@types/cron": "^1.7.1",
-    "@types/cross-spawn": "^6.0.0",
-    "@types/dompurify": "0.0.33",
-    "@types/dotenv": "^4.0.3",
-    "@types/enzyme": "^3.1.15",
-    "@types/enzyme-adapter-react-16": "^1.0.3",
+    "@types/cookie-parser": "^1.4.2",
+    "@types/cors": "^2.8.6",
+    "@types/cron": "^1.7.2",
+    "@types/cross-spawn": "^6.0.1",
+    "@types/dompurify": "^2.0.1",
+    "@types/enzyme": "^3.10.5",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/eventemitter2": "^4.1.0",
-    "@types/express": "^4.16.0",
+    "@types/express": "^4.17.4",
     "@types/express-enforces-ssl": "^1.1.1",
-    "@types/flat": "0.0.28",
-    "@types/fs-extra": "^5.0.4",
-    "@types/graphql": "^0.13.3",
-    "@types/helmet": "0.0.45",
-    "@types/html-minifier": "^3.5.2",
+    "@types/express-serve-static-core": "^4.17.3",
+    "@types/flat": "^5.0.0",
+    "@types/fs-extra": "^8.1.0",
+    "@types/hapi__joi": "^16.0.12",
+    "@types/helmet": "^0.0.45",
+    "@types/html-minifier": "^3.5.3",
+    "@types/html-minifier-terser": "^5.0.0",
     "@types/html-to-text": "^1.4.31",
-    "@types/html-webpack-plugin": "^3.2.0",
-    "@types/ioredis": "^4.0.10",
-    "@types/jest": "^24.0.23",
-    "@types/jest-axe": "^3.2.1",
-    "@types/joi": "^13.0.8",
-    "@types/jsdom": "^12.2.3",
-    "@types/jsonwebtoken": "^8.3.5",
-    "@types/linkifyjs": "^2.1.1",
-    "@types/lodash": "^4.14.118",
+    "@types/html-webpack-plugin": "^3.2.3",
+    "@types/ioredis": "^4.14.9",
+    "@types/jest": "^26.0.3",
+    "@types/jest-axe": "^3.2.2",
+    "@types/jsdom": "^16.2.0",
+    "@types/jsonwebtoken": "^8.3.8",
+    "@types/linkifyjs": "^2.1.3",
+    "@types/lodash": "^4.14.149",
     "@types/lru-cache": "^5.1.0",
-    "@types/luxon": "^1.12.0",
-    "@types/marked": "^0.6.0",
-    "@types/mini-css-extract-plugin": "^0.2.0",
-    "@types/mongodb": "^3.1.22",
-    "@types/ms": "^0.7.30",
-    "@types/node": "^10.5.2",
-    "@types/node-fetch": "^2.5.3",
-    "@types/nodemailer": "^4.6.2",
-    "@types/nunjucks": "^3.1.1",
-    "@types/object-diff": "0.0.0",
+    "@types/luxon": "^1.22.0",
+    "@types/marked": "^0.7.3",
+    "@types/mini-css-extract-plugin": "^0.9.1",
+    "@types/mongodb": "3.1.22",
+    "@types/ms": "^0.7.31",
+    "@types/node": "^12.12.34",
+    "@types/node-fetch": "^2.5.5",
+    "@types/nunjucks": "^3.1.3",
     "@types/on-finished": "^2.3.1",
-    "@types/passport": "^1.0.2",
-    "@types/passport-facebook": "^2.1.8",
+    "@types/passport": "^1.0.3",
+    "@types/passport-facebook": "^2.1.9",
     "@types/passport-local": "^1.0.33",
-    "@types/passport-oauth2": "^1.4.5",
-    "@types/passport-strategy": "^0.2.33",
+    "@types/passport-oauth2": "^1.4.8",
+    "@types/passport-strategy": "^0.2.35",
     "@types/permit": "^0.2.1",
-    "@types/prettier": "^1.19.0",
-    "@types/prop-types": "^15.5.8",
-    "@types/react": "^16.8.15",
+    "@types/prettier": "^1.19.1",
+    "@types/react": "^16.9.31",
     "@types/react-axe": "^3.1.0",
-    "@types/react-copy-to-clipboard": "^4.2.6",
-    "@types/react-dom": "^16.8.4",
-    "@types/react-helmet": "^5.0.10",
-    "@types/react-relay": "^5.0.1",
-    "@types/react-responsive": "^3.0.1",
-    "@types/react-test-renderer": "^16.8.1",
-    "@types/react-transition-group": "^2.0.14",
-    "@types/recompose": "^0.26.5",
-    "@types/relay-runtime": "^5.0.5",
+    "@types/react-copy-to-clipboard": "^4.3.0",
+    "@types/react-dom": "^16.9.6",
+    "@types/react-helmet": "^5.0.15",
+    "@types/react-relay": "^7.0.3",
+    "@types/react-responsive": "^8.0.2",
+    "@types/react-test-renderer": "^16.9.2",
+    "@types/react-transition-group": "^4.2.4",
+    "@types/recharts": "^1.8.9",
+    "@types/recompose": "^0.30.7",
+    "@types/relay-runtime": "^8.0.7",
     "@types/sane": "^2.0.0",
     "@types/shallow-equals": "^1.0.0",
     "@types/simplemde": "^1.11.7",
-    "@types/sinon": "^7.0.11",
-    "@types/source-map-support": "^0.5.0",
+    "@types/sinon": "^7.5.2",
+    "@types/source-map-support": "^0.5.1",
     "@types/stack-trace": "0.0.29",
     "@types/stack-utils": "^1.0.1",
-    "@types/throng": "^4.0.2",
-    "@types/uuid": "^3.4.4",
+    "@types/uuid": "^7.0.2",
     "@types/verror": "^1.10.3",
-    "@types/vinyl": "^2.0.2",
-    "@types/webpack": "^4.4.31",
-    "@types/webpack-assets-manifest": "^3.0.0",
-    "@types/webpack-bundle-analyzer": "^2.13.1",
-    "@types/webpack-dev-server": "^3.1.5",
-    "@types/ws": "^5.1.2",
-    "@typescript-eslint/eslint-plugin": "2.3.3",
-    "@typescript-eslint/eslint-plugin-tslint": "2.3.3",
-    "@typescript-eslint/parser": "2.3.3",
-    "acorn": "^6.1.1",
-    "ansi-styles": "^3.2.0",
-    "autoprefixer": "^9.5.1",
+    "@types/vinyl": "^2.0.4",
+    "@types/webpack": "^4.41.17",
+    "@types/webpack-assets-manifest": "^3.0.1",
+    "@types/webpack-bundle-analyzer": "^3.8.0",
+    "@types/webpack-dev-server": "^3.11.0",
+    "@types/ws": "^7.2.3",
+    "@types/xregexp": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^3.4.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^3.4.0",
+    "@typescript-eslint/parser": "^3.4.0",
+    "autoprefixer": "^9.7.5",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^24.9.0",
-    "babel-loader": "^8.0.6",
+    "babel-jest": "^26.1.0",
+    "babel-loader": "^8.1.0",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-module-resolver": "^3.2.0",
-    "babel-plugin-relay": "^5.0.0",
+    "babel-plugin-module-resolver": "^4.0.0",
+    "babel-plugin-relay": "^9.1.0",
     "babel-plugin-use-lodash-es": "^0.2.0",
-    "bowser": "^1.9.4",
-    "case-sensitive-paths-webpack-plugin": "^2.2.0",
-    "chalk": "^2.4.2",
-    "chokidar": "^3.0.0",
+    "bowser": "^2.9.0",
+    "case-sensitive-paths-webpack-plugin": "^2.3.0",
+    "chalk": "^3.0.0",
+    "chokidar": "^3.3.1",
     "classnames": "^2.2.6",
-    "commander": "^2.20.0",
-    "comment-json": "^1.1.3",
+    "commander": "^5.0.0",
+    "comment-json": "^3.0.2",
     "common-tags": "^1.8.0",
-    "compression-webpack-plugin": "^2.0.0",
-    "copy-webpack-plugin": "^5.0.3",
+    "compression-webpack-plugin": "^3.1.0",
     "core-js": "^3.6.4",
-    "cross-spawn": "^6.0.5",
-    "css-loader": "^1.0.1",
-    "css-vars-ponyfill": "^2.1.2",
-    "del": "^4.1.1",
+    "cross-spawn": "^7.0.1",
+    "css-loader": "^3.4.2",
+    "css-vars-ponyfill": "^2.2.1",
+    "del": "^5.1.0",
     "doctoc": "^1.4.0",
-    "docz": "^0.13.7",
-    "docz-theme-default": "^0.13.7",
-    "enzyme": "^3.9.0",
-    "enzyme-adapter-react-16": "^1.12.1",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.3.0",
-    "eslint-plugin-jsdoc": "^15.9.7",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-react": "^7.15.1",
-    "eventemitter2": "^5.0.1",
-    "farce": "^0.2.6",
+    "docz": "^v2.3.0-alpha.14",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.2",
+    "enzyme-to-json": "^3.5.0",
+    "eslint": "^7.3.1",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-jsdoc": "^28.5.1",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-react": "^7.20.0",
+    "eslint-plugin-react-hooks": "^4.0.8",
+    "eventemitter2": "^6.3.1",
+    "farce": "^0.2.8",
     "final-form": "4.18.6",
-    "final-form-arrays": "1.1.2",
-    "flat": "^4.1.0",
+    "final-form-arrays": "^3.0.2",
+    "flat": "^5.0.0",
     "fluent-intl-polyfill": "^0.1.0",
-    "fork-ts-checker-webpack-plugin": "^1.5.0",
-    "found": "^0.4.9",
-    "found-relay": "^0.4.3",
-    "graphql-schema-linter": "^0.2.0",
-    "graphql-schema-typescript": "^1.2.9",
+    "fork-ts-checker-webpack-plugin": "^4.1.2",
+    "found": "^0.4.10",
+    "found-relay": "^0.7.0",
+    "graphql-schema-linter": "^0.4.0",
+    "graphql-schema-typescript": "^1.3.2",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
-    "gulp-cli": "^2.2.0",
+    "gulp-cli": "^2.3.0",
     "gulp-sourcemaps": "^2.6.5",
-    "gulp-typescript": "^5.0.1",
-    "html-webpack-plugin": "^4.0.0-beta.11",
-    "husky": "^2.2.0",
-    "intersection-observer": "^0.6.0",
-    "jest": "^24.8.0",
-    "jest-axe": "^3.2.0",
-    "jest-junit": "^6.4.0",
-    "jest-localstorage-mock": "^2.4.0",
-    "jest-mock-console": "^1.0.0",
-    "lint-staged": "^8.1.6",
-    "loader-utils": "^1.2.3",
-    "lodash-es": "^4.17.14",
-    "marked": "^0.7.0",
+    "gulp-typescript": "^6.0.0-alpha.1",
+    "html-webpack-plugin": "^4.0.4",
+    "husky": "^4.2.3",
+    "intersection-observer": "^0.7.0",
+    "jest": "^26.1.0",
+    "jest-axe": "^3.4.0",
+    "jest-junit": "^11.0.1",
+    "jest-localstorage-mock": "^2.4.2",
+    "jest-mock-console": "^1.0.1",
+    "keymaster": "^1.6.2",
+    "lint-staged": "^10.2.11",
+    "loader-utils": "^2.0.0",
+    "lodash-es": "^4.17.15",
+    "marked": "^0.8.2",
     "material-design-icons": "^3.0.1",
-    "mini-css-extract-plugin": "^0.6.0",
-    "object-diff": "0.0.4",
-    "postcss-advanced-variables": "^3.0.0",
+    "mini-css-extract-plugin": "^0.9.0",
+    "postcss-advanced-variables": "^3.0.1",
     "postcss-calc-function": "^1.1.0",
-    "postcss-css-variables": "^0.11.0",
-    "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-font-magician": "^2.2.1",
-    "postcss-import": "^11.1.0",
-    "postcss-js": "^2.0.1",
+    "postcss-flexbugs-fixes": "^4.2.0",
+    "postcss-font-magician": "^2.3.1",
+    "postcss-import": "^12.0.1",
+    "postcss-js": "^2.0.3",
     "postcss-loader": "^3.0.0",
-    "postcss-mixins": "^6.2.1",
-    "postcss-nested": "^4.1.1",
+    "postcss-mixins": "^6.2.3",
+    "postcss-nested": "^4.2.1",
     "postcss-prepend-imports": "^1.0.1",
-    "postcss-preset-env": "^6.5.0",
-    "prettier": "^1.18.2",
-    "prop-types": "^15.6.2",
-    "proxy-polyfill": "^0.3.0",
-    "pstree.remy": "^1.1.6",
+    "postcss-preset-env": "^6.7.0",
+    "prettier": "^2.0.2",
+    "proxy-polyfill": "^0.3.1",
+    "pstree.remy": "^1.1.7",
     "pym.js": "^1.3.2",
-    "raw-loader": "^0.5.1",
-    "react": "^16.9.0",
-    "react-axe": "^3.3.0",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-dev-utils": "^9.0.0",
-    "react-dom": "^16.9.0",
-    "react-error-overlay": "^5.1.6",
+    "raw-loader": "^4.0.0",
+    "react": "^16.13.1",
+    "react-axe": "^3.4.1",
+    "react-copy-to-clipboard": "^5.0.2",
+    "react-dev-utils": "^10.2.1",
+    "react-dom": "^16.13.1",
+    "react-error-overlay": "^6.0.7",
     "react-final-form": "6.3.0",
-    "react-final-form-arrays": "3.1.0",
-    "react-popper": "^1.3.2",
-    "react-relay": "^5.0.0",
-    "react-relay-network-modern": "^4.0.4",
-    "react-responsive": "^7.0.0",
-    "react-test-renderer": "^16.9.0",
-    "react-timeago": "^4.1.9",
-    "react-transition-group": "^2.9.0",
-    "react-with-state-props": "^2.0.4",
-    "recompose": "0.27.1",
-    "regenerator-runtime": "^0.13.3",
-    "relay-compiler": "^5.0.0",
-    "relay-compiler-language-typescript": "^4.1.0",
+    "react-final-form-arrays": "^3.1.1",
+    "react-helmet": "^5.2.1",
+    "react-popper": "^1.3.7",
+    "react-relay": "^9.0.0",
+    "react-relay-network-modern": "^4.6.1",
+    "react-responsive": "^8.0.3",
+    "react-test-renderer": "^16.13.1",
+    "react-timeago": "^4.4.0",
+    "react-transition-group": "^4.3.0",
+    "recharts": "^1.8.5",
+    "recompose": "^0.30.0",
+    "regenerator-runtime": "^0.13.5",
+    "relay-compiler": "^9.0.0",
+    "relay-compiler-language-typescript": "^12.0.3",
     "relay-local-schema": "^0.8.0",
-    "relay-runtime": "^5.0.0",
+    "relay-runtime": "^9.0.0",
     "resize-observer-polyfill": "^1.5.1",
     "sane": "^4.1.0",
-    "scheduler": "^0.15.0",
     "shallow-equals": "^1.0.0",
     "simplemde": "^1.11.2",
     "simulant": "^0.2.2",
-    "sinon": "^7.3.2",
-    "sockjs-client": "^1.3.0",
-    "stack-trace": "0.0.10",
-    "strip-ansi": "^5.2.0",
-    "style-loader": "^0.23.1",
+    "sinon": "^9.0.1",
+    "sockjs-client": "^1.4.0",
+    "stack-trace": "^0.0.10",
+    "strip-ansi": "^6.0.0",
+    "style-loader": "^1.1.3",
     "subscriptions-transport-ws": "^0.9.16",
-    "terser-webpack-plugin": "^1.2.3",
-    "thread-loader": "^2.1.2",
+    "terser-webpack-plugin": "^2.3.5",
+    "thread-loader": "^2.1.3",
     "timekeeper": "^2.2.0",
-    "ts-jest": "<23.10.0",
-    "ts-loader": "^6.0.0",
-    "ts-node": "^8.1.0",
-    "ts-node-dev": "^1.0.0-pre.37",
-    "tsconfig-paths": "^3.8.0",
+    "ts-jest": "26.1.1",
+    "ts-loader": "^7.0.5",
+    "ts-node": "^8.10.2",
+    "ts-node-dev": "1.0.0-pre.44",
+    "tsconfig-paths": "^3.9.0",
     "tsconfig-paths-webpack-plugin": "^3.2.0",
-    "tslint": "^5.20.0",
-    "typed-css-modules": "^0.4.2",
-    "typeface-manuale": "^0.0.71",
-    "typeface-nunito": "0.0.72",
-    "typeface-open-sans": "0.0.75",
-    "typeface-source-sans-pro": "^0.0.54",
-    "typescript": "3.3.4000",
-    "typescript-snapshots-plugin": "^1.6.0",
-    "wait-for-expect": "^1.1.1",
-    "webpack": "^4.41.5",
+    "tslint": "^6.1.2",
+    "typed-css-modules": "^0.6.4",
+    "typeface-manuale": "^1.1.4",
+    "typeface-nunito": "^1.1.3",
+    "typeface-open-sans": "^0.0.75",
+    "typeface-source-sans-pro": "^1.1.5",
+    "typescript": "^3.9.5",
+    "typescript-snapshots-plugin": "^1.7.0",
+    "wait-for-expect": "^1.3.0",
+    "webpack": "^4.43.0",
     "webpack-assets-manifest": "^3.1.1",
-    "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "3.2.1",
+    "webpack-bundle-analyzer": "^3.8.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.0",
     "whatwg-fetch": "^3.0.0"
   },
+  "dependencies-pins-documentation": {
+    "ts-node-dev@1.0.0-pre.44": [
+      "Newer versions unbearibly slow"
+    ],
+    "ts-jest@25.4.0": [
+      "Newer versions require every definition file to be included",
+      "in tsconfig.json in the `files` field. This is cumbersome and",
+      "here is a discussion of it: https://github.com/kulshekhar/ts-jest/issues/1604"
+    ],
+    "wait-for-expect@1.x.x": [
+      "Newer versions breaks the use of jest fake timers"
+    ],
+    "consolidate@14.0.0": [
+      "Newer versions has problems with using nunjucks.",
+      "Update when the following issue is resolved:",
+      "https://github.com/tj/consolidate.js/issues/244"
+    ],
+    "final-form@4.18.6": [
+      "Newer versions has problems with resetting forms.",
+      "Update when the following issue is resolved:",
+      "https://github.com/final-form/final-form/issues/317"
+    ],
+    "react-final-form@6.3.0": [
+      "Newer versions has problems with radio and checkbox fields.",
+      "Update when the following issue is resolved:",
+      "https://github.com/final-form/react-final-form/issues/683"
+    ],
+    "graphql-playground-html@1.6.13": [
+      "A template was broken in a release.",
+      "Update when the following issue is resolved:",
+      "https://github.com/prisma-labs/graphql-playground/pull/1238"
+    ]
+  },
   "husky": {
     "hooks": {
       "pre-commit": "FAST_LINT=true lint-staged"
@@ -403,20 +431,33 @@
     "{src/core/client/stream/events.ts,scripts/generateEventDocs.ts,CLIENT_EVENTS.md}": [
       "npm run docs:events -- --verify"
     ],
-    "{README,CLIENT_EVENTS,CONTRIBUTING,WEBHOOKS}.md": [
-      "npm run doctoc",
-      "git add"
+    "{src/core/client/ui/theme/sharedVariables.ts,src/core/client/ui/theme/streamVariables.ts,scripts/generateCSSVariablesDocs.ts,CSS_VARIABLES.md}": [
+      "npm run docs:css-variables -- --verify"
+    ],
+    "{CLIENT_EVENTS,CONTRIBUTING,WEBHOOKS,EXTERNAL_MODERATION_PHASES}.md": [
+      "npm run doctoc"
     ]
   },
   "bundlesize": [
     {
       "path": "./dist/static/assets/js/embed.js",
       "maxSize": "15 kB"
+    },
+    {
+      "path": "./dist/static/assets/js/count.js",
+      "maxSize": "2 kB"
     }
   ],
   "graphql-schema-linter": {
     "rules": [
       "types-are-capitalized"
     ]
-  }
+  },
+  "browsers": [
+    ">1%",
+    "last 4 versions",
+    "Firefox ESR",
+    "IE 11",
+    "not dead"
+  ]
 }

scripts/WebpackDevServerUtils.js

@@ -27,14 +27,14 @@ const forkTsCheckerWebpackPlugin = require("react-dev-utils/ForkTsCheckerWebpack
 const isInteractive = false;
 
 function prepareUrls(protocol, host, port) {
-  const formatUrl = hostname =>
+  const formatUrl = (hostname) =>
     url.format({
       protocol,
       hostname,
       port,
       pathname: "/",
     });
-  const prettyPrintUrl = hostname =>
+  const prettyPrintUrl = (hostname) =>
     url.format({
       protocol,
       hostname,
@@ -144,12 +144,12 @@ function createCompiler({
   const tsMessagesPromises = [];
 
   if (useTypeScript) {
-    compiler.compilers.forEach(singleCompiler => {
+    compiler.compilers.forEach((singleCompiler) => {
       let tsMessagesPromise;
       let tsMessagesResolver;
       singleCompiler.hooks.beforeCompile.tap("beforeCompile", () => {
-        tsMessagesPromise = new Promise(resolve => {
-          tsMessagesResolver = msgs => resolve(msgs);
+        tsMessagesPromise = new Promise((resolve) => {
+          tsMessagesResolver = (msgs) => resolve(msgs);
         });
         tsMessagesPromises.push(tsMessagesPromise);
       });
@@ -170,13 +170,15 @@ function createCompiler({
         (diagnostics, lints) => {
           console.log("RECEIVED");
           const allMsgs = [...diagnostics, ...lints];
-          const format = message =>
+          const format = (message) =>
             `${message.file}\n${typescriptFormatter(message, true)}`;
 
           tsMessagesResolver({
-            errors: allMsgs.filter(msg => msg.severity === "error").map(format),
+            errors: allMsgs
+              .filter((msg) => msg.severity === "error")
+              .map(format),
             warnings: allMsgs
-              .filter(msg => msg.severity === "warning")
+              .filter((msg) => msg.severity === "warning")
               .map(format),
           });
         }
@@ -186,7 +188,7 @@ function createCompiler({
 
   // "done" event fires when Webpack has finished recompiling the bundle.
   // Whether or not you have warnings or errors, you will get this event.
-  compiler.hooks.done.tap("done", async stats => {
+  compiler.hooks.done.tap("done", async (stats) => {
     if (isInteractive) {
       clearConsole();
     }
@@ -203,7 +205,7 @@ function createCompiler({
       ...config.stats,
     };
     if (Array.isArray(config)) {
-      statOptions.children = config.map(c => c.stats || {});
+      statOptions.children = config.map((c) => c.stats || {});
     }
     const statsData = stats.toJson(statOptions);
 
@@ -220,7 +222,7 @@ function createCompiler({
       const results = await Promise.all(tsMessagesPromises);
       clearTimeout(delayedMsg);
 
-      results.forEach(msgs => {
+      results.forEach((msgs) => {
         statsData.errors.push(...msgs.errors);
         statsData.warnings.push(...msgs.warnings);
 

scripts/build.ts

@@ -31,7 +31,7 @@ const isProduction = process.env.NODE_ENV === "production";
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
-process.on("unhandledRejection", err => {
+process.on("unhandledRejection", (err) => {
   throw err;
 });
 
@@ -117,7 +117,9 @@ function build(previousFileSizes: any) {
         return reject(err);
       }
       const messages = formatWebpackMessages(
-        stats.toJson({ children: webpackConfig.map(c => c.stats || {}) as any })
+        stats.toJson({
+          children: webpackConfig.map((c) => c.stats || {}) as any,
+        })
       );
       if (messages.errors.length) {
         // Only keep the first error. Others are often indicative

scripts/generateCSSVariablesDocs.ts

@@ -0,0 +1,306 @@
+import { stripIndent } from "common-tags";
+import fs from "fs";
+import { kebabCase, trim } from "lodash";
+import path from "path";
+import ts from "typescript";
+
+import colors from "../src/core/client/ui/theme/colors";
+
+/** We collect inforamtion from the AST and put it into DocEntry */
+interface DocEntry {
+  /** Name of property */
+  key: string;
+  /** Documentation if available */
+  docs?: string;
+  /** Value if it is a leaf */
+  value?: string;
+  /** Children if it is a node */
+  children?: DocEntry[];
+}
+
+/**
+ * We use this regexp to find a previous block that we
+ * are going to update in the readme file.
+ */
+const BLOCK_REGEXP = /<!-- START docs:css-variables -->(.|\n)*<!-- END docs:css-variables -->/gm;
+
+/** Sort doc entries will sort childrenless entries first */
+function sortDocEntries(data: DocEntry[]) {
+  data.forEach((d) => {
+    if (d.children) {
+      d.children = sortDocEntries(d.children);
+    }
+  });
+  return data.sort((a, b) => {
+    if (a.children && !b.children) {
+      return 1;
+    }
+    if (b.children && !a.children) {
+      return -1;
+    }
+    return 0;
+  });
+}
+
+/** Generate documentation for all classes in a set of .ts files */
+function gatherEntries(
+  fileName: string,
+  options: ts.CompilerOptions
+): DocEntry[] {
+  // Build a program using the set of root file names in fileNames
+  const program = ts.createProgram([fileName], options);
+
+  // Get the checker, we will use it to find more about classes
+  const checker = program.getTypeChecker();
+
+  const data: DocEntry[] = [];
+  const currentSourceFile = program.getSourceFile(fileName)!;
+
+  ts.forEachChild(currentSourceFile, visit);
+
+  return sortDocEntries(data);
+
+  /** visit nodes finding css variables */
+  function visit(node: ts.Node) {
+    if (ts.isVariableStatement(node)) {
+      // TODO (cvle) - Currently the variable name is hardcoded. We might want to change that.
+      if (!node.getFullText().includes("streamVariables")) {
+        return;
+      }
+      const firstChild = node.declarationList.declarations[0];
+      if (ts.isVariableDeclaration(firstChild)) {
+        const symbol = checker.getSymbolAtLocation(firstChild.name);
+        if (symbol) {
+          const type = checker.getTypeOfSymbolAtLocation(
+            symbol,
+            symbol.valueDeclaration
+          );
+          type.getProperties().forEach((property) => {
+            serializePropertySymbol(property);
+          });
+        }
+      }
+    }
+  }
+
+  /** This will evaluate `symbol` and addthe doc entries */
+  function serializePropertySymbol(symbol: ts.Symbol, parent?: DocEntry) {
+    const entry: DocEntry = { key: symbol.name };
+    const pt = checker.getTypeOfSymbolAtLocation(
+      symbol,
+      symbol.valueDeclaration
+    );
+    if (pt.symbol?.name === "__object") {
+      pt.getProperties().forEach((p2) => {
+        serializePropertySymbol(p2, entry);
+      });
+    } else {
+      entry.value = symbol.valueDeclaration
+        // Last child contains value.
+        .getChildAt(symbol.valueDeclaration.getChildCount() - 1)!
+        .getFullText();
+    }
+    entry.docs = ts.displayPartsToString(
+      symbol.getDocumentationComment(checker)
+    );
+    if (parent) {
+      if (parent.children) {
+        parent.children.push(entry);
+      } else {
+        parent.children = [entry];
+      }
+    } else {
+      data.push(entry);
+    }
+  }
+}
+
+/**
+ * Finds any references to `object` by `variableName` and replaces the text
+ * with the actual value.
+ *
+ * E.g. `replaceObjectVariablesInText("colors.teal100", colors, "colors") === "#E2FAF7"`;
+ */
+function replaceObjectVariablesInText(
+  text: string,
+  object: any,
+  variableName: string
+) {
+  let result = text;
+  Object.keys(object).forEach((c: string) => {
+    if (typeof object[c] === "object") {
+      result = replaceObjectVariablesInText(
+        result,
+        object[c],
+        `${variableName}.${c}`
+      );
+    } else {
+      result = result.replace(`${variableName}.${c}`, object[c]);
+    }
+  });
+  return result;
+}
+
+/**
+ * transforms value to be used in the documentation.
+ */
+function transformValue(value: string) {
+  let compat = "";
+  value = trim(value);
+  // Detect compat value.
+  if (value.startsWith("compat")) {
+    const result = /compat\((.*), *"(.*)"\)/.exec(value);
+    if (!result) {
+      throw new Error("Unrecognized compat format");
+    }
+    value = result[1];
+    compat = result[2];
+  }
+  // If it's a raw string, evaluate it to get rid of the initial quotes.
+  if (value[0] === '"' || value[0] === "'") {
+    // eslint-disable-next-line no-eval
+    value = eval(value);
+  }
+  // Replace all references to colors.
+  value = replaceObjectVariablesInText(value, colors, "colors");
+  if (compat) {
+    // add compat information.
+    return `${value};  /* Before 6.3.0: --${compat} */`;
+  }
+  return `${value};`;
+}
+
+function prefixLines(text: string, prefix: string) {
+  return text.split("\n").join(`\n${prefix}`);
+}
+
+function entries2Summary(
+  entries: DocEntry[],
+  keyprefix = "",
+  nestprefix = ""
+): string {
+  let doc = "";
+  entries.forEach((entry) => {
+    if (!entry.children) {
+      return;
+    }
+    const header = kebabCase(keyprefix + entry.key);
+    doc += `${nestprefix}- <a href="#${header}">${header}</a>\n`;
+    if (entry.children) {
+      doc += entries2Summary(
+        entry.children,
+        keyprefix + entry.key + "-",
+        nestprefix + "  "
+      );
+    }
+  });
+  return doc;
+}
+
+function entries2Doc(entries: DocEntry[], header = "###", prefix = ""): string {
+  let doc = "";
+  entries.forEach((entry) => {
+    if (entry.children) {
+      doc += `\n${header} ${kebabCase(prefix + entry.key)}\n`;
+      if (entry.docs) {
+        doc += `\n${entry.docs}\n`;
+      }
+      doc += entries2Doc(
+        entry.children,
+        header + "#",
+        `${prefix}${entry.key}-`
+      );
+    } else {
+      if (entry.docs) {
+        doc += `\n${entry.docs}\n`;
+      }
+      doc += `\n\`--${kebabCase(prefix + entry.key)}: ${transformValue(
+        entry.value!
+      )}\`\n`;
+    }
+  });
+  return doc;
+}
+
+/**
+ * Append or update previous documention in markdownFile.
+ *
+ * @param markdownFile The markdown file we want to inject the docs too.
+ * @param entries data as returned by gatherEntries.
+ */
+function emitDocs(markdownFile: string, entries: DocEntry[], verify = false) {
+  const previousContent = fs.existsSync(markdownFile)
+    ? fs.readFileSync(markdownFile).toString()
+    : "";
+
+  const summary = entries2Summary(entries, "", "  ");
+  const list = entries2Doc(entries);
+
+  const output = stripIndent`
+    <!-- START docs:css-variables -->
+    <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN npm run docs:css-variables -->
+    ### Index
+    - <a href="#variables">Variables</a>
+    ${prefixLines(summary, "    ")}
+
+    ### Variables
+    ${prefixLines(list, "    ")}
+    <!-- END docs:css-variables -->
+  `;
+
+  let newContent;
+  // Find previous block.
+  if (BLOCK_REGEXP.test(previousContent)) {
+    newContent = previousContent.replace(BLOCK_REGEXP, output);
+  } else {
+    newContent = previousContent + "\n" + output;
+  }
+  if (previousContent === newContent) {
+    // eslint-disable-next-line no-console
+    console.log(`${markdownFile} is up to date`);
+    return;
+  }
+  if (verify) {
+    // eslint-disable-next-line no-console
+    console.error(
+      `${markdownFile} is outdated, please run \`npm run docs:css-variables\``
+    );
+    process.exit(1);
+  }
+
+  fs.writeFileSync(markdownFile, newContent);
+  // eslint-disable-next-line no-console
+  console.log(`Successfully injected documentation into ${markdownFile}`);
+}
+
+function main() {
+  if (process.argv.length < 4) {
+    throw new Error("Must provide path to css variables and a markdown file.");
+  }
+
+  const variableFile = process.argv[2];
+  const markdownFile = process.argv[3];
+
+  // Find tsconfig file.
+  const configFile = ts.findConfigFile(variableFile, fs.existsSync);
+  if (!configFile) {
+    throw new Error("tsconfig file not found");
+  }
+  const configText = fs.readFileSync(configFile).toString();
+  const result = ts.parseConfigFileTextToJson(configFile, configText);
+  if (result.error) {
+    throw result.error;
+  }
+
+  // Parse the JSON raw data into actual consumable compiler options.
+  const config = ts.parseJsonConfigFileContent(
+    result.config,
+    ts.sys,
+    path.dirname(configFile)
+  );
+
+  const entries = gatherEntries(variableFile, config.options);
+  emitDocs(markdownFile, entries, process.argv[4] === "--verify");
+}
+
+main();

scripts/generateEventDocs.ts

@@ -104,7 +104,7 @@ function gatherEntries(
       docs: ts.displayPartsToString(symbol.getDocumentationComment(checker)),
       type: type.getSymbol()!.getName() as DocEntry["type"],
     };
-    typeNode.forEachChild(ch => {
+    typeNode.forEachChild((ch) => {
       if (ts.isTypeLiteralNode(ch)) {
         const text = printer.printNode(
           ts.EmitHint.Unspecified,
@@ -179,13 +179,13 @@ function emitDocs(markdownFile: string, entries: DocEntry[], verify = false) {
   const summary = stripIndent`
     - ${entries
       .map(
-        e => `<a href="#${getEventName(e.name)}">${getEventName(e.name)}</a>`
+        (e) => `<a href="#${getEventName(e.name)}">${getEventName(e.name)}</a>`
       )
       .join("\n    - ")}
   `;
   const list = entries
     .map(
-      e =>
+      (e) =>
         codeBlock`
         - ${
           e.type === "ViewerEvent"

scripts/generateSchemaTypes.js

@@ -47,7 +47,7 @@ async function main() {
     }
 
     // Create the types for this file.
-    const types = await generateTSTypesAsString(schema, {
+    const types = await generateTSTypesAsString(schema, file.fileName, {
       tabSpaces: 2,
       typePrefix: "GQL",
       strictNulls: false,
@@ -66,13 +66,13 @@ if (require.main === module) {
   // Only run the main module on file load if this is the main module (we're
   // executing this file directly).
   main()
-    .then(files => {
+    .then((files) => {
       for (const { fileName } of files) {
         // eslint-disable-next-line no-console
         console.log(`Generated ${fileName}`);
       }
     })
-    .catch(err => {
+    .catch((err) => {
       // eslint-disable-next-line no-console
       console.error(err);
     });

scripts/i18n/validate.ts

@@ -0,0 +1,153 @@
+#!/usr/bin/env ./node_modules/.bin/tsnd
+
+//
+// Based on the script written by @cristiandean
+//
+// Source: https://gist.github.com/cristiandean/8196bc2b965f9acf9ad8f9e4530011c1
+//
+
+import { FluentResource } from "@fluent/bundle";
+import fs from "fs";
+import path from "path";
+
+const PROJECT_ROOT = path.resolve(__dirname, "..", "..");
+
+const LOCALE_DIRECTORIES = [
+  path.join(PROJECT_ROOT, "src/locales"),
+  path.join(PROJECT_ROOT, "src/core/server/locales"),
+];
+
+const wrap = (color: string) => (msg: string) => {
+  if (!msg) {
+    return;
+  }
+
+  // eslint-disable-next-line no-console
+  console.log(`${color}%s\x1b[0m`, msg);
+};
+
+const log = {
+  red: wrap("\x1b[31m"),
+  green: wrap("\x1b[32m"),
+  plain: wrap("\x1b[0m"),
+};
+
+interface LocaleFileListing {
+  locale: string;
+  files: LocaleFile[];
+}
+
+interface LocaleFile {
+  fileName: string;
+  directory: string;
+  filePath: string;
+  keys: Set<string>;
+}
+
+function loadLocale(locale: string) {
+  const listing: LocaleFileListing = { locale, files: [] };
+
+  for (const directory of LOCALE_DIRECTORIES) {
+    // Resolve the directory with the language code, this should be a folder
+    // containing language files for the specified context.
+    const localeDirectory = path.join(directory, locale);
+    if (!fs.existsSync(localeDirectory)) {
+      continue;
+    }
+
+    // The folder exists, list all files in this directory and begin loading
+    // them.
+    const localeFiles = fs.readdirSync(localeDirectory);
+    for (const fileName of localeFiles) {
+      const filePath = path.join(localeDirectory, fileName);
+
+      // Load the file.
+      const source = fs.readFileSync(filePath, "utf-8").toString();
+
+      // Create the resource based on the file.
+      const resource = new FluentResource(source);
+
+      // Iterate over the ids to create the set of ID's.
+      const keys = new Set<string>();
+
+      for (const entry of resource.body) {
+        if (entry.id.startsWith("-")) {
+          // Identifiers starting with a `-` define terms, these are not used
+          // for this as we're only comparing messages.
+          continue;
+        }
+
+        keys.add(entry.id);
+      }
+
+      // Add the new file.
+      listing.files.push({ fileName, directory, filePath, keys });
+    }
+  }
+
+  return listing;
+}
+
+function diffSet(a: Set<string>, b: Set<string>): Set<string> {
+  const n = new Set(a);
+  for (const e of b) {
+    n.delete(e);
+  }
+  return n;
+}
+
+function prefixDiffSet(prefix: string, a: Set<string>, b: Set<string>) {
+  return [...diffSet(a, b).values()]
+    .map((value) => `${prefix}${value}`)
+    .join("\n");
+}
+
+function diff(from: LocaleFileListing, to: LocaleFileListing) {
+  for (const f of from.files) {
+    // Log the header information for this file.
+    log.plain(`* From: ${f.filePath}`);
+
+    // Find the associated "to" file.
+    const t = to.files.find(
+      (file) => file.fileName === f.fileName && file.directory === f.directory
+    );
+    if (!t) {
+      log.red(
+        `* To:   ${path.join(f.directory, to.locale, f.fileName)} (missing)`
+      );
+      log.plain("-".repeat(60));
+      continue;
+    }
+
+    log.plain(`* To:   ${t.filePath}`);
+
+    log.green(prefixDiffSet("  + ", f.keys, t.keys));
+    log.red(prefixDiffSet("  - ", t.keys, f.keys));
+
+    log.plain("-".repeat(60));
+  }
+}
+
+function main() {
+  try {
+    if (process.argv.length < 3) {
+      throw new Error("usage: ./scripts/i18n/missingTranslations.ts <locale>");
+    }
+
+    // Load the target translation.
+    const to = loadLocale(process.argv[2]);
+
+    // Load the base language (US English).
+    const from = loadLocale("en-US");
+
+    // Report the difference in key existence.
+    diff(from, to);
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.error(err);
+
+    process.exit(1);
+  }
+}
+
+main();

scripts/start.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env ts-node
+
 import dotenv from "dotenv";
 
 // Apply all the configuration provided in the .env file if it isn't already in
@@ -26,7 +27,7 @@ process.env.NODE_ENV = "development";
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
-process.on("unhandledRejection", err => {
+process.on("unhandledRejection", (err) => {
   throw err;
 });
 

scripts/test.js

@@ -17,7 +17,7 @@ process.env.NODE_ENV = "test";
 // Makes the script crash on unhandled rejections instead of silently
 // ignoring them. In the future, promise rejections that are not handled will
 // terminate the Node.js process with a non-zero exit code.
-process.on("unhandledRejection", err => {
+process.on("unhandledRejection", (err) => {
   throw err;
 });
 

scripts/watcher/ChokidarWatcher.ts

@@ -1,5 +1,6 @@
 import chokidar from "chokidar";
 import path from "path";
+
 import { Watcher, WatchOptions } from "./types";
 
 function prependRootDir(

scripts/watcher/CommandExecutor.ts

@@ -76,7 +76,7 @@ export default class CommandExecutor implements Executor {
     });
   }
 
-  public execute(filePath: string) {
+  public execute(filePath: string): void {
     this.spawnProcessPotentiallyDebounced();
   }
 }

scripts/watcher/LongRunningExecutor.ts

@@ -99,14 +99,14 @@ export default class LongRunningExecutor implements Executor {
   }
 
   // This is called before exiting.
-  public async onCleanup() {
+  public async onCleanup(): Promise<void> {
     this.restartDebounced.cancel();
     if (this.isRunning) {
       await this.kill();
     }
   }
 
-  public execute(filePath: string) {
+  public execute(filePath: string): void {
     if (this.isRunning) {
       this.restartDebounced();
       return;

scripts/watcher/bin/watcher.ts

@@ -30,7 +30,7 @@ const cmd = program
   .description("Run watchers defined in <configFile>")
   .parse(process.argv);
 
-run(cmd.args, cmd.opts()).catch(err => {
+run(cmd.args, cmd.opts()).catch((err) => {
   // eslint-disable-next-line no-console
   console.error(err);
   process.exit(1);

scripts/watcher/types.ts

@@ -1,4 +1,4 @@
-import Joi from "joi";
+import Joi from "@hapi/joi";
 
 export interface WatchOptions {
   ignore?: ReadonlyArray<string>;
@@ -44,23 +44,13 @@ export const configSchema = Joi.object({
   watchers: Joi.object().pattern(
     /.*/,
     Joi.object({
-      paths: Joi.array()
-        .items(Joi.string())
-        .unique(),
-      ignore: Joi.array()
-        .items(Joi.string())
-        .unique()
-        .optional(),
+      paths: Joi.array().items(Joi.string()).unique(),
+      ignore: Joi.array().items(Joi.string()).unique().optional(),
       executor: Joi.object(),
     })
   ),
   defaultSet: Joi.string().optional(),
   sets: Joi.object()
-    .pattern(
-      /.*/,
-      Joi.array()
-        .items(Joi.string())
-        .unique()
-    )
+    .pattern(/.*/, Joi.array().items(Joi.string()).unique())
     .optional(),
 }).with("defaultSet", "sets");

scripts/watcher/watch.ts

@@ -1,5 +1,5 @@
+import Joi from "@hapi/joi";
 import chalk from "chalk";
-import Joi from "joi";
 import { pickBy } from "lodash";
 
 import SaneWatcher from "./SaneWatcher";
@@ -28,7 +28,7 @@ async function beginWatch(
 }
 
 function setupCleanup(watcher: Watcher, config: Config) {
-  ["SIGINT", "SIGTERM"].forEach(signal =>
+  ["SIGINT", "SIGTERM"].forEach((signal) =>
     process.once(signal as any, async () => {
       const cleanups = [];
       if (watcher.onCleanup) {
@@ -50,7 +50,7 @@ function resolveSets(
   value: ReadonlyArray<string>
 ) {
   const resolved: string[] = [];
-  value.forEach(v => {
+  value.forEach((v) => {
     if (v in sets) {
       resolved.push(...sets[v]);
       return;
@@ -66,12 +66,12 @@ function filterOnly(
   sets?: Record<string, ReadonlyArray<string>>
 ): Config["watchers"] {
   const resolved = sets ? resolveSets(sets, only) : only;
-  const unknown = resolved.filter(r => !(r in watchers));
+  const unknown = resolved.filter((r) => !(r in watchers));
   if (unknown.length) {
     throw new Error(`Watcher Configuration or Set for ${unknown} not found`);
   }
   return pickBy(watchers, (value, key) => {
-    if (resolved.indexOf(key) === -1) {
+    if (!resolved.includes(key)) {
       // eslint-disable-next-line no-console
       console.log(chalk.grey(`Disabled watcher "${key}"`));
       return false;
@@ -80,7 +80,10 @@ function filterOnly(
   }) as Config["watchers"];
 }
 
-export default async function watch(config: Config, options: Options = {}) {
+export default async function watch(
+  config: Config,
+  options: Options = {}
+): Promise<void> {
   Joi.assert(config, configSchema);
   const watcher: Watcher = config.backend || new SaneWatcher();
   const rootDir = config.rootDir || process.cwd();
@@ -101,7 +104,7 @@ export default async function watch(config: Config, options: Options = {}) {
     // eslint-disable-next-line no-console
     console.log(chalk.cyanBright(`Start watcher "${key}"`));
     const watcherConfig = watchersConfigs[key];
-    beginWatch(watcher, key, watcherConfig, rootDir).catch(err => {
+    beginWatch(watcher, key, watcherConfig, rootDir).catch((err) => {
       // eslint-disable-next-line no-console
       console.error(err);
       process.exit(1);

src/core/build/config.ts

@@ -1,4 +1,5 @@
 import convict from "convict";
+import os from "os";
 
 import { LOCALES } from "../common/helpers/i18n/locales";
 
@@ -67,7 +68,7 @@ const config = convict({
   maxCores: {
     doc: "Set maximum of available cores",
     format: "nat",
-    default: require("os").cpus().length,
+    default: os.cpus().length,
     env: "WEBPACK_MAX_CORES",
     arg: "maxCores",
   },
@@ -77,6 +78,7 @@ export type Config = typeof config;
 
 export const createClientEnv = (c: Config) => ({
   NODE_ENV: c.get("env"),
+  WEBPACK: "true",
 });
 
 // Setup the base configuration.

src/core/build/createWebpackConfig.ts

@@ -7,7 +7,6 @@ import HtmlWebpackPlugin from "html-webpack-plugin";
 import { identity } from "lodash";
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import path from "path";
-import typescriptFormatter from "react-dev-utils/typescriptFormatter";
 import WatchMissingNodeModulesPlugin from "react-dev-utils/WatchMissingNodeModulesPlugin";
 import TerserPlugin from "terser-webpack-plugin";
 import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
@@ -82,10 +81,6 @@ export default function createWebpackConfig(
 
   const styleLoader = {
     loader: require.resolve("style-loader"),
-    options: {
-      sourceMap: !disableSourcemaps,
-      hmr: watch,
-    },
   };
 
   const localesOptions = {
@@ -114,10 +109,10 @@ export default function createWebpackConfig(
     ...ifBuild(
       new MiniCssExtractPlugin({
         filename: isProduction
-          ? "assets/css/[name].[hash].css"
+          ? "assets/css/[name].[contenthash].css"
           : "assets/css/[name].css",
         chunkFilename: isProduction
-          ? "assets/css/[id].[hash].css"
+          ? "assets/css/[id].[contenthash].css"
           : "assets/css/[id].css",
       }),
       isProduction &&
@@ -222,10 +217,10 @@ export default function createWebpackConfig(
       // Generated JS file names (with nested folders).
       // There will be one main bundle, and one file per asynchronous chunk.
       filename: isProduction
-        ? "assets/js/[name].[chunkhash].js"
+        ? "assets/js/[name].[contenthash].js"
         : "assets/js/[name].js",
       chunkFilename: isProduction
-        ? "assets/js/[name].[chunkhash].chunk.js"
+        ? "assets/js/[name].[contenthash].chunk.js"
         : "assets/js/[name].chunk.js",
       // We inferred the "public path" (such as / or /my-project) from homepage.
       publicPath,
@@ -356,7 +351,7 @@ export default function createWebpackConfig(
               options: {
                 limit: 10000,
                 name: isProduction
-                  ? "assets/media/[name].[hash].[ext]"
+                  ? "assets/media/[name].[contenthash].[ext]"
                   : "assets/media/[name].[ext]",
               },
             },
@@ -367,9 +362,10 @@ export default function createWebpackConfig(
                 {
                   loader: require.resolve("css-loader"),
                   options: {
-                    modules: true,
+                    modules: {
+                      localIdentName: "[name]-[local]-[contenthash]",
+                    },
                     importLoaders: 2,
-                    localIdentName: "[name]-[local]-[contenthash]",
                     sourceMap: !disableSourcemaps,
                   },
                 },
@@ -471,9 +467,10 @@ export default function createWebpackConfig(
                 {
                   loader: require.resolve("css-loader"),
                   options: {
-                    modules: true,
+                    modules: {
+                      localIdentName: "[name]-[local]-[contenthash]",
+                    },
                     importLoaders: 1,
-                    localIdentName: "[name]-[local]-[hash:base64:5]",
                     sourceMap: !disableSourcemaps,
                   },
                 },
@@ -502,7 +499,7 @@ export default function createWebpackConfig(
               loader: require.resolve("file-loader"),
               options: {
                 name: isProduction
-                  ? "assets/media/[name].[hash:8].[ext]"
+                  ? "assets/media/[name].[contenthash].[ext]"
                   : "assets/media/[name].[ext]",
               },
             },
@@ -525,11 +522,6 @@ export default function createWebpackConfig(
           useTypescriptIncrementalApi: false,
           checkSyntacticErrors: true,
           tsconfig: paths.appTsconfig,
-          watch: paths.appSrc,
-          // TODO: (cvle) ForkTsCheckerWebpackPlugin are currently not working, so we resort to default reporting.
-          silent: false,
-          // The formatter is normally invoked directly in WebpackDevServerUtils during development
-          formatter: typescriptFormatter,
         })
       ),
       // Makes some environment variables available to the JS code, for example:

src/core/build/loaders/locales-loader.js

@@ -40,7 +40,7 @@ function getFiles(target, pathToLocale, context) {
 
   const files = fs.readdirSync(pathToLocale);
 
-  files.forEach(f => {
+  files.forEach((f) => {
     if (commonFiles.includes(f)) {
       common.push(f);
       return;
@@ -62,12 +62,12 @@ function generateTarget(target, context) {
     locales,
     bundled,
   } = context;
-  const getLocalePath = locale => path.join(pathToLocales, locale);
-  const getLocaleFiles = memoize(locale =>
+  const getLocalePath = (locale) => path.join(pathToLocales, locale);
+  const getLocaleFiles = memoize((locale) =>
     getFiles(target, getLocalePath(locale), context)
   );
 
-  const loadables = locales.filter(locale => !bundled.includes(locale));
+  const loadables = locales.filter((locale) => !bundled.includes(locale));
 
   return `
     var ret = {
@@ -81,22 +81,22 @@ function generateTarget(target, context) {
   // Bundled locales are directly available in the main bundle.
   ${bundled
     .map(
-      locale => `
+      (locale) => `
     {
       var suffixes = ${JSON.stringify(getLocaleFiles(locale).suffixes)};
       var contents = [];
     ${getLocaleFiles(locale)
       .common.map(
-        file => `
+        (file) => `
       contents.push(require(${JSON.stringify(
         path.join(getLocalePath(locale), file).replace(/\\/g, "/")
-      )}));
+      )}).default);
     `
       )
       .join("\n")}
       contents = contents.concat(suffixes.map(function(suffix) { return require("${path
         .join(getLocalePath(locale), target)
-        .replace(/\\/g, "/")}" + suffix); }));
+        .replace(/\\/g, "/")}" + suffix).default; }));
       ret.bundled[${JSON.stringify(locale)}] = contents.join("\\n");
     }
   `
@@ -106,13 +106,13 @@ function generateTarget(target, context) {
   // Loadables are in a separate bundle, that can be easily loaded.
   ${loadables
     .map(
-      locale => `
+      (locale) => `
     ret.loadables[${JSON.stringify(locale)}] = function() {
       var suffixes = ${JSON.stringify(getLocaleFiles(locale).suffixes)};
       var promises = [];
     ${getLocaleFiles(locale)
       .common.map(
-        file => `
+        (file) => `
       promises.push(
         import(
           /* webpackChunkName: ${JSON.stringify(
@@ -147,7 +147,7 @@ function generateTarget(target, context) {
   `;
 }
 
-module.exports = function(source) {
+module.exports = function (source) {
   const options = Object.assign(
     {},
     DEFAULT_QUERY_VALUES,
@@ -165,7 +165,7 @@ module.exports = function(source) {
 
   let locales = fs.readdirSync(pathToLocales);
   if (availableLocales) {
-    availableLocales.forEach(locale => {
+    availableLocales.forEach((locale) => {
       if (!locales.includes(locale)) {
         throw new Error(`locale ${fallbackLocale} not available`);
       }

src/core/build/paths.ts

@@ -20,7 +20,9 @@ export default {
   appPublicPath: resolveSrc("core/build/publicPath.js"),
   appLocales: resolveSrc("locales"),
   appThemeVariables: resolveSrc("core/client/ui/theme/variables.ts"),
-  appThemeVariablesCSS: resolveSrc("core/client/ui/theme/variables.css"),
+  appSassLikeVariables: resolveSrc("core/client/ui/theme/sassLikeVariables.ts"),
+  appThemeStreamCSS: resolveSrc("core/client/ui/theme/stream.css"),
+  appThemeAdminCSS: resolveSrc("core/client/ui/theme/admin.css"),
   appThemeMixinsCSS: resolveSrc("core/client/ui/theme/mixins.css"),
 
   appStreamHTML: resolveSrc("core/client/stream/index.html"),

src/core/build/postcss.config.js

@@ -3,7 +3,6 @@ require("ts-node/register");
 const kebabCase = require("lodash/kebabCase");
 const mapKeys = require("lodash/mapKeys");
 const mapValues = require("lodash/mapValues");
-const pickBy = require("lodash/pickBy");
 const flat = require("flat");
 const paths = require("./paths").default;
 const autoprefixer = require("autoprefixer");
@@ -17,23 +16,28 @@ const postcssMixins = require("postcss-mixins");
 const postcssPrependImports = require("postcss-prepend-imports");
 const postcssAdvancedVariables = require("postcss-advanced-variables");
 
-delete require.cache[paths.appThemeVariables];
-const variables = require(paths.appThemeVariables).default;
-const flatKebabVariables = mapKeys(
-  mapValues(flat(variables, { delimiter: "-" }), v => v.toString()),
+delete require.cache[paths.appSassLikeVariables];
+const sassLikeVariables = require(paths.appSassLikeVariables).default;
+
+const kebabs = mapKeys(
+  mapValues(flat(sassLikeVariables, { delimiter: "-" }), (v) => v.toString()),
   (_, k) => kebabCase(k)
 );
 
-// These are sass style variables used in media queries.
-const mediaQueryVariables = mapValues(
-  pickBy(flatKebabVariables, (v, k) => k.startsWith("breakpoints-")),
+// Generate sass-style variables to inject into css
+const postCssVariables = mapValues(kebabs, (value, key) => {
   // Add unit to breakpoints.
   // Add 1 to support mobile first approach where we start
   // with the smallest screen and gradually add styling for the
   // next bigger screen. This is realized using `min-width` without
   // ever using `max-width`.
-  v => `${Number.parseInt(v, 10) + 1}px`
-);
+  if (key.toString().startsWith("breakpoints-")) {
+    return `${Number.parseInt(value, 10) + 1}px`;
+  }
+
+  // Default return the raw value
+  return value;
+});
 
 module.exports = {
   // Necessary for external CSS imports to work
@@ -52,7 +56,7 @@ module.exports = {
     // Support nesting.
     postcssNested(),
     // Sass style variables to be used in media queries.
-    postcssAdvancedVariables({ variables: mediaQueryVariables }),
+    postcssAdvancedVariables({ variables: postCssVariables }),
     // Reduce some calc()
     postcssCalcFunction(),
     // Provides a modern CSS environment.
@@ -63,12 +67,6 @@ module.exports = {
     postcssFlexbugsFixes,
     // Vendor prefixing.
     autoprefixer({
-      browsers: [
-        ">1%",
-        "last 4 versions",
-        "Firefox ESR",
-        "not ie < 9", // React doesn't support IE8 anyway
-      ],
       flexbox: "no-2009",
     }),
   ],

src/core/client/account/App/MainLayout.css

@@ -1,10 +1,10 @@
 .bar {
   height: calc(6 * var(--mini-unit));
-  background-color: var(--palette-text-primary);
+  background-color: var(--palette-text-500);
 }
 
 .centered {
   margin: 10% auto;
   padding: 0 calc(0.5 * var(--mini-unit));
   box-sizing: border-box;
-}
+}

src/core/client/account/components/Loading.tsx

@@ -1,6 +1,6 @@
 import React, { FunctionComponent } from "react";
 
-import { Delay, Flex, Spinner } from "coral-ui/components";
+import { Delay, Flex, Spinner } from "coral-ui/components/v2";
 
 const Loading: FunctionComponent = () => (
   <Flex justifyContent="center">

src/core/client/account/index.tsx

@@ -10,7 +10,7 @@ import { initLocalState } from "./local";
 import localesData from "./locales";
 
 // Import css variables.
-import "coral-ui/theme/variables.css";
+import "coral-ui/theme/stream.css";
 
 async function main() {
   await injectConditionalPolyfills();
@@ -30,4 +30,4 @@ async function main() {
   ReactDOM.render(<Index />, document.getElementById("app"));
 }
 
-main();
+void main();

src/core/client/account/local/initLocalState.ts

@@ -1,5 +1,6 @@
 import { Environment } from "relay-runtime";
 
+import { AuthState } from "coral-framework/lib/auth";
 import { CoralContext } from "coral-framework/lib/bootstrap";
 import { initLocalBaseState } from "coral-framework/lib/relay";
 
@@ -8,7 +9,8 @@ import { initLocalBaseState } from "coral-framework/lib/relay";
  */
 export default async function initLocalState(
   environment: Environment,
-  context: CoralContext
+  context: CoralContext,
+  auth?: AuthState
 ) {
-  await initLocalBaseState(environment, context);
+  initLocalBaseState(environment, context, auth);
 }

src/core/client/account/routes/NotFound.css

@@ -0,0 +1,11 @@
+.content {
+  font-family: var(--font-family-secondary);
+  font-style: normal;
+  font-weight: var(--font-weight-secondary-bold);
+  font-size: var(--font-size-6);
+  line-height: 1.17;
+
+  color: var(--palette-text-500);
+
+  text-align: center;
+}

src/core/client/account/routes/NotFound.tsx

@@ -1,12 +1,15 @@
+import { Localized } from "@fluent/react/compat";
 import React, { FunctionComponent } from "react";
 
-import { HorizontalGutter, Typography } from "coral-ui/components";
+import { HorizontalGutter } from "coral-ui/components/v2";
+
+import styles from "./NotFound.css";
 
 const NotFound: FunctionComponent = () => (
   <HorizontalGutter container="main">
-    <Typography variant="heading3" container="h1">
-      Not Found
-    </Typography>
+    <Localized id="notFound">
+      <div className={styles.content}>Not Found</div>
+    </Localized>
   </HorizontalGutter>
 );
 

src/core/client/account/routes/download/Download/DownloadDescription.css

@@ -1,12 +1,13 @@
 .title {
-  font-family: var(--font-family-serif);
-  font-weight: 600;
+  font-family: var(--font-family-secondary);
   font-style: normal;
-  font-size: calc(48rem / var(--rem-base));
-  line-height: calc(42em / 48);
-  text-align: center;
+  font-weight: var(--font-weight-secondary-bold);
+  font-size: var(--font-size-6);
+  line-height: 1.17;
 
-  color: var(--palette-common-black);
+  color: var(--palette-text-500);
+
+  padding-left: var(--spacing-2);
 }
 
 .content {
@@ -18,14 +19,15 @@
 }
 
 .sectionText {
-  font-family: var(--font-family-sans-serif);
-  font-weight: normal;
+  font-family: var(--font-family-primary);
   font-style: normal;
-  font-size: calc(24rem / var(--rem-base));
-  line-height: calc(34em / 24);
-  letter-spacing: 0.3px;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-3);
+  line-height: 1.25;
 
-  color: var(--palette-text-primary);
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-3);
 }
 
 .list {
@@ -34,7 +36,7 @@
 }
 
 .list li {
-  margin-bottom: calc(16em / 24);
+  margin-bottom: 0.75rem;
 }
 
 .listContent {
@@ -43,6 +45,6 @@
 
 .bullet {
   display: inline-block;
-  min-width: 24px;
+  min-width: 16px;
   margin-right: var(--spacing-2);
-}
+}

src/core/client/account/routes/download/Download/DownloadDescription.tsx

@@ -2,7 +2,7 @@ import { Localized } from "@fluent/react/compat";
 import cn from "classnames";
 import React, { FunctionComponent } from "react";
 
-import { Flex, HorizontalGutter, Icon, Typography } from "coral-ui/components";
+import { Flex, HorizontalGutter, Icon } from "coral-ui/components/v2";
 
 import styles from "./DownloadDescription.css";
 
@@ -10,84 +10,72 @@ const DownloadDescription: FunctionComponent = () => {
   return (
     <HorizontalGutter size="double">
       <Localized id="download-landingPage-title">
-        <h1 className={styles.title}>Download Your Comment History</h1>
+        <h1 className={styles.title}>Download your comment history</h1>
       </Localized>
       <div className={styles.content}>
         <div className={styles.section}>
           <Localized id="download-landingPage-description">
-            <Typography variant="bodyCopy" className={styles.sectionText}>
+            <div className={styles.sectionText}>
               Your comment history will be downloaded into a .zip file. After
               your comment history is unzipped you will have a comma separated
               value (or .csv) file that you can easily import into your favorite
               spreadsheet application.
-            </Typography>
+            </div>
           </Localized>
         </div>
 
         <div className={styles.section}>
           <Localized id="download-landingPage-contentsDescription">
-            <Typography variant="bodyCopy" className={styles.sectionText}>
+            <div className={styles.sectionText}>
               For each of your comments the following information is included:
-            </Typography>
+            </div>
           </Localized>
           <ul className={styles.list}>
             <li>
-              <Flex alignItems="center">
-                <Icon size="lg" className={styles.bullet}>
+              <Flex alignItems="flex-start">
+                <Icon size="md" className={styles.bullet}>
                   check
                 </Icon>
                 <Localized id="download-landingPage-contentsDate">
-                  <Typography
-                    variant="bodyCopy"
-                    className={cn(styles.sectionText, styles.listContent)}
-                  >
+                  <div className={cn(styles.sectionText, styles.listContent)}>
                     When you wrote the comment
-                  </Typography>
+                  </div>
                 </Localized>
               </Flex>
             </li>
             <li>
-              <Flex alignItems="center">
-                <Icon size="lg" className={styles.bullet}>
+              <Flex alignItems="flex-start">
+                <Icon size="md" className={styles.bullet}>
                   check
                 </Icon>
                 <Localized id="download-landingPage-contentsUrl">
-                  <Typography
-                    variant="bodyCopy"
-                    className={cn(styles.sectionText, styles.listContent)}
-                  >
+                  <div className={cn(styles.sectionText, styles.listContent)}>
                     The permalink URL for the comment
-                  </Typography>
+                  </div>
                 </Localized>
               </Flex>
             </li>
             <li>
-              <Flex alignItems="center">
-                <Icon size="lg" className={styles.bullet}>
+              <Flex alignItems="flex-start">
+                <Icon size="md" className={styles.bullet}>
                   check
                 </Icon>
                 <Localized id="download-landingPage-contentsText">
-                  <Typography
-                    variant="bodyCopy"
-                    className={cn(styles.sectionText, styles.listContent)}
-                  >
+                  <div className={cn(styles.sectionText, styles.listContent)}>
                     The comment text
-                  </Typography>
+                  </div>
                 </Localized>
               </Flex>
             </li>
             <li>
-              <Flex alignItems="center">
-                <Icon size="lg" className={styles.bullet}>
+              <Flex alignItems="flex-start">
+                <Icon size="md" className={styles.bullet}>
                   check
                 </Icon>
                 <Localized id="download-landingPage-contentsStoryUrl">
-                  <Typography
-                    variant="bodyCopy"
-                    className={cn(styles.sectionText, styles.listContent)}
-                  >
+                  <div className={cn(styles.sectionText, styles.listContent)}>
                     The URL on the article or story where the comment appears
-                  </Typography>
+                  </div>
                 </Localized>
               </Flex>
             </li>

src/core/client/account/routes/download/Download/DownloadForm.css

@@ -1,8 +1,3 @@
 .form {
   text-align: center;
 }
-
-.downloadButton {
-  font-size: calc(18rem / var(--rem-base));
-  line-height: calc(23em / 18);
-}

src/core/client/account/routes/download/Download/DownloadForm.tsx

@@ -1,7 +1,8 @@
 import { Localized } from "@fluent/react/compat";
 import React, { FunctionComponent, useCallback, useState } from "react";
 
-import { Button, HorizontalGutter } from "coral-ui/components";
+import { HorizontalGutter } from "coral-ui/components/v2";
+import { Button } from "coral-ui/components/v3";
 
 import styles from "./DownloadForm.css";
 
@@ -25,15 +26,16 @@ const DownloadForm: FunctionComponent<Props> = ({ token }) => {
         onSubmit={onSubmit}
       >
         <input name="token" type="hidden" value={token} />
-        <Localized id="download-landingPage-downloadComments">
+        <Localized id="download-landingPage-download">
           <Button
             type="submit"
             variant="filled"
             color="primary"
+            paddingSize="medium"
             disabled={submitted}
-            className={styles.downloadButton}
+            upperCase
           >
-            Download My Comment History
+            Download
           </Button>
         </Localized>
       </form>

src/core/client/account/routes/download/Download/DownloadRoute.css

@@ -6,11 +6,11 @@
 .root {
   display: inline-block;
 
-  max-width: calc(70 * var(--mini-unit));
+  max-width: calc(70 * var(--spacing-2));
 
   @media (min-width: $breakpoints-xs) {
-    max-width: calc(90 * var(--mini-unit));
+    max-width: calc(60 * var(--spacing-2));
   }
 
   text-align: left;
-}
+}

src/core/client/account/routes/download/Download/DownloadRoute.tsx

@@ -6,7 +6,7 @@ import { useToken } from "coral-framework/hooks";
 import { createFetch } from "coral-framework/lib/relay";
 import { withRouteConfig } from "coral-framework/lib/router";
 import { parseHashQuery } from "coral-framework/utils";
-import { HorizontalGutter } from "coral-ui/components";
+import { HorizontalGutter } from "coral-ui/components/v2";
 
 import DownloadDescription from "./DownloadDescription";
 import DownloadForm from "./DownloadForm";

src/core/client/account/routes/download/Download/Sorry.css

@@ -1,7 +0,0 @@
-.icon {
-  margin-right: var(--spacing-2);
-}
-
-.callout {
-  justify-content: left;
-}

src/core/client/account/routes/download/Download/Sorry.tsx

@@ -1,22 +1,21 @@
 import { Localized } from "@fluent/react/compat";
 import React, { FunctionComponent } from "react";
 
-import { CallOut, Flex, Icon } from "coral-ui/components";
-
-import styles from "./Sorry.css";
+import { Icon } from "coral-ui/components/v2";
+import { CallOut } from "coral-ui/components/v3";
 
 const Sorry: FunctionComponent = () => {
   return (
-    <CallOut color="error" fullWidth className={styles.callout}>
-      <Flex>
-        <Icon size="md" className={styles.icon}>
-          error
-        </Icon>
+    <CallOut
+      color="error"
+      icon={<Icon>error</Icon>}
+      titleWeight="semiBold"
+      title={
         <Localized id="download-landingPage-sorry">
           Your download link is invalid.
         </Localized>
-      </Flex>
-    </CallOut>
+      }
+    />
   );
 };
 

src/core/client/account/routes/email/Confirm/Confirm.css

@@ -0,0 +1,52 @@
+.title {
+  font-family: var(--font-family-secondary);
+  font-style: normal;
+  font-weight: var(--font-weight-secondary-bold);
+  font-size: var(--font-size-6);
+  line-height: 1.17;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.description {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-3);
+  line-height: 1.25;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-3);
+}
+
+.label {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-bold);
+  font-size: var(--font-size-2);
+  line-height: 1.14;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-1);
+}
+
+.labelDescription {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-2);
+  line-height: 1.285;
+
+  color: var(--palette-text-100);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.submit {
+  margin-top: var(--spacing-5);
+  margin-bottom: var(--spacing-1);
+}

src/core/client/account/routes/email/Confirm/ConfirmForm.tsx

@@ -5,10 +5,12 @@ import { Form } from "react-final-form";
 
 import { InvalidRequestError } from "coral-framework/lib/errors";
 import { useMutation } from "coral-framework/lib/relay";
-import { Button, HorizontalGutter, Typography } from "coral-ui/components";
+import { Button } from "coral-ui/components/v3";
 
 import ConfirmMutation from "./ConfirmMutation";
 
+import styles from "./Confirm.css";
+
 interface Props {
   token: string;
   disabled?: boolean;
@@ -33,18 +35,18 @@ const ConfirmForm: React.FunctionComponent<Props> = ({ onSuccess, token }) => {
     <Form onSubmit={onSubmit}>
       {({ handleSubmit, submitting }) => (
         <form autoComplete="off" onSubmit={handleSubmit}>
-          <HorizontalGutter size="double">
-            <HorizontalGutter>
-              <Localized id="confirmEmail-emailConfirmation">
-                <Typography variant="heading1">Email Confirmation</Typography>
+          <div>
+            <div>
+              <Localized id="confirmEmail-confirmYourEmailAddress">
+                <div className={styles.title}>Confirm your email address</div>
               </Localized>
               <Localized id="confirmEmail-pleaseClickToConfirm">
-                <Typography variant="bodyCopy">
+                <div className={styles.description}>
                   Click below to confirm your email address.
-                </Typography>
+                </div>
               </Localized>
-            </HorizontalGutter>
-            <HorizontalGutter>
+            </div>
+            <div>
               <Localized id="confirmEmail-confirmEmail">
                 <Button
                   type="submit"
@@ -52,12 +54,14 @@ const ConfirmForm: React.FunctionComponent<Props> = ({ onSuccess, token }) => {
                   color="primary"
                   disabled={submitting}
                   fullWidth
+                  upperCase
+                  className={styles.submit}
                 >
                   Confirm email
                 </Button>
               </Localized>
-            </HorizontalGutter>
-          </HorizontalGutter>
+            </div>
+          </div>
         </form>
       )}
     </Form>

src/core/client/account/routes/email/Confirm/Sorry.tsx

@@ -1,7 +1,9 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { CallOut, HorizontalGutter, Typography } from "coral-ui/components";
+import { CallOut } from "coral-ui/components/v3";
+
+import styles from "./Confirm.css";
 
 interface Props {
   reason: React.ReactNode;
@@ -9,23 +11,27 @@ interface Props {
 
 const Sorry: React.FunctionComponent<Props> = ({ reason }) => {
   return (
-    <HorizontalGutter size="double">
+    <div>
       <Localized id="confirmEmail-oopsSorry">
-        <Typography variant="heading1">Oops Sorry!</Typography>
+        <div className={styles.title}>Oops Sorry!</div>
       </Localized>
-      <CallOut color="error" fullWidth>
-        {reason ? (
-          reason
-        ) : (
-          <Localized id="account-tokenNotFound">
-            <span data-testid="invalid-link">
-              The specified link is invalid, check to see if it was copied
-              correctly.
-            </span>
-          </Localized>
-        )}
-      </CallOut>
-    </HorizontalGutter>
+      <CallOut
+        color="error"
+        titleWeight="semiBold"
+        title={
+          reason ? (
+            reason
+          ) : (
+            <Localized id="account-tokenNotFound">
+              <span data-testid="invalid-link">
+                The specified link is invalid, check to see if it was copied
+                correctly.
+              </span>
+            </Localized>
+          )
+        }
+      />
+    </div>
   );
 };
 

src/core/client/account/routes/email/Confirm/Success.tsx

@@ -1,20 +1,18 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { HorizontalGutter, Typography } from "coral-ui/components";
+import styles from "./Confirm.css";
 
 const Success: React.FunctionComponent = () => {
   return (
-    <HorizontalGutter size="double">
+    <div>
       <Localized id="confirmEmail-successfullyConfirmed">
-        <Typography variant="heading1">Email successfully confirmed</Typography>
+        <div className={styles.title}>Email successfully confirmed</div>
       </Localized>
       <Localized id="confirmEmail-youMayClose">
-        <Typography variant="bodyCopy">
-          You may now close this window.
-        </Typography>
+        <div className={styles.description}>You may now close this window.</div>
       </Localized>
-    </HorizontalGutter>
+    </div>
   );
 };
 

src/core/client/account/routes/notifications/Unsubscribe/Sorry.tsx

@@ -1,7 +1,9 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { CallOut, HorizontalGutter, Typography } from "coral-ui/components";
+import { CallOut } from "coral-ui/components/v3";
+
+import styles from "./Unsubscribe.css";
 
 interface Props {
   reason: React.ReactNode;
@@ -9,23 +11,27 @@ interface Props {
 
 const Sorry: React.FunctionComponent<Props> = ({ reason }) => {
   return (
-    <HorizontalGutter size="double">
+    <div>
       <Localized id="unsubscribe-oopsSorry">
-        <Typography variant="heading1">Oops Sorry!</Typography>
+        <div className={styles.title}>Oops Sorry!</div>
       </Localized>
-      <CallOut color="error" fullWidth>
-        {reason ? (
-          reason
-        ) : (
-          <Localized id="account-tokenNotFound">
-            <span data-testid="invalid-link">
-              The specified link is invalid, check to see if it was copied
-              correctly.
-            </span>
-          </Localized>
-        )}
-      </CallOut>
-    </HorizontalGutter>
+      <CallOut
+        color="error"
+        titleWeight="semiBold"
+        title={
+          reason ? (
+            reason
+          ) : (
+            <Localized id="account-tokenNotFound">
+              <span data-testid="invalid-link">
+                The specified link is invalid, check to see if it was copied
+                correctly.
+              </span>
+            </Localized>
+          )
+        }
+      />
+    </div>
   );
 };
 

src/core/client/account/routes/notifications/Unsubscribe/Success.tsx

@@ -1,17 +1,20 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { HorizontalGutter, Typography } from "coral-ui/components";
+import styles from "./Unsubscribe.css";
 
 const Success: React.FunctionComponent = () => {
   return (
-    <HorizontalGutter data-testid="success" size="double">
-      <Localized id="unsubscribe-successfullyUnsubscribed">
-        <Typography variant="heading1">
-          You are now unsubscribed from all notifications
-        </Typography>
+    <div data-testid="success">
+      <Localized id="unsubscribe-unsubscribedSuccessfully">
+        <div className={styles.title}>
+          Unsubscribed successfully from email notifications
+        </div>
       </Localized>
-    </HorizontalGutter>
+      <Localized id="unsubscribe-youMayNowClose">
+        <div className={styles.description}>You may now close this window</div>
+      </Localized>
+    </div>
   );
 };
 

src/core/client/account/routes/notifications/Unsubscribe/Unsubscribe.css

@@ -0,0 +1,52 @@
+.title {
+  font-family: var(--font-family-secondary);
+  font-style: normal;
+  font-weight: var(--font-weight-secondary-bold);
+  font-size: var(--font-size-6);
+  line-height: 1.17;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.description {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-3);
+  line-height: 1.25;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-3);
+}
+
+.label {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-bold);
+  font-size: var(--font-size-2);
+  line-height: 1.14;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-1);
+}
+
+.labelDescription {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-2);
+  line-height: 1.285;
+
+  color: var(--palette-text-100);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.submit {
+  margin-top: var(--spacing-5);
+  margin-bottom: var(--spacing-1);
+}

src/core/client/account/routes/notifications/Unsubscribe/UnsubscribeForm.tsx

@@ -5,15 +5,12 @@ import { Form } from "react-final-form";
 
 import { InvalidRequestError } from "coral-framework/lib/errors";
 import { useMutation } from "coral-framework/lib/relay";
-import {
-  Button,
-  CallOut,
-  HorizontalGutter,
-  Typography,
-} from "coral-ui/components";
+import { Button, CallOut } from "coral-ui/components/v3";
 
 import UnsubscribeNotificationsMutation from "./UnsubscribeNotificationsMutation";
 
+import styles from "./Unsubscribe.css";
+
 interface Props {
   token: string;
   disabled?: boolean;
@@ -42,30 +39,34 @@ const UnsubscribeForm: React.FunctionComponent<Props> = ({
       <Form onSubmit={onSubmit}>
         {({ handleSubmit, submitting, submitError }) => (
           <form onSubmit={handleSubmit}>
-            <HorizontalGutter>
+            <div>
+              <Localized id="unsubscribe-unsubscribeFromEmails">
+                <div className={styles.title}>
+                  Unsubscribe from email notifications
+                </div>
+              </Localized>
               <Localized id="unsubscribe-clickToConfirm">
-                <Typography variant="heading1">
+                <div className={styles.description}>
                   Click below to confirm that you want to unsubscribe from all
                   notifications.
-                </Typography>
+                </div>
               </Localized>
-              {submitError && (
-                <CallOut color="error" fullWidth>
-                  {submitError}
-                </CallOut>
-              )}
-              <Localized id="unsubscribe-confirm">
+              {submitError && <CallOut color="error" title={submitError} />}
+              <Localized id="unsubscribe-submit-unsubscribe">
                 <Button
                   type="submit"
                   variant="filled"
+                  paddingSize="medium"
                   color="primary"
                   disabled={submitting}
+                  upperCase
                   fullWidth
+                  className={styles.submit}
                 >
-                  Confirm
+                  Unsubscribe
                 </Button>
               </Localized>
-            </HorizontalGutter>
+            </div>
           </form>
         )}
       </Form>

src/core/client/account/routes/password/Reset/Reset.css

@@ -0,0 +1,52 @@
+.title {
+  font-family: var(--font-family-secondary);
+  font-style: normal;
+  font-weight: var(--font-weight-secondary-bold);
+  font-size: var(--font-size-6);
+  line-height: 1.17;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.description {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-3);
+  line-height: 1.25;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-3);
+}
+
+.label {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-bold);
+  font-size: var(--font-size-2);
+  line-height: 1.14;
+
+  color: var(--palette-text-500);
+
+  margin-bottom: var(--spacing-1);
+}
+
+.labelDescription {
+  font-family: var(--font-family-primary);
+  font-style: normal;
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-2);
+  line-height: 1.285;
+
+  color: var(--palette-text-100);
+
+  margin-bottom: var(--spacing-2);
+}
+
+.submit {
+  margin-top: var(--spacing-5);
+  margin-bottom: var(--spacing-1);
+}

src/core/client/account/routes/password/Reset/ResetPasswordForm.tsx

@@ -4,26 +4,20 @@ import React, { useCallback } from "react";
 import { Field, Form } from "react-final-form";
 
 import { InvalidRequestError } from "coral-framework/lib/errors";
-import { colorFromMeta, ValidationMessage } from "coral-framework/lib/form";
+import { colorFromMeta } from "coral-framework/lib/form";
 import { useMutation } from "coral-framework/lib/relay";
 import {
   composeValidators,
   required,
   validatePassword,
 } from "coral-framework/lib/validation";
-import {
-  Button,
-  CallOut,
-  FormField,
-  HorizontalGutter,
-  InputDescription,
-  InputLabel,
-  PasswordField,
-  Typography,
-} from "coral-ui/components";
+import { FormField, PasswordField } from "coral-ui/components/v2";
+import { Button, CallOut, ValidationMessage } from "coral-ui/components/v3";
 
 import ResetPasswordMutation from "./ResetPasswordMutation";
 
+import styles from "./Reset.css";
+
 interface Props {
   token: string;
   disabled?: boolean;
@@ -60,22 +54,20 @@ const ResetPasswordForm: React.FunctionComponent<Props> = ({
       <Form onSubmit={onSubmit}>
         {({ handleSubmit, submitting, submitError }) => (
           <form autoComplete="off" onSubmit={handleSubmit}>
-            <HorizontalGutter size="double">
-              <HorizontalGutter>
+            <div>
+              <div>
                 <Localized id="resetPassword-resetYourPassword">
-                  <Typography variant="heading1">
-                    Reset your password
-                  </Typography>
+                  <div className={styles.title}>Reset your password</div>
                 </Localized>
                 <Localized id="resetPassword-pleaseEnterNewPassword">
-                  <Typography variant="bodyCopy">
+                  <div className={styles.description}>
                     Please enter a new password to use to sign in to your
                     account. Make sure it is unique and be sure to keep it
                     secure.
-                  </Typography>
+                  </div>
                 </Localized>
-              </HorizontalGutter>
-              <HorizontalGutter>
+              </div>
+              <div>
                 <Field
                   name="password"
                   validate={composeValidators(required, validatePassword)}
@@ -83,15 +75,17 @@ const ResetPasswordForm: React.FunctionComponent<Props> = ({
                   {({ input, meta }) => (
                     <FormField>
                       <Localized id="resetPassword-passwordLabel">
-                        <InputLabel htmlFor={input.name}>Password</InputLabel>
+                        <label className={styles.label} htmlFor={input.name}>
+                          Password
+                        </label>
                       </Localized>
                       <Localized
                         id="resetPassword-passwordDescription"
                         $minLength={8}
                       >
-                        <InputDescription>
+                        <div className={styles.labelDescription}>
                           {"Must be at least {$minLength} characters"}
-                        </InputDescription>
+                        </div>
                       </Localized>
                       <Localized
                         id="resetPassword-passwordTextField"
@@ -107,28 +101,27 @@ const ResetPasswordForm: React.FunctionComponent<Props> = ({
                           {...input}
                         />
                       </Localized>
-                      <ValidationMessage meta={meta} fullWidth />
+                      <ValidationMessage meta={meta} />
                     </FormField>
                   )}
                 </Field>
-                {submitError && (
-                  <CallOut color="error" fullWidth>
-                    {submitError}
-                  </CallOut>
-                )}
+                {submitError && <CallOut color="error" title={submitError} />}
                 <Localized id="resetPassword-resetPassword">
                   <Button
                     type="submit"
                     variant="filled"
                     color="primary"
+                    paddingSize="medium"
                     disabled={submitting}
+                    upperCase
                     fullWidth
+                    className={styles.submit}
                   >
                     Reset Password
                   </Button>
                 </Localized>
-              </HorizontalGutter>
-            </HorizontalGutter>
+              </div>
+            </div>
           </form>
         )}
       </Form>

src/core/client/account/routes/password/Reset/Sorry.tsx

@@ -1,7 +1,9 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { CallOut, HorizontalGutter, Typography } from "coral-ui/components";
+import { CallOut } from "coral-ui/components/v3";
+
+import styles from "./Reset.css";
 
 interface Props {
   reason: React.ReactNode;
@@ -9,23 +11,27 @@ interface Props {
 
 const Sorry: React.FunctionComponent<Props> = ({ reason }) => {
   return (
-    <HorizontalGutter size="double">
+    <div>
       <Localized id="resetPassword-oopsSorry">
-        <Typography variant="heading1">Oops Sorry!</Typography>
+        <div className={styles.title}>Oops Sorry!</div>
       </Localized>
-      <CallOut color="error" fullWidth>
-        {reason ? (
-          reason
-        ) : (
-          <Localized id="account-tokenNotFound">
-            <span data-testid="invalid-link">
-              The specified link is invalid, check to see if it was copied
-              correctly.
-            </span>
-          </Localized>
-        )}
-      </CallOut>
-    </HorizontalGutter>
+      <CallOut
+        color="error"
+        titleWeight="semiBold"
+        title={
+          reason ? (
+            reason
+          ) : (
+            <Localized id="account-tokenNotFound">
+              <span data-testid="invalid-link">
+                The specified link is invalid, check to see if it was copied
+                correctly.
+              </span>
+            </Localized>
+          )
+        }
+      />
+    </div>
   );
 };
 

src/core/client/account/routes/password/Reset/Success.tsx

@@ -1,21 +1,21 @@
 import { Localized } from "@fluent/react/compat";
 import React from "react";
 
-import { HorizontalGutter, Typography } from "coral-ui/components";
+import styles from "./Reset.css";
 
 const Success: React.FunctionComponent = () => {
   return (
-    <HorizontalGutter size="double">
+    <div>
       <Localized id="resetPassword-successfullyReset">
-        <Typography variant="heading1">Password successfully reset</Typography>
+        <div className={styles.title}>Password successfully reset</div>
       </Localized>
       <Localized id="resetPassword-youMayClose">
-        <Typography variant="bodyCopy">
+        <div className={styles.description}>
           You may now close this window and sign in to your account with your
           new password.
-        </Typography>
+        </div>
       </Localized>
-    </HorizontalGutter>
+    </div>
   );
 };
 

src/core/client/account/test/__snapshots__/confirmEmail.spec.tsx.snap

@@ -20,29 +20,22 @@ exports[`renders form 1`] = `
           autoComplete="off"
           onSubmit={[Function]}
         >
-          <div
-            className="Box-root HorizontalGutter-root HorizontalGutter-double"
-          >
-            <div
-              className="Box-root HorizontalGutter-root HorizontalGutter-full"
-            >
-              <h1
-                className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+          <div>
+            <div>
+              <div
+                className="Confirm-title"
               >
-                Email Confirmation
-              </h1>
-              <p
-                className="Box-root Typography-root Typography-bodyCopy Typography-colorTextPrimary"
+                Confirm your email address
+              </div>
+              <div
+                className="Confirm-description"
               >
                 Click below to confirm your email address.
-              </p>
+              </div>
             </div>
-            <div
-              className="Box-root HorizontalGutter-root HorizontalGutter-full"
-            >
+            <div>
               <button
-                className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth"
-                data-color="primary"
+                className="BaseButton-root Button-base Button-filled Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimaryBold Button-paddingSizeSmall Button-colorPrimary Button-upperCase Button-fullWidth Confirm-submit"
                 data-variant="filled"
                 disabled={false}
                 onBlur={[Function]}
@@ -79,25 +72,34 @@ exports[`renders missing confirm token 1`] = `
       <div
         className="ConfirmRoute-root"
       >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-double"
-        >
-          <h1
-            className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+        <div>
+          <div
+            className="Confirm-title"
           >
             Oops Sorry!
-          </h1>
+          </div>
           <div
-            className="CallOut-root CallOut-colorError CallOut-fullWidth"
+            className="CallOut-root CallOut-error CallOut-leftBorder"
           >
             <div
-              className="CallOut-inner"
+              className="CallOut-container"
             >
-              <span
-                data-testid="invalid-link"
+              <div
+                className="CallOut-content"
               >
-                The specified link is invalid, check to see if it was copied correctly.
-              </span>
+                <div
+                  className="CallOut-title CallOut-titleSemiBold"
+                >
+                  <span
+                    data-testid="invalid-link"
+                  >
+                    The specified link is invalid, check to see if it was copied correctly.
+                  </span>
+                </div>
+                <div
+                  className="CallOut-body"
+                />
+              </div>
             </div>
           </div>
         </div>

src/core/client/account/test/__snapshots__/resetPassword.spec.tsx.snap

@@ -21,41 +21,35 @@ exports[`renders form 1`] = `
             autoComplete="off"
             onSubmit={[Function]}
           >
-            <div
-              className="Box-root HorizontalGutter-root HorizontalGutter-double"
-            >
-              <div
-                className="Box-root HorizontalGutter-root HorizontalGutter-full"
-              >
-                <h1
-                  className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+            <div>
+              <div>
+                <div
+                  className="Reset-title"
                 >
                   Reset your password
-                </h1>
-                <p
-                  className="Box-root Typography-root Typography-bodyCopy Typography-colorTextPrimary"
+                </div>
+                <div
+                  className="Reset-description"
                 >
                   Please enter a new password to use to sign in to your account.
 Make sure it is unique and be sure to keep it secure.
-                </p>
+                </div>
               </div>
-              <div
-                className="Box-root HorizontalGutter-root HorizontalGutter-full"
-              >
+              <div>
                 <div
-                  className="Box-root HorizontalGutter-root FormField-root HorizontalGutter-half"
+                  className="Box-root HorizontalGutter-root FormField-root HorizontalGutter-spacing-2"
                 >
                   <label
-                    className="Box-root Typography-root Typography-inputLabel Typography-colorTextPrimary InputLabel-root"
+                    className="Reset-label"
                     htmlFor="password"
                   >
                     Password
                   </label>
-                  <p
-                    className="Box-root Typography-root Typography-fieldDescription Typography-colorTextSecondary"
+                  <div
+                    className="Reset-labelDescription"
                   >
                     Must be at least 8 characters
-                  </p>
+                  </div>
                   <div
                     className="PasswordField-fullWidth PasswordField-root"
                   >
@@ -67,6 +61,7 @@ Make sure it is unique and be sure to keep it secure.
                         autoComplete="new-password"
                         autoCorrect="off"
                         className="PasswordField-colorRegular PasswordField-fullWidth PasswordField-input"
+                        data-testid="password-field"
                         disabled={false}
                         id="password"
                         name="password"
@@ -97,8 +92,7 @@ Make sure it is unique and be sure to keep it secure.
                   </div>
                 </div>
                 <button
-                  className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth"
-                  data-color="primary"
+                  className="BaseButton-root Button-base Button-filled Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimaryBold Button-paddingSizeMedium Button-colorPrimary Button-upperCase Button-fullWidth Reset-submit"
                   data-variant="filled"
                   disabled={false}
                   onBlur={[Function]}
@@ -136,25 +130,34 @@ exports[`renders missing reset token 1`] = `
       <div
         className="ResetRoute-root"
       >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-double"
-        >
-          <h1
-            className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+        <div>
+          <div
+            className="Reset-title"
           >
             Oops Sorry!
-          </h1>
+          </div>
           <div
-            className="CallOut-root CallOut-colorError CallOut-fullWidth"
+            className="CallOut-root CallOut-error CallOut-leftBorder"
           >
             <div
-              className="CallOut-inner"
+              className="CallOut-container"
             >
-              <span
-                data-testid="invalid-link"
+              <div
+                className="CallOut-content"
               >
-                The specified link is invalid, check to see if it was copied correctly.
-              </span>
+                <div
+                  className="CallOut-title CallOut-titleSemiBold"
+                >
+                  <span
+                    data-testid="invalid-link"
+                  >
+                    The specified link is invalid, check to see if it was copied correctly.
+                  </span>
+                </div>
+                <div
+                  className="CallOut-body"
+                />
+              </div>
             </div>
           </div>
         </div>

src/core/client/account/test/__snapshots__/unsubscribeNotifications.spec.tsx.snap

@@ -22,17 +22,19 @@ exports[`renders form 1`] = `
           <form
             onSubmit={[Function]}
           >
-            <div
-              className="Box-root HorizontalGutter-root HorizontalGutter-full"
-            >
-              <h1
-                className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+            <div>
+              <div
+                className="Unsubscribe-title"
+              >
+                Unsubscribe from email notifications
+              </div>
+              <div
+                className="Unsubscribe-description"
               >
                 Click below to confirm that you want to unsubscribe from all notifications.
-              </h1>
+              </div>
               <button
-                className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth"
-                data-color="primary"
+                className="BaseButton-root Button-base Button-filled Button-fontSizeSmall Button-textAlignCenter Button-fontFamilyPrimary Button-fontWeightPrimaryBold Button-paddingSizeMedium Button-colorPrimary Button-upperCase Button-fullWidth Unsubscribe-submit"
                 data-variant="filled"
                 disabled={false}
                 onBlur={[Function]}
@@ -42,7 +44,7 @@ exports[`renders form 1`] = `
                 onTouchEnd={[Function]}
                 type="submit"
               >
-                Confirm
+                Unsubscribe
               </button>
             </div>
           </form>
@@ -69,25 +71,34 @@ exports[`renders missing confirm token 1`] = `
       <div
         className="UnsubscribeRoute-root"
       >
-        <div
-          className="Box-root HorizontalGutter-root HorizontalGutter-double"
-        >
-          <h1
-            className="Box-root Typography-root Typography-heading1 Typography-colorTextPrimary"
+        <div>
+          <div
+            className="Unsubscribe-title"
           >
             Oops Sorry!
-          </h1>
+          </div>
           <div
-            className="CallOut-root CallOut-colorError CallOut-fullWidth"
+            className="CallOut-root CallOut-error CallOut-leftBorder"
           >
             <div
-              className="CallOut-inner"
+              className="CallOut-container"
             >
-              <span
-                data-testid="invalid-link"
+              <div
+                className="CallOut-content"
               >
-                The specified link is invalid, check to see if it was copied correctly.
-              </span>
+                <div
+                  className="CallOut-title CallOut-titleSemiBold"
+                >
+                  <span
+                    data-testid="invalid-link"
+                  >
+                    The specified link is invalid, check to see if it was copied correctly.
+                  </span>
+                </div>
+                <div
+                  className="CallOut-body"
+                />
+              </div>
             </div>
           </div>
         </div>

src/core/client/account/test/confirmEmail.spec.tsx

@@ -53,9 +53,7 @@ it("renders form", async () => {
 
   await act(async () => {
     await waitForElement(() =>
-      within(root).getByText("Email Confirmation", {
-        exact: false,
-      })
+      within(root).getByText("Confirm your email address")
     );
   });
   expect(within(root).toJSON()).toMatchSnapshot();
@@ -130,9 +128,7 @@ it("submits form", async () => {
 
   await act(async () => {
     await waitForElement(() =>
-      within(root).getByText("Email Confirmation", {
-        exact: false,
-      })
+      within(root).getByText("Confirm your email address")
     );
   });
   const form = within(root).getByType("form");

src/core/client/admin/App/DecisionHistory/ApprovedComment.tsx

@@ -17,7 +17,7 @@ interface Props {
   onGotoComment?: React.EventHandler<React.MouseEvent>;
 }
 
-const ApprovedComment: FunctionComponent<Props> = props => (
+const ApprovedComment: FunctionComponent<Props> = (props) => (
   <DecisionItem icon={<ApprovedIcon />}>
     <Localized
       id="decisionHistory-approvedCommentBy"

src/core/client/admin/App/DecisionHistory/ApprovedIcon.css

@@ -1,3 +1,3 @@
 .root {
-  color: var(--v2-palette-success-main);
+  color: var(--palette-success-500);
 }

src/core/client/admin/App/DecisionHistory/DecisionHistory.tsx

@@ -19,13 +19,13 @@ interface Props {
   onClosePopover: () => void;
 }
 
-const DecisionHistory: FunctionComponent<Props> = props => (
+const DecisionHistory: FunctionComponent<Props> = (props) => (
   <div data-testid="decisionHistory-container">
     <Title />
     <Main>
       <DecisionList>
         {props.actions.length === 0 && <Empty />}
-        {props.actions.map(action => (
+        {props.actions.map((action) => (
           <DecisionHistoryItemContainer
             key={action.id}
             action={action}

src/core/client/admin/App/DecisionHistory/DecisionHistoryButton.css

@@ -3,6 +3,6 @@
 }
 
 .historyIcon {
-  color: var(--v2-palette-text-secondary);
+  color: var(--palette-text-100);
   margin-right: 10px;
 }

src/core/client/admin/App/DecisionHistory/DecisionHistoryContainer.tsx

@@ -23,7 +23,7 @@ export class DecisionHistoryContainer extends React.Component<
 
   public render() {
     const actions = this.props.viewer.commentModerationActionHistory.edges.map(
-      edge => edge.node
+      (edge) => edge.node
     );
     return (
       <DecisionHistory
@@ -43,7 +43,7 @@ export class DecisionHistoryContainer extends React.Component<
     this.setState({ disableLoadMore: true });
     this.props.relay.loadMore(
       10, // Fetch the next 10 feed items
-      error => {
+      (error) => {
         this.setState({ disableLoadMore: false });
         if (error) {
           // eslint-disable-next-line no-console

src/core/client/admin/App/DecisionHistory/DecisionHistoryQuery.tsx

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
+import { graphql } from "react-relay";
 
-import { graphql, QueryRenderer } from "coral-framework/lib/relay";
+import { QueryRenderer } from "coral-framework/lib/relay";
 
 import { DecisionHistoryQuery as QueryTypes } from "coral-admin/__generated__/DecisionHistoryQuery.graphql";
 

src/core/client/admin/App/DecisionHistory/DecisionItem.css

@@ -1,5 +1,5 @@
 .root {
-  padding: var(--v2-spacing-2) var(--v2-spacing-1);
+  padding: var(--spacing-2) var(--spacing-1);
 }
 
 .leftCol {
@@ -8,5 +8,5 @@
   flex-grow: 0;
   flex-shrink: 0;
   padding-top: 3px;
-  margin-right: var(--v2-spacing-2);
+  margin-right: var(--spacing-2);
 }

src/core/client/admin/App/DecisionHistory/DecisionItem.tsx

@@ -9,7 +9,7 @@ interface Props {
   children: React.ReactNode;
 }
 
-const DecisionItem: FunctionComponent<Props> = props => (
+const DecisionItem: FunctionComponent<Props> = (props) => (
   <li className={styles.root}>
     <Flex>
       <div className={styles.leftCol}>{props.icon}</div>

src/core/client/admin/App/DecisionHistory/DecisionList.css

@@ -1,4 +1,4 @@
-$decisionHistoryBorderColor: var(--v2-colors-grey-300);
+$decisionHistoryBorderColor: var(--palette-grey-300);
 
 .root {
   margin: 0;

src/core/client/admin/App/DecisionHistory/DecisionList.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from "react";
 
 import styles from "./DecisionList.css";
 
-const DecisionList: FunctionComponent = props => (
+const DecisionList: FunctionComponent = (props) => (
   <ul className={styles.root}>{props.children}</ul>
 );
 

src/core/client/admin/App/DecisionHistory/DotDivider.css

@@ -1,7 +1,7 @@
 .root {
   height: 100%;
-  font-size: var(--v2-font-size-1);
-  line-height: var(--v2-line-height-reset);
-  color: var(--v2-colors-mono-100);
-  padding: 0 var(--v2-spacing-1);
+  font-size: var(--font-size-1);
+  line-height: 1.33;
+  color: var(--palette-text-100);
+  padding: 0 var(--spacing-1);
 }

src/core/client/admin/App/DecisionHistory/Empty.css

@@ -3,8 +3,8 @@
 }
 
 .text {
-  font-family: var(--v2-font-family-primary);
-  font-weight: var(--v2-font-weight-primary-regular);
-  font-size: var(--v2-font-size-2);
-  line-height: var(--v2-line-height-body-short);
+  font-family: var(--font-family-primary);
+  font-weight: var(--font-weight-primary-regular);
+  font-size: var(--font-size-2);
+  line-height: 1.285;
 }

src/core/client/admin/App/DecisionHistory/Footer.css

@@ -1,3 +1,3 @@
 .root {
-  margin-top: var(--v2-spacing-1);
+  margin-top: var(--spacing-1);
 }

src/core/client/admin/App/DecisionHistory/Footer.tsx

@@ -8,7 +8,7 @@ interface Props {
   children: React.ReactNode;
 }
 
-const Footer: FunctionComponent<Props> = props => (
+const Footer: FunctionComponent<Props> = (props) => (
   <Flex className={styles.root} alignItems="baseline">
     {props.children}
   </Flex>

src/core/client/admin/App/DecisionHistory/GoToCommentLink.css

@@ -1,10 +1,10 @@
-$moderateCardDecisionHistoryLinkTextColor: var(--v2-colors-teal-700);
+$moderateCardDecisionHistoryLinkTextColor: $colors-teal-700;
 
 .root {
-  line-height: var(--v2-line-height-reset);
-  font-weight: var(--v2-font-weight-primary-bold);
-  font-family: var(--v2-font-family-primary);
-  font-size: var(--v2-font-size-1);
+  font-weight: var(--font-weight-primary-bold);
+  font-family: var(--font-family-primary);
+  font-size: var(--font-size-1);
+  line-height: 1.33;
   color: $moderateCardDecisionHistoryLinkTextColor;
-  font-style: var(--v2-font-style-underline);
+  font-style: var(--font-style-underline);
 }

src/core/client/admin/App/DecisionHistory/GoToCommentLink.tsx

@@ -11,7 +11,7 @@ interface Props {
   onClick?: React.EventHandler<React.MouseEvent>;
 }
 
-const GoToCommentLink: FunctionComponent<Props> = props => {
+const GoToCommentLink: FunctionComponent<Props> = (props) => {
   return (
     <Link
       as={TextLink}

src/core/client/admin/App/DecisionHistory/Info.css

@@ -8,9 +8,9 @@
   word-break: break-all;
   /* Fallback end */
   word-break: break-word;
-  color: var(--v2-palette-text-primary);
-  font-weight: var(--v2-font-weight-primary-semi-bold);
-  font-family: var(--v2-font-family-primary);
-  line-height: var(--v2-line-height-body-short);
-  font-size: var(--v2-font-size-2);
+  color: var(--palette-text-500);
+  font-weight: var(--font-weight-primary-semi-bold);
+  font-family: var(--font-family-primary);
+  font-size: var(--font-size-2);
+  line-height: 1.285;
 }

src/core/client/admin/App/DecisionHistory/Info.tsx

@@ -6,7 +6,7 @@ interface Props {
   children: React.ReactNode;
 }
 
-const Info: FunctionComponent<Props> = props => (
+const Info: FunctionComponent<Props> = (props) => (
   <span className={styles.root}>{props.children}</span>
 );
 

src/core/client/admin/App/DecisionHistory/Main.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent } from "react";
 
 import styles from "./Main.css";
 
-const Main: FunctionComponent = props => (
+const Main: FunctionComponent = (props) => (
   <div className={styles.root}>{props.children}</div>
 );
 

src/core/client/admin/App/DecisionHistory/RejectedComment.tsx

@@ -17,7 +17,7 @@ interface Props {
   onGotoComment?: React.EventHandler<React.MouseEvent>;
 }
 
-const RejectedComment: FunctionComponent<Props> = props => (
+const RejectedComment: FunctionComponent<Props> = (props) => (
   <DecisionItem icon={<RejectedIcon />}>
     <Localized
       id="decisionHistory-rejectedCommentBy"

src/core/client/admin/App/DecisionHistory/RejectedIcon.css

@@ -1,3 +1,3 @@
 .root {
-  color: var(--v2-palette-error-main);
+  color: var(--palette-error-500);
 }

src/core/client/admin/App/DecisionHistory/ShowMoreButton.css

@@ -1,20 +1,20 @@
-$moderateCardDecisionHistoryLinkTextColor: var(--v2-colors-teal-700);
-$moderateCardDecisionHistoryBorderColor: var(--v2-colors-grey-300);
+$moderateCardDecisionHistoryLinkTextColor: $colors-teal-700;
+$moderateCardDecisionHistoryBorderColor: var(--palette-grey-300);
 
 .root {
-  font-size: var(--v2-font-size-2);
-  font-weight: var(--v2-font-weight-primary-bold);
-  font-family: var(--v2-font-family-primary);
-  line-height: var(--v2-line-height-reset);
+  font-size: var(--font-size-2);
+  font-weight: var(--font-weight-primary-bold);
+  font-family: var(--font-family-primary);
+  line-height: 1.14;
   text-transform: uppercase;
   color: $moderateCardDecisionHistoryLinkTextColor;
   width: 100%;
   border-top: 1px solid $moderateCardDecisionHistoryBorderColor;
   text-align: center;
-  padding-top: var(--v2-spacing-1);
-  padding-bottom: var(--v2-spacing-1);
+  padding-top: var(--spacing-1);
+  padding-bottom: var(--spacing-1);
 
   &:disabled {
-    color: var(--v2-palette-grey-lighter);
+    color: var(--palette-grey-300);
   }
 }

src/core/client/admin/App/DecisionHistory/ShowMoreButton.tsx

@@ -10,7 +10,7 @@ interface Props {
   onClick?: () => void;
 }
 
-const ShowMoreButton: FunctionComponent<Props> = props => (
+const ShowMoreButton: FunctionComponent<Props> = (props) => (
   <Localized id="decisionHistory-showMoreButton">
     <BaseButton
       className={styles.root}

src/core/client/admin/App/DecisionHistory/Timestamp.css

@@ -1,9 +1,9 @@
-$timestampColor: var(--v2-colors-mono-100);
+$timestampColor: var(--palette-text-100);
 
 .root {
   color: $timestampColor;
-  font-family: var(--v2-font-family-primary);
-  font-weight: var(--v2-font-weight-primary-bold);
-  font-size: var(--v2-font-size-1);
-  line-height: var(--v2-line-height-reset);
+  font-family: var(--font-family-primary);
+  font-weight: var(--font-weight-primary-bold);
+  font-size: var(--font-size-1);
+  line-height: 1.33;
 }

src/core/client/admin/App/DecisionHistory/Timestamp.tsx

@@ -8,7 +8,7 @@ interface Props {
   children: string;
 }
 
-const DecisionHistory: FunctionComponent<Props> = props => (
+const DecisionHistory: FunctionComponent<Props> = (props) => (
   <Timestamp className={styles.root}>{props.children}</Timestamp>
 );
 

src/core/client/admin/App/DecisionHistory/Title.css

@@ -1,23 +1,23 @@
-$decisionHistoryBorderColor: var(--v2-colors-grey-300);
-$decisionHistoryTitleBackgroundColor: var(--v2-colors-grey-200);
+$decisionHistoryBorderColor: var(--palette-grey-300);
+$decisionHistoryTitleBackgroundColor: var(--palette-grey-200);
 
 .root {
   background: $decisionHistoryTitleBackgroundColor;
-  padding: var(--v2-spacing-1);
-  color: var(--v2-palette-text-primary);
+  padding: var(--spacing-1);
+  color: var(--palette-text-500);
   border-bottom: 1px solid $decisionHistoryBorderColor;
-  font-size: var(--v2-font-size-icon-medium);
 }
 
 .icon {
-  margin-right: var(--v2-spacing-2);
+  font-size: var(--font-size-icon-md);
+  margin-right: var(--spacing-2);
 }
 
 .text {
   text-transform: uppercase;
-  font-weight: var(--v2-font-weight-primary-bold);
-  color: var(--v2-palette-text-primary);
-  font-size: var(--v2-font-size-2);
+  font-weight: var(--font-weight-primary-bold);
+  color: var(--palette-text-500);
+  font-size: var(--font-size-2);
   line-height: 1;
-  font-family: var(--v2-font-family-primary);
+  font-family: var(--font-family-primary);
 }

src/core/client/admin/App/DecisionHistory/Username.css

@@ -1,9 +1,9 @@
-$moderateCardDecisionHistoryColor: var(--v2-colors-mono-900);
+$moderateCardDecisionHistoryColor: var(--palette-text-900);
 
 .root {
   color: $moderateCardDecisionHistoryColor;
-  font-weight: var(--v2-font-weight-secondary-bold);
-  font-family: var(--v2-font-family-secondary);
-  line-height: var(--v2-line-height-body-short);
-  font-size: var(--v2-font-size-3);
+  font-weight: var(--font-weight-secondary-bold);
+  font-family: var(--font-family-secondary);
+  line-height: 1.3;
+  font-size: var(--font-size-3);
 }

src/core/client/admin/App/DecisionHistory/__snapshots__/DecisionHistoryLoading.spec.tsx.snap

@@ -11,9 +11,7 @@ exports[`renders correctly 1`] = `
       className="DecisionHistoryLoading-container"
       justifyContent="center"
     >
-      <Delay
-        ms={500}
-      >
+      <Delay>
         <withPropsOnChange(Spinner)
           size="sm"
         />

src/core/client/admin/App/DecisionHistory/__snapshots__/GoToCommentLink.spec.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders correctly 1`] = `
-<ForwardRef(render)
+<Link
   as={[Function]}
   className="GoToCommentLink-root"
   onClick={[Function]}
@@ -18,5 +18,5 @@ exports[`renders correctly 1`] = `
   <ForwardRef(forwardRef)>
     chevron_right
   </ForwardRef(forwardRef)>
-</ForwardRef(render)>
+</Link>
 `;