From 04c74efdd165e6da17b8baf5e258c751c312fd95 Mon Sep 17 00:00:00 2001
From: Gareth <garethjsharpe@gmail.com>
Date: Tue, 26 Sep 2017 17:11:35 -0400
Subject: [PATCH 1/5] Shortcut to jump to mapped location (#4144)

* Shortcut to jump to mapped location

* Get source location from mouse event util added

* Simplyfy EditorMenu with new function

* Clean-up

* temp

* Correct function argument

* Nuke unused variable

* fix
---
 src/components/Editor/EditorMenu.js           | 20 +++++++---------
 src/components/Editor/index.js                | 23 ++++++++++++++-----
 .../mochitest/browser_dbg-breakpoints-cond.js |  6 ++---
 src/utils/editor/index.js                     | 16 ++++++++++++-
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/components/Editor/EditorMenu.js b/src/components/Editor/EditorMenu.js
index 43f7c9b726..c1100d642d 100644
--- a/src/components/Editor/EditorMenu.js
+++ b/src/components/Editor/EditorMenu.js
@@ -1,11 +1,12 @@
 import { showMenu } from "devtools-launchpad";
 import { isOriginalId } from "devtools-source-map";
 import { copyToTheClipboard } from "../../utils/clipboard";
+import { getSourceLocationFromMouseEvent } from "../../utils/editor";
 
 function getMenuItems(
   event,
   {
-    codeMirror,
+    editor,
     selectedLocation,
     selectedSource,
     showSource,
@@ -39,7 +40,7 @@ function getMenuItems(
     click: () => copyToTheClipboard(selectedSource.get("url"))
   };
 
-  const selectionText = codeMirror.getSelection().trim();
+  const selectionText = editor.codeMirror.getSelection().trim();
   const copySource = {
     id: "node-menu-copy-source",
     label: copySourceLabel,
@@ -48,16 +49,11 @@ function getMenuItems(
     click: () => copyToTheClipboard(selectionText)
   };
 
-  const { line, ch } = codeMirror.coordsChar({
-    left: event.clientX,
-    top: event.clientY
+  const { line } = editor.codeMirror.coordsChar({
+    left: event.clientX
   });
 
-  const sourceLocation = {
-    sourceId: selectedLocation.sourceId,
-    line: line + 1,
-    column: ch + 1
-  };
+  const sourceLocation = getSourceLocationFromMouseEvent(editor, selectedLocation, event)
 
   const pairedType = isOriginalId(selectedLocation.sourceId)
     ? L10N.getStr("generated")
@@ -73,7 +69,7 @@ function getMenuItems(
   const watchExpressionLabel = {
     accesskey: "E",
     label: L10N.getStr("expressions.placeholder"),
-    click: () => addExpression(codeMirror.getSelection())
+    click: () => addExpression(editor.codeMirror.getSelection())
   };
 
   const blackBoxMenuItem = {
@@ -85,7 +81,7 @@ function getMenuItems(
   };
 
   // TODO: Find a new way to only add this for mapped sources?
-  const textSelected = codeMirror.somethingSelected();
+  const textSelected = editor.codeMirror.somethingSelected();
 
   const showSourceMenuItem = {
     id: "node-menu-show-source",
diff --git a/src/components/Editor/index.js b/src/components/Editor/index.js
index 47714d32c4..114a4f6f8e 100644
--- a/src/components/Editor/index.js
+++ b/src/components/Editor/index.js
@@ -56,7 +56,8 @@ import {
   lineAtHeight,
   toSourceLine,
   toEditorLine,
-  resetLineNumberFormat
+  resetLineNumberFormat,
+  getSourceLocationFromMouseEvent
 } from "../../utils/editor";
 
 import { isFirefox } from "devtools-config";
@@ -133,6 +134,7 @@ class Editor extends PureComponent {
     // Set code editor wrapper to be focusable
     codeMirrorWrapper.tabIndex = 0;
     codeMirrorWrapper.addEventListener("keydown", e => this.onKeyDown(e));
+    codeMirrorWrapper.addEventListener("click", e => this.onClick(e));
 
     const toggleFoldMarkerVisibility = e => {
       if (node instanceof HTMLElement) {
@@ -152,11 +154,11 @@ class Editor extends PureComponent {
       codeMirror.on("gutterContextMenu", (cm, line, eventName, event) =>
         this.onGutterContextMenu(event)
       );
-      
-      codeMirror.on("contextmenu", (cm, event) => this.openMenu(event, cm));
+
+      codeMirror.on("contextmenu", (cm, event) => this.openMenu(event, editor));
     } else {
       codeMirrorWrapper.addEventListener("contextmenu", event =>
-        this.openMenu(event, codeMirror)
+        this.openMenu(event, editor)
       );
     }
 
@@ -310,7 +312,7 @@ class Editor extends PureComponent {
     );
   }
 
-  openMenu(event, codeMirror) {
+  openMenu(event, editor) {
     const {
       selectedSource,
       selectedLocation,
@@ -322,7 +324,7 @@ class Editor extends PureComponent {
     } = this.props;
 
     return EditorMenu({
-      codeMirror,
+      editor,
       event,
       selectedLocation,
       selectedSource,
@@ -417,6 +419,15 @@ class Editor extends PureComponent {
     });
   }
 
+  onClick(e: MouseEvent) {
+    const { selectedLocation, jumpToMappedLocation } = this.props;
+
+    if (e.metaKey && e.altKey) {
+      const sourceLocation = getSourceLocationFromMouseEvent(this.state.editor, selectedLocation, e);
+      jumpToMappedLocation(sourceLocation);
+   }
+  }
+
   toggleConditionalPanel(line) {
     if (this.isCbPanelOpen()) {
       return this.closeConditionalPanel();
diff --git a/src/test/mochitest/browser_dbg-breakpoints-cond.js b/src/test/mochitest/browser_dbg-breakpoints-cond.js
index 1adcf1d3f2..7b124f613c 100644
--- a/src/test/mochitest/browser_dbg-breakpoints-cond.js
+++ b/src/test/mochitest/browser_dbg-breakpoints-cond.js
@@ -39,21 +39,21 @@ add_task(async function() {
   const dbg = await initDebugger("doc-scripts.html");
   await selectSource(dbg, "simple2");
 
-  // Adding a conditional Breakpoint
+  dump('Adding a conditional Breakpoint\n')
   await setConditionalBreakpoint(dbg, 5, "1");
   await waitForDispatch(dbg, "ADD_BREAKPOINT");
   let bp = findBreakpoint(dbg, "simple2", 5);
   is(bp.condition, "1", "breakpoint is created with the condition");
   assertEditorBreakpoint(dbg, 5, true);
 
-  // Editing a conditional Breakpoint
+  dump('Editing a conditional breakpoint\n')
   await setConditionalBreakpoint(dbg, 5, "2");
   await waitForDispatch(dbg, "SET_BREAKPOINT_CONDITION");
   bp = findBreakpoint(dbg, "simple2", 5);
   is(bp.condition, "12", "breakpoint is created with the condition");
   assertEditorBreakpoint(dbg, 5, true);
 
-  // Removing a conditional breakpoint
+  dump("Removing a conditional breakpoint\n")
   clickElement(dbg, "gutter", 5);
   await waitForDispatch(dbg, "REMOVE_BREAKPOINT");
   bp = findBreakpoint(dbg, "simple2", 5);
diff --git a/src/utils/editor/index.js b/src/utils/editor/index.js
index 7ccb2704a1..66e27de0b0 100644
--- a/src/utils/editor/index.js
+++ b/src/utils/editor/index.js
@@ -126,6 +126,19 @@ function lineAtHeight(editor, sourceId, event) {
   return toSourceLine(sourceId, editorLine);
 }
 
+function getSourceLocationFromMouseEvent(editor, selectedLocation, e) {
+  const { line, ch } = editor.codeMirror.coordsChar({
+     left: e.clientX,
+     top: e.clientY
+  });
+
+  return {
+     sourceId: selectedLocation.sourceId,
+     line: line + 1,
+     column: ch + 1
+  };
+}
+
 module.exports = Object.assign(
   {},
   expressionUtils,
@@ -144,6 +157,7 @@ module.exports = Object.assign(
     shouldShowFooter,
     traverseResults,
     markText,
-    lineAtHeight
+    lineAtHeight,
+    getSourceLocationFromMouseEvent
   }
 );

From 23b5cc4623f3b2f17b7d153dc0ec8567830326a9 Mon Sep 17 00:00:00 2001
From: Jason Laster <jason.laster.11@gmail.com>
Date: Tue, 26 Sep 2017 17:51:53 -0400
Subject: [PATCH 2/5] update feature flags

---
 docs/local-development.md | 93 ++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 54 deletions(-)

diff --git a/docs/local-development.md b/docs/local-development.md
index 4f578a5607..96a96b9b9c 100644
--- a/docs/local-development.md
+++ b/docs/local-development.md
@@ -575,7 +575,7 @@ You can check the background / text color contrast ratio with this [tool][contra
 
 ### Configs
 
-The Debugger uses configs for settings like `theme`, `hotReloading`, and feature flags.
+The Debugger uses configs for settings like `theme`, `hotReloading`
 
 The default development configs are in [development-json]. It's easy to change a setting in the Launchpad's settings tab or by updating your `configs/local.json` file.
 
@@ -634,70 +634,55 @@ When you're starting a new feature, it's always good to ask yourself if the feat
 
 It's easy to add a new feature flag to the project.
 
-1. add the flag to `development.json` and `firefox-panel.json`
+1. add the flag to `assets/panel/prefs.js` and `utils/prefs.js`
 2. add `isEnabled` calls in the code
 
 Here's an example of adding a new feature "awesome sauce" to the Debugger:
 
 ```diff
-diff --git a/configs/development.json b/configs/development.json
-index c82b299..d9de5f3 100755
---- a/configs/development.json
-+++ b/configs/development.json
-@@ -14,7 +14,8 @@
-     "eventListeners": {
-       "label": "Event Listeners",
-       "enabled": false
-     },
-     "codeCoverage": {
-       "label": "Code Coverage",
-       "enabled": false
--    }
-+    },
-+    "awesomeSauce": {
-+      "label": "Awesome Sauce",
-+      "enabled": false
-+    }
-   },
-   "chrome": {
-     "debug": true,
-diff --git a/configs/firefox-panel.json b/configs/firefox-panel.json
-index c91b562..bf485bb 100644
---- a/configs/firefox-panel.json
-+++ b/configs/firefox-panel.json
-@@ -10,6 +10,7 @@
-     "eventListeners": {
-       "label": "Event Listeners",
-       "enabled": false
-     },
-     "codeCoverage": {
-       "label": "Code Coverage",
-       "enabled": false
--    }
-+    },
-+    "awesomeSauce": {
-+      "label": "Awesome Sauce",
-+      "enabled": false
-+    }
-   }
- }
-
+diff --git a/assets/panel/prefs.js b/assets/panel/prefs.js
+index 1cfe2da..7e3068f 100644
+--- a/assets/panel/prefs.js
++++ b/assets/panel/prefs.js
+@@ -44,3 +44,4 @@ pref("devtools.debugger.file-search-regex-match", false);
+ pref("devtools.debugger.features.async-stepping", true);
+ pref("devtools.debugger.features.project-text-search", true);
+ pref("devtools.debugger.features.wasm", true);
++pref("devtools.debugger.features.awesome", false);
 diff --git a/src/components/Editor/index.js b/src/components/Editor/index.js
-index 038fd01..ea7a545 100644
+index 47714d3..540c98d 100644
 --- a/src/components/Editor/index.js
 +++ b/src/components/Editor/index.js
-@@ -114,6 +114,10 @@ const Editor = React.createClass({
-       return;
-     }
-
-+    if (isEnabled("awesomeSauce")) {
-+      // sauce goops out of the breakpoint...
-+    }
+@@ -152,7 +152,7 @@ class Editor extends PureComponent {
+       codeMirror.on("gutterContextMenu", (cm, line, eventName, event) =>
+         this.onGutterContextMenu(event)
+       );
+-
 +
-```
+       codeMirror.on("contextmenu", (cm, event) => this.openMenu(event, cm));
+     } else {
+       codeMirrorWrapper.addEventListener("contextmenu", event =>
+diff --git a/src/utils/prefs.js b/src/utils/prefs.js
+index 429d56c..dadb36c 100644
+--- a/src/utils/prefs.js
++++ b/src/utils/prefs.js
+@@ -28,6 +28,7 @@ if (isDevelopment()) {
+   pref("devtools.debugger.features.async-stepping", true);
+   pref("devtools.debugger.features.wasm", true);
+   pref("devtools.debugger.features.shortcuts", true);
++  pref("devtools.debugger.features.awesome", true);
+ }
 
+ export const prefs = new PrefsHelper("devtools", {
+@@ -54,6 +55,7 @@ export const features = new PrefsHelper("devtools.debugger.features", {
+   projectTextSearch: ["Bool", "project-text-search", true],
+   wasm: ["Bool", "wasm", true],
+   shortcuts: ["Bool", "shortcuts", false]
++  awesome: ["Bool", "shortcuts", false]
+ });
 
-* Restart your development server by typing <kbd>ctrl</kbd>+<kbd>c</kbd> in the Terminal and run `yarn start` again
+ if (prefs.debuggerPrefsSchemaVersion !== prefsSchemaVersion) {
+```
 
 ### Hot Reloading :fire:
 

From a6ce4f827c4a833104c67dcad9435386fb7d0534 Mon Sep 17 00:00:00 2001
From: Martin Schmid <martin.schmid@live.com>
Date: Tue, 26 Sep 2017 23:59:32 +0200
Subject: [PATCH 3/5] Preview: Show numbers inside a tooltip (#4164)

---
 src/components/Editor/Preview/Popup.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Editor/Preview/Popup.js b/src/components/Editor/Preview/Popup.js
index 5961b298c5..0118db4222 100644
--- a/src/components/Editor/Preview/Popup.js
+++ b/src/components/Editor/Preview/Popup.js
@@ -185,6 +185,7 @@ export class Popup extends Component {
 
   getPreviewType(value: any) {
     if (
+      typeof value == "number" ||
       typeof value == "boolean" ||
       value.type == "null" ||
       value.type == "undefined" ||

From 5b5362805a4531c62f71d3b913f3e024e07d51d3 Mon Sep 17 00:00:00 2001
From: Tohm Judson <tohm@tohmjudson.com>
Date: Tue, 26 Sep 2017 15:10:25 -0700
Subject: [PATCH 4/5] Update devtools package (#4135)

---
 CONTRIBUTING.md                            |   2 +-
 assets/dictionary.txt                      |  22 +
 docs/debugger-html-react-redux-overview.md |   2 +-
 docs/issues.md                             |   2 +-
 docs/local-development.md                  |   4 +-
 docs/mochitests.md                         |   2 +-
 docs/updates/5-1-2017-tests.md             |   2 +-
 docs/updates/call-stack-4-10-2017.md       |   2 +-
 docs/updates/updates-2-28-2017.md          |   2 +-
 docs/updates/updates-3-14-2017.md          |   2 +-
 docs/updates/updates-3-21-2017.md          |   2 +-
 docs/updates/updates-3-7-2017.md           |   2 +-
 docs/updates/updates-4-18-2017.md          |   2 +-
 docs/updates/updates-5-9-2017.md           |   2 +-
 docs/updates/updates-6-13-2017.md          |   4 +-
 docs/updates/updates-7-25-2017.md          |   2 +-
 docs/updates/updates-8-15-2017.md          |   2 +-
 docs/updates/updates-9-26-2017.md          |   6 +-
 package.json                               |   3 +-
 src/actions/sources.js                     |   2 +-
 yarn.lock                                  | 566 +++++++++++++++------
 21 files changed, 466 insertions(+), 169 deletions(-)
 create mode 100644 assets/dictionary.txt

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 75601a4033..c71cc18020 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,7 @@ Ofcourse, feel free to ask questions in [slack][slack] or share talk slides or v
 
 Our primary goal is to help developers understand they have the skills
 to improve their environment. Writing about DevTools is the best way
-to dispell the myth that what we do is magic.
+to dispel the myth that what we do is magic.
 
 Writing is a great way to share what you learn and articulate your passion.
 Blog posts can either be technical "how x works" or narrative "how we built x".
diff --git a/assets/dictionary.txt b/assets/dictionary.txt
new file mode 100644
index 0000000000..8a54ed96a3
--- /dev/null
+++ b/assets/dictionary.txt
@@ -0,0 +1,22 @@
+sexualized
+dispel
+lifecycle
+Yulia
+intermittents
+discoverable.
+blackboxed
+fixup
+scrollbars
+li
+errored
+Yura
+extns
+travis
+mc
+mochii
+asm
+q4
+featureFlag
+displayNames
+componentDidMount
+.png
diff --git a/docs/debugger-html-react-redux-overview.md b/docs/debugger-html-react-redux-overview.md
index fc988d5429..032b07f580 100644
--- a/docs/debugger-html-react-redux-overview.md
+++ b/docs/debugger-html-react-redux-overview.md
@@ -298,7 +298,7 @@ currently selected in the Debugger.html UI.
 * The loadedObjects object
 stores the currently selected and expanded variable in the scopes pane.
 
-\*\*The expessions object stores all of the current watch expressions,
+\*\*The expressions object stores all of the current watch expressions,
 which is not implemented in the UI yet.
 
 The pause reducer handles the following action types:
diff --git a/docs/issues.md b/docs/issues.md
index b8e1291a53..67a3760912 100644
--- a/docs/issues.md
+++ b/docs/issues.md
@@ -156,7 +156,7 @@ a triaged issue is:
 * in line with the goals of the debugger
 * a single bigger issue that is still manageable
   *or* a set of smaller issues around a shippable goal (for example, transition the code base to JSX from `dom.div` syntax)
-* labelled (see [Labels](#labels) for more info)
+* labeled (see [Labels](#labels) for more info)
 * ready to be worked on,
   *or* has a request for more information
   *or* has a clear next step
diff --git a/docs/local-development.md b/docs/local-development.md
index 96a96b9b9c..5c72671b04 100644
--- a/docs/local-development.md
+++ b/docs/local-development.md
@@ -332,7 +332,7 @@ The `ExpressionState` documents the reducers fields. We use it in three places:
 
 We try to wrap our state in Immutable records when we can for two reasons.
 First it means that the state can only be modified in the reducers.
-Second, it helps our connected components avoid unecessary renders.
+Second, it helps our connected components avoid unnecessary renders.
 
 Connect will trigger a re-render when it sees new state, even if it has not changed.
 Immutable, will creates new objects if and only if the data changes,
@@ -429,7 +429,7 @@ yarn run test-all
 * [matchers][jest-matchers]
 * [mock functions][jest-mock]
 
-Running all the tests tends to be really slow. Most of the time it is realy useful to run a single test. You can do this by invoking jest directly like this:
+Running all the tests tends to be really slow. Most of the time it is really useful to run a single test. You can do this by invoking jest directly like this:
 
 ```bash
 node_modules/jest/bin/jest.js -o
diff --git a/docs/mochitests.md b/docs/mochitests.md
index be8848ef14..16e5a5f226 100644
--- a/docs/mochitests.md
+++ b/docs/mochitests.md
@@ -74,7 +74,7 @@ There are several easy traps that result in intermittents:
 
 * **browser inconsistencies** sometimes the server is not as consistent as you would like. For instance, reloading can sometimes cause sources to load out of order. Also stepping too quickly can cause the debugger to enter a bad state. A memorable example of this type of inconsistency came when debugging stepping behavior. It turns out that 1% of the time the browser toolbox will step into an [unexpected location][server-oops]. The solution is too loosen our expections :)
 * **missed actions** sometimes action "B" can fire before action "A" is done. This is a race condition that can be hard to track down. When you suspect this might happen, it is a good practice to start listening for "B" before you fire action "A". Here's an example where this happened with [reloading][waiting].
-* **state changes** One common way tests start failing occurs when the redux actions introduces a new asynchronous operation. A good way to safe guard your tests is to wait on state to have certain values. An example, of a test that we recently fixed was [pretty printing][pretty-printing]. The test initially waited for the "select source" action to fire, which was occassionaly racey. Switching the test to wait for the formatted source to exist simplified the test tremendously.
+* **state changes** One common way tests start failing occurs when the redux actions introduces a new asynchronous operation. A good way to safe guard your tests is to wait on state to have certain values. An example, of a test that we recently fixed was [pretty printing][pretty-printing]. The test initially waited for the "select source" action to fire, which was occasionally racey. Switching the test to wait for the formatted source to exist simplified the test tremendously.
 
 ### Appendix
 
diff --git a/docs/updates/5-1-2017-tests.md b/docs/updates/5-1-2017-tests.md
index 1b16bb0c07..637cdc7a4f 100644
--- a/docs/updates/5-1-2017-tests.md
+++ b/docs/updates/5-1-2017-tests.md
@@ -14,7 +14,7 @@ if user input like a "click" will fire the appropriate handler.
 
 Jest's default react shallow renderer with enzyme works well for us because it
 limits the scope of the test and lets us focus on the component under testing and
-not necessarily the childen. We also test wrapped components to avoid the connected function and passing in the full application state.
+not necessarily the children. We also test wrapped components to avoid the connected function and passing in the full application state.
 
 With that said, a typical component test will still exercise several the utilities
 and other imported dependencies. We just started writing component tests and our 6 tests
diff --git a/docs/updates/call-stack-4-10-2017.md b/docs/updates/call-stack-4-10-2017.md
index 4cbf6b0643..e9b41af414 100644
--- a/docs/updates/call-stack-4-10-2017.md
+++ b/docs/updates/call-stack-4-10-2017.md
@@ -53,7 +53,7 @@ We're going to experiment with collapsing library frames by default. This will s
 One of the benefits of collapsing the library frames is that it gives an opportunity to
 describe what the library is doing. For example, instead of showing two frames for jQuery \[`elemData.handle`, `event.dispatch`], we can simply show `event`.
 
-Describing the libary functions will help make it clear when a framework is rendering, routing, or doing any other task.
+Describing the library functions will help make it clear when a framework is rendering, routing, or doing any other task.
 
 ![naming]
 
diff --git a/docs/updates/updates-2-28-2017.md b/docs/updates/updates-2-28-2017.md
index 7fb3fcc617..483bbdc08d 100644
--- a/docs/updates/updates-2-28-2017.md
+++ b/docs/updates/updates-2-28-2017.md
@@ -35,7 +35,7 @@ We fixed UI bugs ranging from themes, to accessibility, to RTL. It was an unbeli
 
 #### Bug Fixes
 
-Thanks [@juliandescottes], [@bomsy], [@irfanhudda] for coming in and fixing some pretty embarressing bugs!
+Thanks [@juliandescottes], [@bomsy], [@irfanhudda] for coming in and fixing some pretty embarrassing bugs!
 
 * [Fix source navigation, when switching from vertical to horizontal layouunlink][pr-32] - [@juliandescottes]
 * [Fix watch expression editing][pr-28] - [@bomsy]
diff --git a/docs/updates/updates-3-14-2017.md b/docs/updates/updates-3-14-2017.md
index a3c4dabd33..1cecd44403 100644
--- a/docs/updates/updates-3-14-2017.md
+++ b/docs/updates/updates-3-14-2017.md
@@ -49,7 +49,7 @@ to function search. We also did a lot of UI and UX polish!
 
 #### Preview
 
-Preview is the other major feature that received a lot of love. We made progres on previewing member expressions, which in practice is every object property like `obj.foo.bar.bazz`. We also, landed support for preview `this`, which is a special property.
+Preview is the other major feature that received a lot of love. We made progression previewing member expressions, which in practice is every object property like `obj.foo.bar.bazz`. We also, landed support for preview `this`, which is a special property.
 
 * [Begin member expressions][pr-9] - [@bomsy]
 * [show `this` when it’s in scope][pr-18] - [@jcreighton]
diff --git a/docs/updates/updates-3-21-2017.md b/docs/updates/updates-3-21-2017.md
index 8f9f158dfd..58688bd2a7 100644
--- a/docs/updates/updates-3-21-2017.md
+++ b/docs/updates/updates-3-21-2017.md
@@ -20,7 +20,7 @@ Thanks everyone for a great week!
 
 * [Persist expressions][pr-18] - [@bomsy]
 * [Show message when there are no sources for a page (no files to debug)][pr-3] - [@ktamir]
-* [remove flash of 'not avaliable'][pr-4] - [@bomsy]
+* [remove flash of 'not available'][pr-4] - [@bomsy]
 * [Show hostname first (#1374)][pr-5] - [@Dalimil]
 * [Move search state to redux][pr-6] - [@wldcordeiro]
 * [Overlap breakpoints list scrollbar (#1997) #goodnessSquad][pr-8] - [@noamshemesh]
diff --git a/docs/updates/updates-3-7-2017.md b/docs/updates/updates-3-7-2017.md
index 92bc37f832..c456829705 100644
--- a/docs/updates/updates-3-7-2017.md
+++ b/docs/updates/updates-3-7-2017.md
@@ -32,7 +32,7 @@ Function search took a big jump this week. It now supports searching for ES6 sho
 
 #### Bugs
 
-We're continuing to fix the embarressing bugs. This pause on exception bug was a long standing bug where the pause button would stay highlighted when the debugger opened even if the debugger was not going to pause on exceptions.
+We're continuing to fix the embarrassing bugs. This pause on exception bug was a long standing bug where the pause button would stay highlighted when the debugger opened even if the debugger was not going to pause on exceptions.
 
 * [Persist Pause On Exceptions][pr-0] - [@jasonLaster]
 
diff --git a/docs/updates/updates-4-18-2017.md b/docs/updates/updates-4-18-2017.md
index dbc7e60a6f..4ce74b081a 100644
--- a/docs/updates/updates-4-18-2017.md
+++ b/docs/updates/updates-4-18-2017.md
@@ -2,7 +2,7 @@
 ### April 18th
 
 * We shared our [plans][post] for an improved call stack and landed key features like collapsing framework frames, highlighting libraries, and describing framework names. [1][pr-24], [2][pr-12] Big thanks to [@jbhoosreddy]!
-* [@samjwalker] fixed an embarressing Editor layout issue which caused the debugger to have gaps in the UI!
+* [@samjwalker] fixed an embarrassing Editor layout issue which caused the debugger to have gaps in the UI!
 * Have you ever hunted through the window object to find a global variable? [@bomsy] made previewing Window objects a joy, by highlighting application globals and hiding native properties! [1][pr-1]
 * We emphasized testing last week and dramatically improved our integration tests and added our first Jest component tests. Thanks [@AnshulMalik] for adding our first component unit test!
 
diff --git a/docs/updates/updates-5-9-2017.md b/docs/updates/updates-5-9-2017.md
index 745a3eef73..d56c05ea08 100644
--- a/docs/updates/updates-5-9-2017.md
+++ b/docs/updates/updates-5-9-2017.md
@@ -86,7 +86,7 @@ our inline JS. Ryan wrote a great library for extracting the JS from our html fi
 
 #### Framework frames
 
-![fframes](https://camo.githubusercontent.com/00eeea03c674a65e9e55b11f9e6a15a8fbf1bef2/687474703a2f2f672e7265636f726469742e636f2f767662786457515130422e676966)
+![frames](https://camo.githubusercontent.com/00eeea03c674a65e9e55b11f9e6a15a8fbf1bef2/687474703a2f2f672e7265636f726469742e636f2f767662786457515130422e676966)
 
 #### Tab UI polish
 
diff --git a/docs/updates/updates-6-13-2017.md b/docs/updates/updates-6-13-2017.md
index 8c6e798d8a..7821e15c76 100644
--- a/docs/updates/updates-6-13-2017.md
+++ b/docs/updates/updates-6-13-2017.md
@@ -36,7 +36,7 @@ to have an Atom style modal for symbol searches.
 Some polishing on the editor and function preview
 
 * [fix object property styling on window property names (#2946)][pr-4] - [@jbhoosreddy]
-* [Fix 3146 - editor occassionaly doesn't jump to a line][pr-28] - [@jasonLaster]
+* [Fix 3146 - editor occasionally doesn't jump to a line][pr-28] - [@jasonLaster]
 * [fix null][pr-1] - [@jasonLaster]
 
 #### Releases
@@ -49,7 +49,7 @@ We released a new version of the debugger this week to nightly
 #### Breakpoints
 
 There were a few open issues with breakpoints from last week, including sliding breakpoints on the
-refresh of the debuggy, and problems with the column breakpoint. Those have been resolved
+refresh of the debuggee, and problems with the column breakpoint. Those have been resolved
 
 * [Polish conditional breakpoint][pr-0] - [@zaggy]
 * [Revert breakpoint clearing][pr-14] - [@jasonLaster]
diff --git a/docs/updates/updates-7-25-2017.md b/docs/updates/updates-7-25-2017.md
index 8a3a6d51f1..cf1d1f86f3 100644
--- a/docs/updates/updates-7-25-2017.md
+++ b/docs/updates/updates-7-25-2017.md
@@ -6,7 +6,7 @@
 
 * [Align 'this page has no sources' message][pr-10] - [@belen-albeza]
 * [Show a horizontal scrollbar in the right panel][pr-11] - [@jasonLaster]
-* [Improve soure tree line height][pr-8], [2][pr-21], [3][pr-34] - [@bomsy]
+* [Improve source tree line height][pr-8], [2][pr-21], [3][pr-34] - [@bomsy]
 * [Vuejs callstack][pr-28] - [@clarkbw]
 
 #### Bug Fixes
diff --git a/docs/updates/updates-8-15-2017.md b/docs/updates/updates-8-15-2017.md
index 06d0360591..62f5141e5f 100644
--- a/docs/updates/updates-8-15-2017.md
+++ b/docs/updates/updates-8-15-2017.md
@@ -132,7 +132,7 @@ Call Stack collapsing is coming together really nicely.
 * [Master next][pr-2] - [@jasonLaster]
 * [updates 8-1][pr-3] - [@jasonLaster]
 * [readme clarification][pr-4] - [@Anzumana]
-* [Removed two unsused strings from debugger.properties][pr-5] - [@Ronsho]
+* [Removed two unused strings from debugger.properties][pr-5] - [@Ronsho]
 * [Bump Yarn][pr-16] - [@jasonLaster]
 * [add 8-1 updates to the readme][pr-21] - [@jasonLaster]
 * [handle promise rejection][pr-38] - [@zaggy]
diff --git a/docs/updates/updates-9-26-2017.md b/docs/updates/updates-9-26-2017.md
index a8b08f876c..4c4cb5c231 100644
--- a/docs/updates/updates-9-26-2017.md
+++ b/docs/updates/updates-9-26-2017.md
@@ -30,7 +30,7 @@ We're partnering with 5 college students this semester. The program kicked off t
 #### UX/UI
 
 * [Show full editor context menu for blackboxed tab][pr-1] - [@darkwing]
-* [Fix preview for falsy values][pr-17] - [@nyrosmith]
+* [Fix preview for falsey values][pr-17] - [@nyrosmith]
 * [Show parameter signature within outline][pr-5] - [@darkwing]
 * [Display info when there are no functions to show in Outline][pr-26] - [@nyrosmith]
 * [change cursor][pr-30] - [@oferpa]
@@ -201,10 +201,10 @@ We're spending some time ironing out the rough edges of saved breakpoints. There
 
 #### Code Health
 
-* [remove unecessary css][pr-23] - [@jasonLaster]
+* [remove unnecessary css][pr-23] - [@jasonLaster]
 * [Remove unused CSS rules in Expressions.css][pr-13] - [@gabrielluong]
 * [Replaced use of defer with new Promise, see https://bugzilla.mozilla.…][pr-15] - [@Marcool04]
-* [[WIP] convert from featureFlag to prefs system][pr-20] - [@nyrosmith]
+* [[WIP] convert from feature flag to prefs system][pr-20] - [@nyrosmith]
 * [Refactor match rendering][pr-6] - [@bomsy]
 * [Add missing semicolon in prefs.js][pr-25] - [@darkwing]
 * [prettier fixes][pr-34] - [@jasonLaster]
diff --git a/package.json b/package.json
index dbd4ac96df..08908d1768 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "lint": "run-p lint-css lint-js lint-md",
     "lint-css": "stylelint \"src/components/**/*.css\"",
     "lint-js": "eslint *.js \"src/**/*.js\" --fix",
-    "lint-md": "remark -qf *.md src configs docs",
+    "lint-md": "remark -u devtools-linters/markdown/preset -qf *.md src configs docs",
     "lint-fix": "yarn lint-js -- --fix",
     "mochi":
       "mochii --mc ./firefox --default-test-path devtools/client/debugger/new",
@@ -70,6 +70,7 @@
     "codemirror": "^5.28.0",
     "devtools-components": "^0.0.2",
     "devtools-launchpad": "^0.0.98",
+    "devtools-linters": "^0.0.3",
     "devtools-reps": "^0.12.3",
     "devtools-source-editor": "0.0.6",
     "devtools-source-map": "^0.13.0",
diff --git a/src/actions/sources.js b/src/actions/sources.js
index 24ff933ac1..47c9ba209b 100644
--- a/src/actions/sources.js
+++ b/src/actions/sources.js
@@ -375,7 +375,7 @@ export function toggleBlackBox(source: Source) {
 }
 
 /**
-  Load the text for all the avaliable sources
+  Load the text for all the available sources
  * @memberof actions/sources
  * @static
  */
diff --git a/yarn.lock b/yarn.lock
index 3c0d4f1cda..3e73eb560d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -163,6 +163,10 @@
     react-treebeard "^2.0.3"
     redux "^3.6.0"
 
+"@types/node@^6.0.46":
+  version "6.0.88"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
+
 "@types/node@^7.0.12":
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
@@ -246,7 +250,7 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv-keywords@^2.0.0:
+ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
 
@@ -257,9 +261,9 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.3.tgz#c06f598778c44c6b161abafe3466b81ad1814ed2"
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -907,8 +911,8 @@ babel-plugin-module-resolver@^2.2.0:
     resolve "^1.2.0"
 
 babel-plugin-react-docgen@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.7.0.tgz#87e72d3d54b182a30706b740bb4d116f59aadc80"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.8.0.tgz#e6c2ca718ac225fce4a10cff1765a920f76b9870"
   dependencies:
     babel-types "^6.24.1"
     lodash "4.x.x"
@@ -1988,12 +1992,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000735"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000735.tgz#32bc4a07ef1f247474adb6097a031b94ca97ea9a"
+  version "1.0.30000738"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000738.tgz#84809abc49a390e5a8c224ab9369d3f8d01aa202"
 
 caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726:
-  version "1.0.30000735"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000735.tgz#aab44016ef243e215ef43fd1343efd22930842f8"
+  version "1.0.30000738"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000738.tgz#1820c3c9adb9a117e311a5bdca1d25bc34288eba"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2309,7 +2313,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-comma-separated-tokens@^1.0.1:
+comma-separated-tokens@^1.0.0, comma-separated-tokens@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.4.tgz#72083e58d4a462f01866f6617f4d98a3cd3b8a46"
   dependencies:
@@ -2509,8 +2513,8 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     sha.js "^2.4.8"
 
 create-react-class@^15.5.1:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
@@ -2727,8 +2731,8 @@ debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.3, debug@^2.6.
     ms "2.0.0"
 
 debug@^3.0.0, debug@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
@@ -2930,6 +2934,38 @@ devtools-license-check@^0.5.0:
   dependencies:
     license-checker "^9.0.3"
 
+devtools-linters@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/devtools-linters/-/devtools-linters-0.0.3.tgz#000739f4277c658eb19bbab702f5d9b69a8056c2"
+  dependencies:
+    dictionary-en-us "^2.0.0"
+    rehype-parse "^4.0.0"
+    rehype-retext "^2.0.0"
+    rehype-stringify "^3.0.0"
+    remark-lint-list-item-bullet-indent "^1.0.0"
+    remark-lint-list-item-indent "^1.0.0"
+    remark-lint-no-shortcut-reference-image "^1.0.0"
+    remark-lint-no-shortcut-reference-link "^1.0.0"
+    remark-lint-no-table-indentation "^1.0.0"
+    remark-lint-no-unused-definitions "^1.0.0"
+    remark-lint-ordered-list-marker-style "^1.0.0"
+    remark-lint-table-cell-padding "^1.0.0"
+    remark-lint-table-pipes "^1.0.0"
+    remark-parse "^4.0.0"
+    remark-preset-lint-recommended "^3.0.0"
+    remark-retext "^3.1.0"
+    remark-stringify "^4.0.0"
+    remark-validate-links "^7.0.0"
+    retext-emoji "^4.0.0"
+    retext-english "^3.0.0"
+    retext-quotes "^2.0.0"
+    retext-repeated-words "^1.2.0"
+    retext-sentence-spacing "^2.0.0"
+    retext-spell "^2.3.0"
+    retext-syntax-mentions "^1.1.0"
+    retext-syntax-urls "^1.0.0"
+    unified "^6.1.0"
+
 devtools-map-bindings@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/devtools-map-bindings/-/devtools-map-bindings-0.1.0.tgz#b8296f6fe5f2a50fb8e347339e453579f48d1ee7"
@@ -3018,6 +3054,10 @@ dezalgo@^1.0.0:
     asap "^2.0.0"
     wrappy "1"
 
+dictionary-en-us@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dictionary-en-us/-/dictionary-en-us-2.0.0.tgz#b9135f403444bb5e4b3cf465fb7d3f2fd276a839"
+
 diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
@@ -3202,8 +3242,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18:
-  version "1.3.21"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2"
+  version "1.3.22"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.22.tgz#4322d52c151406e3eaef74ad02676883e8416418"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3229,6 +3269,10 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
+emoticon@^3.0.0, emoticon@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.1.0.tgz#03cb61da1893dca85f8e125e9ed8bfa218c4043b"
+
 encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
@@ -3424,8 +3468,8 @@ eslint-plugin-babel@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-3.3.0.tgz#2f494aedcf6f4aa4e75b9155980837bc1fbde193"
 
 eslint-plugin-flowtype@^2.20.0:
-  version "2.35.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.35.1.tgz#9ad98181b467a3645fbd2a8d430393cc17a4ea63"
+  version "2.36.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.36.0.tgz#ec21cf685dc270c2b24a99bdba1a57999c1040ec"
   dependencies:
     lodash "^4.15.0"
 
@@ -3458,8 +3502,8 @@ eslint-plugin-react@^6.7.1:
     object.assign "^4.0.4"
 
 eslint-plugin-react@^7.2.1:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.3.0.tgz#ca9368da36f733fbdc05718ae4e91f778f38e344"
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.4.0.tgz#300a95861b9729c087d362dd64abcc351a74364a"
   dependencies:
     doctrine "^2.0.0"
     has "^1.0.1"
@@ -3513,49 +3557,7 @@ eslint@^3.12.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-eslint@^4.2.0:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.7.2.tgz#ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"
-  dependencies:
-    ajv "^5.2.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.0.1"
-    doctrine "^2.0.0"
-    eslint-scope "^3.7.1"
-    espree "^3.5.1"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^9.17.0"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "^4.0.1"
-    text-table "~0.2.0"
-
-eslint@^4.7.2:
+eslint@^4.2.0, eslint@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.7.2.tgz#ff6f5f5193848a27ee9b627be3e73fb9cb5e662e"
   dependencies:
@@ -3648,7 +3650,7 @@ esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
-etag@~1.8.0:
+etag@~1.8.0, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
 
@@ -3755,8 +3757,8 @@ expect.js@^0.3.1:
   resolved "https://registry.yarnpkg.com/expect.js/-/expect.js-0.3.1.tgz#b0a59a0d2eff5437544ebf0ceaa6015841d09b5b"
 
 express@^4.13.4, express@^4.15.3:
-  version "4.15.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.15.4.tgz#032e2253489cf8fce02666beca3d11ed7a2daed1"
+  version "4.15.5"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.15.5.tgz#670235ca9598890a5ae8170b83db722b842ed927"
   dependencies:
     accepts "~1.3.3"
     array-flatten "1.1.1"
@@ -3764,13 +3766,13 @@ express@^4.13.4, express@^4.15.3:
     content-type "~1.0.2"
     cookie "0.3.1"
     cookie-signature "1.0.6"
-    debug "2.6.8"
+    debug "2.6.9"
     depd "~1.1.1"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     etag "~1.8.0"
-    finalhandler "~1.0.4"
-    fresh "0.5.0"
+    finalhandler "~1.0.6"
+    fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
@@ -3779,8 +3781,8 @@ express@^4.13.4, express@^4.15.3:
     proxy-addr "~1.1.5"
     qs "6.5.0"
     range-parser "~1.2.0"
-    send "0.15.4"
-    serve-static "1.12.4"
+    send "0.15.6"
+    serve-static "1.12.6"
     setprototypeof "1.0.3"
     statuses "~1.3.1"
     type-is "~1.6.15"
@@ -3895,9 +3897,9 @@ fbjs@^0.6.1:
     ua-parser-js "^0.7.9"
     whatwg-fetch "^0.9.0"
 
-fbjs@^0.8.12, fbjs@^0.8.4, fbjs@^0.8.9:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
+fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -3963,7 +3965,7 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-finalhandler@~1.0.4:
+finalhandler@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
   dependencies:
@@ -4008,8 +4010,8 @@ first-chunk-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
 flat-cache@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
   dependencies:
     circular-json "^0.3.1"
     del "^2.0.2"
@@ -4080,13 +4082,9 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fresh@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
-
-fresh@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.1.tgz#c3a08bcec0fcdcc223edf3b23eb327f1f9fcbf5c"
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
 from@~0:
   version "0.1.7"
@@ -4177,6 +4175,14 @@ geckodriver@=1.4.0:
     got "5.6.0"
     tar.gz "1.0.5"
 
+gemoji@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/gemoji/-/gemoji-2.0.1.tgz#ad23b5f7e989ac7451b9652ccff06e8fad622f06"
+
+gemoji@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/gemoji/-/gemoji-4.2.0.tgz#94b0685497791ab0aabeab7918b13468fa967317"
+
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -4263,8 +4269,8 @@ glamor@^2.20.40:
     through "^2.3.8"
 
 glamorous@^4.1.2:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.9.5.tgz#835245cc7f6885c519485fd113463dba03625ac8"
+  version "4.9.7"
+  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-4.9.7.tgz#78bb008d1404b5bd91ad4d043ec0dc6430ad2653"
   dependencies:
     brcast "^3.0.0"
     fast-memoize "^2.2.7"
@@ -4535,10 +4541,49 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
+hast-util-embedded@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-embedded/-/hast-util-embedded-1.0.0.tgz#49d6114b40933a9d0bd708a3b012378f2cd6e86c"
+  dependencies:
+    hast-util-is-element "^1.0.0"
+
+hast-util-from-parse5@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-2.1.0.tgz#f6123d83d3689630b097e13e430d16d9d1bd8884"
+  dependencies:
+    camelcase "^3.0.0"
+    hastscript "^3.0.0"
+    property-information "^3.1.0"
+    vfile-location "^2.0.0"
+
+hast-util-has-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-has-property/-/hast-util-has-property-1.0.0.tgz#211f9d7f7640898244a33f5d16f5c5d1880c8e40"
+
+hast-util-is-body-ok-link@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.1.tgz#f5d8893f4f21fa1ae51c059ac29abdbc8e6e6046"
+  dependencies:
+    hast-util-has-property "^1.0.0"
+    hast-util-is-element "^1.0.0"
+
 hast-util-is-element@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.0.tgz#3f7216978b2ae14d98749878782675f33be3ce00"
 
+hast-util-parse-selector@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.1.0.tgz#b55c0f4bb7bb2040c889c325ef87ab29c38102b4"
+
+hast-util-phrasing@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-phrasing/-/hast-util-phrasing-1.0.0.tgz#b051f991bc96595c0f756304a478eda48674c448"
+  dependencies:
+    hast-util-embedded "^1.0.0"
+    hast-util-has-property "^1.0.0"
+    hast-util-is-body-ok-link "^1.0.0"
+    hast-util-is-element "^1.0.0"
+
 hast-util-sanitize@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.1.2.tgz#d10bd6757a21e59c13abc8ae3530dd3b6d7d679e"
@@ -4561,10 +4606,37 @@ hast-util-to-html@^3.0.0:
     unist-util-is "^2.0.0"
     xtend "^4.0.1"
 
+hast-util-to-nlcst@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.1.tgz#e250ba8353f0f0a5a32b2df8e151565e8d00603b"
+  dependencies:
+    hast-util-embedded "^1.0.0"
+    hast-util-is-element "^1.0.0"
+    hast-util-phrasing "^1.0.0"
+    hast-util-to-string "^1.0.0"
+    hast-util-whitespace "^1.0.0"
+    nlcst-to-string "^2.0.0"
+    unist-util-position "^3.0.0"
+    vfile-location "^2.0.0"
+
+hast-util-to-string@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hast-util-to-string/-/hast-util-to-string-1.0.1.tgz#b28055cdca012d3c8fd048757c8483d0de0d002c"
+
 hast-util-whitespace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.0.tgz#bd096919625d2936e1ff17bc4df7fd727f17ece9"
 
+hastscript@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-3.1.0.tgz#66628ba6d7f1ad07d9277dd09028aba7f4934599"
+  dependencies:
+    camelcase "^3.0.0"
+    comma-separated-tokens "^1.0.0"
+    hast-util-parse-selector "^2.0.0"
+    property-information "^3.0.0"
+    space-separated-tokens "^1.0.0"
+
 hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -4618,7 +4690,7 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-hosted-git-info@^2.1.4:
+hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
@@ -5427,8 +5499,8 @@ jest-docblock@^20.0.3:
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
 
 jest-docblock@^21.0.0:
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.1.0.tgz#43154be2441fb91403e36bb35cb791a5017cea81"
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
 
 jest-environment-jsdom@^19.0.2:
   version "19.0.2"
@@ -5464,9 +5536,9 @@ jest-file-exists@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-19.0.0.tgz#cca2e587a11ec92e24cfeab3f8a94d657f3fceb8"
 
-jest-get-type@^21.0.2:
-  version "21.0.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.0.2.tgz#304e6b816dd33cd1f47aba0597bcad258a509fc6"
+jest-get-type@^21.2.0:
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
 
 jest-haste-map@^19.0.0:
   version "19.0.2"
@@ -5727,13 +5799,13 @@ jest-validate@^20.0.3:
     pretty-format "^20.0.3"
 
 jest-validate@^21.1.0:
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.1.0.tgz#39d01115544a758bce49f221a5fcbb24ebdecc65"
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.0.tgz#b383fc9c2905c15fac081bd42ffa954457ea705b"
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^21.0.2"
+    jest-get-type "^21.2.0"
     leven "^2.1.0"
-    pretty-format "^21.1.0"
+    pretty-format "^21.2.0"
 
 jest@^19.0.2:
   version "19.0.2"
@@ -5972,8 +6044,8 @@ license-checker@^9.0.3:
     treeify "^1.0.1"
 
 lint-staged@^4.0.1, lint-staged@^4.1.3:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.2.2.tgz#a308ceb3f1031b78c832fbe4570744b3c7fd5a4e"
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.2.3.tgz#5a1f12256af06110b96225f109dbf215009a37a9"
   dependencies:
     app-root-path "^2.0.0"
     chalk "^2.1.0"
@@ -6170,6 +6242,10 @@ lodash.foreach@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
 
+lodash.includes@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -6430,6 +6506,15 @@ mdast-util-to-hast@^2.1.1:
     unist-util-visit "^1.1.0"
     xtend "^4.0.1"
 
+mdast-util-to-nlcst@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.0.tgz#dad262857658d1eab4b5814a20e2f93d7ca1e3b6"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    repeat-string "^1.5.2"
+    unist-util-position "^3.0.0"
+    vfile-location "^2.0.0"
+
 mdast-util-to-string@^1.0.0, mdast-util-to-string@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.4.tgz#5c455c878c9355f0c1e7f3e8b719cf583691acfb"
@@ -6560,8 +6645,8 @@ mime@1.3.x:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
 mime@^1.2.9, mime@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
 mimic-fn@^1.0.0:
   version "1.1.0"
@@ -6719,6 +6804,39 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+nlcst-affix-emoticon-modifier@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nlcst-affix-emoticon-modifier/-/nlcst-affix-emoticon-modifier-1.1.1.tgz#2898ee4c617e56da7cb69694a58b5d53f4e5a865"
+  dependencies:
+    unist-util-modify-children "^1.0.0"
+
+nlcst-emoji-modifier@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nlcst-emoji-modifier/-/nlcst-emoji-modifier-1.1.0.tgz#d1886c76c982edd729a72564e45eccbafc5fe5bf"
+  dependencies:
+    gemoji "^2.0.1"
+    has "^1.0.1"
+    nlcst-to-string "^2.0.0"
+    unist-util-modify-children "^1.0.0"
+
+nlcst-emoticon-modifier@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nlcst-emoticon-modifier/-/nlcst-emoticon-modifier-1.1.1.tgz#c372e32607f703ab42c4362c7d1cfcfc085223cc"
+  dependencies:
+    emoticon "^3.0.0"
+    nlcst-to-string "^2.0.0"
+    unist-util-modify-children "^1.0.0"
+
+nlcst-is-literal@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nlcst-is-literal/-/nlcst-is-literal-1.1.1.tgz#8d8f11dabffebf7526c13a80674e696421becaeb"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+
+nlcst-to-string@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-2.0.1.tgz#f90f3cf905c137dc8edd8727fbcde73e73c2a1d9"
+
 node-dir@^0.1.10:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -6910,6 +7028,13 @@ npmlog@^4.0.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nspell@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/nspell/-/nspell-1.0.3.tgz#2ade9be62ae3769240d37b9d92fe946a817bca90"
+  dependencies:
+    is-buffer "^1.1.4"
+    trim "0.0.1"
+
 nth-check@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
@@ -6925,8 +7050,8 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 "nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.2.tgz#c5e545ab40d22a56b0326531c4beaed7a888b3ea"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
@@ -7147,6 +7272,15 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-english@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/parse-english/-/parse-english-4.1.0.tgz#1a642d955e375e1d4a50cc01957b13c7110b7a5c"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    parse-latin "^4.0.0"
+    unist-util-modify-children "^1.0.0"
+    unist-util-visit-children "^1.0.0"
+
 parse-entities@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.1.1.tgz#8112d88471319f27abae4d64964b122fe4e1b890"
@@ -7187,6 +7321,14 @@ parse-json@^2.1.0, parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-latin@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/parse-latin/-/parse-latin-4.1.0.tgz#f560d46cab1cf04d632815443485a8b3b31e31a7"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-modify-children "^1.0.0"
+    unist-util-visit-children "^1.0.0"
+
 parse-script-tags@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/parse-script-tags/-/parse-script-tags-0.1.1.tgz#db0b4dbe551e946055133c323ed8bcc0e6de6ab7"
@@ -7205,6 +7347,12 @@ parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
 
+parse5@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
+  dependencies:
+    "@types/node" "^6.0.46"
+
 parseurl@~1.3.1, parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
@@ -7678,8 +7826,8 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     supports-color "^3.2.3"
 
 postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.8:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72"
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.12.tgz#6b0155089d2d212f7bd6a0cecd4c58c007403535"
   dependencies:
     chalk "^2.1.0"
     source-map "^0.5.7"
@@ -7722,9 +7870,9 @@ pretty-format@^20.0.3:
     ansi-regex "^2.1.1"
     ansi-styles "^3.0.0"
 
-pretty-format@^21.1.0:
-  version "21.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.1.0.tgz#557428254323832ee8b7c971cb613442bea67f61"
+pretty-format@^21.2.0:
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.0.tgz#8ca29556ad13eed5db48a3096b98bab9c321c6fa"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -7774,11 +7922,12 @@ prop-types@15.5.8:
     fbjs "^0.8.9"
 
 prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9:
-  version "15.5.10"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
   dependencies:
-    fbjs "^0.8.9"
+    fbjs "^0.8.16"
     loose-envify "^1.3.1"
+    object-assign "^4.1.1"
 
 properties-parser@^0.3.1:
   version "0.3.1"
@@ -7786,7 +7935,7 @@ properties-parser@^0.3.1:
   dependencies:
     string.prototype.codepointat "^0.2.0"
 
-property-information@^3.1.0:
+property-information@^3.0.0, property-information@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331"
 
@@ -7876,6 +8025,10 @@ querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+quotation@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quotation/-/quotation-1.1.0.tgz#3f9c9b2e7780856f27c5015bec628d690e82c70d"
+
 radium@^0.19.0:
   version "0.19.4"
   resolved "https://registry.yarnpkg.com/radium/-/radium-0.19.4.tgz#56aa49fde6181d2f5e1fa57b4710ffd0c23de820"
@@ -7952,8 +8105,8 @@ react-docgen@^2.15.0:
     recast "^0.12.6"
 
 react-dom-factories@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.1.tgz#c50692ac5ff1adb39d86dfe6dbe3485dacf58455"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0"
 
 react-dom@=15.3.2:
   version "15.3.2"
@@ -8397,6 +8550,27 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
+rehype-parse@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-4.0.0.tgz#a0a35e02d34fe5e84269881c1cd92d78a6987004"
+  dependencies:
+    hast-util-from-parse5 "^2.0.1"
+    parse5 "^3.0.0"
+    xtend "^4.0.1"
+
+rehype-retext@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rehype-retext/-/rehype-retext-2.0.1.tgz#6b95aafa1f40b65059456ed51481fc3a8e5e89e4"
+  dependencies:
+    hast-util-to-nlcst "^1.0.0"
+
+rehype-stringify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-3.0.0.tgz#9fef0868213c2dce2f780b76f3d0488c85e819eb"
+  dependencies:
+    hast-util-to-html "^3.0.0"
+    xtend "^4.0.1"
+
 remark-cli@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-4.0.0.tgz#bb84c14ffeb6f5b658eff4dfbb77cdd7775bab73"
@@ -8632,6 +8806,12 @@ remark-preset-lint-recommended@^3.0.0:
     remark-lint-no-unused-definitions "^1.0.0"
     remark-lint-ordered-list-marker-style "^1.0.0"
 
+remark-retext@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/remark-retext/-/remark-retext-3.1.0.tgz#1b3df2d49469c0d3596cad86e91503a8b600fdcc"
+  dependencies:
+    mdast-util-to-nlcst "^3.2.0"
+
 remark-slug@^4.0.0, remark-slug@^4.2.1:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-4.2.3.tgz#8d987d0e5e63d4a49ea37b90fe999a3dcfc81b72"
@@ -8678,6 +8858,18 @@ remark-validate-links@^6.1.0:
     urljoin "^0.1.5"
     xtend "^4.0.1"
 
+remark-validate-links@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/remark-validate-links/-/remark-validate-links-7.0.0.tgz#31de803ac4682ea923b68a82560810981853d110"
+  dependencies:
+    hosted-git-info "^2.5.0"
+    mdast-util-definitions "^1.0.0"
+    propose "0.0.5"
+    remark-slug "^4.2.1"
+    unist-util-visit "^1.0.0"
+    urljoin "^0.1.5"
+    xtend "^4.0.1"
+
 remark@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/remark/-/remark-8.0.0.tgz#287b6df2fe1190e263c1d15e486d3fa835594d6d"
@@ -8850,6 +9042,77 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+retext-emoji@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retext-emoji/-/retext-emoji-4.0.0.tgz#3d416f6fdf5b8bff6f0d20419b83a8c0566e6eba"
+  dependencies:
+    emoticon "^3.1.0"
+    gemoji "^4.2.0"
+    nlcst-affix-emoticon-modifier "^1.0.0"
+    nlcst-emoji-modifier "^1.0.0"
+    nlcst-emoticon-modifier "^1.0.0"
+    nlcst-to-string "^2.0.0"
+    unist-util-visit "^1.0.0"
+
+retext-english@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/retext-english/-/retext-english-3.0.0.tgz#c17cb56bd5f1ba3dee3355ddbab79f1c4894a809"
+  dependencies:
+    parse-english "^4.0.0"
+    unherit "^1.0.4"
+
+retext-quotes@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/retext-quotes/-/retext-quotes-2.0.1.tgz#150f76182b08a8cebd1a0dc61017f925476ff829"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-is "^2.0.0"
+    unist-util-visit "^1.1.0"
+
+retext-repeated-words@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/retext-repeated-words/-/retext-repeated-words-1.2.1.tgz#b508d8656276838d7cbdaf8831c1edc5a4faef40"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-is "^2.0.0"
+    unist-util-visit "^1.1.0"
+
+retext-sentence-spacing@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/retext-sentence-spacing/-/retext-sentence-spacing-2.0.1.tgz#0baff1aacce08a9d38b3328ec0dd23c1150bdf66"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    plur "^2.1.2"
+    unist-util-is "^2.0.0"
+    unist-util-visit "^1.1.0"
+
+retext-spell@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/retext-spell/-/retext-spell-2.3.1.tgz#f52ee13797fc4eb52de1e8b9dc3f6fe85ca97bd7"
+  dependencies:
+    lodash.includes "^4.2.0"
+    nlcst-is-literal "^1.0.0"
+    nlcst-to-string "^2.0.0"
+    nspell "^1.0.0"
+    quotation "^1.1.0"
+    unist-util-visit "^1.0.0"
+
+retext-syntax-mentions@^1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/retext-syntax-mentions/-/retext-syntax-mentions-1.1.4.tgz#17e483576a71563352c6211b780c2344bdc57313"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^1.1.0"
+
+retext-syntax-urls@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/retext-syntax-urls/-/retext-syntax-urls-1.0.0.tgz#d559a9c2c1e212aa150cbbad3a94c05adaeaa368"
+  dependencies:
+    nlcst-to-string "^2.0.0"
+    unist-util-modify-children "^1.1.1"
+    unist-util-position "^3.0.0"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -8960,17 +9223,17 @@ selenium-webdriver@=3.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-send@0.15.4:
-  version "0.15.4"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.15.4.tgz#985faa3e284b0273c793364a35c6737bd93905b9"
+send@0.15.6:
+  version "0.15.6"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.15.6.tgz#20f23a9c925b762ab82705fe2f9db252ace47e34"
   dependencies:
-    debug "2.6.8"
+    debug "2.6.9"
     depd "~1.1.1"
     destroy "~1.0.4"
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
-    etag "~1.8.0"
-    fresh "0.5.0"
+    etag "~1.8.1"
+    fresh "0.5.2"
     http-errors "~1.6.2"
     mime "1.3.4"
     ms "2.0.0"
@@ -8979,23 +9242,23 @@ send@0.15.4:
     statuses "~1.3.1"
 
 serve-favicon@^2.4.3:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.4.4.tgz#412ddd74965151c9f74c0828f35d50c5250210de"
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.4.5.tgz#49d9a46863153a9240691c893d2b0e7d85d6d436"
   dependencies:
-    etag "~1.8.0"
-    fresh "0.5.1"
+    etag "~1.8.1"
+    fresh "0.5.2"
     ms "2.0.0"
     parseurl "~1.3.2"
     safe-buffer "5.1.1"
 
-serve-static@1.12.4:
-  version "1.12.4"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.4.tgz#9b6aa98eeb7253c4eedc4c1f6fdbca609901a961"
+serve-static@1.12.6:
+  version "1.12.6"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.6.tgz#b973773f63449934da54e5beba5e31d9f4211577"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
-    parseurl "~1.3.1"
-    send "0.15.4"
+    parseurl "~1.3.2"
+    send "0.15.6"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -9038,10 +9301,11 @@ setprototypeof@1.0.3:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 shallowequal@0.2.x, shallowequal@^0.2.2:
   version "0.2.2"
@@ -9106,6 +9370,12 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
+slice-ansi@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+
 sliced@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
@@ -9221,8 +9491,8 @@ spdx-license-ids@^1.0.2:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 specificity@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.1.tgz#f1b068424ce317ae07478d95de3c21cf85e8d567"
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42"
 
 split-string@^2.1.0:
   version "2.1.1"
@@ -9353,7 +9623,7 @@ string-width@^1.0.0, string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0:
+string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -9622,15 +9892,15 @@ table@^3.7.8:
     string-width "^2.0.0"
 
 table@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
 
 tapable@^0.2.7, tapable@~0.2.5:
   version "0.2.8"
@@ -9951,7 +10221,7 @@ unified-lint-rule@^1.0.0:
   dependencies:
     wrapped "^1.0.1"
 
-unified@^6.0.0:
+unified@^6.0.0, unified@^6.1.0:
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/unified/-/unified-6.1.5.tgz#716937872621a63135e62ced2f3ac6a063c6fb87"
   dependencies:
@@ -10013,7 +10283,7 @@ unist-util-is@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b"
 
-unist-util-modify-children@^1.0.0:
+unist-util-modify-children@^1.0.0, unist-util-modify-children@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-1.1.1.tgz#66d7e6a449e6f67220b976ab3cb8b5ebac39e51d"
   dependencies:
@@ -10033,6 +10303,10 @@ unist-util-stringify-position@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.1.tgz#3ccbdc53679eed6ecf3777dd7f5e3229c1b6aa3c"
 
+unist-util-visit-children@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-children/-/unist-util-visit-children-1.1.1.tgz#eba63b371116231181068837118b6e6e10ec8844"
+
 unist-util-visit@^1.0.0, unist-util-visit@^1.0.1, unist-util-visit@^1.1.0, unist-util-visit@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.1.3.tgz#ec268e731b9d277a79a5b5aa0643990e405d600b"
@@ -10152,8 +10426,8 @@ validate-npm-package-license@^3.0.1:
     spdx-expression-parse "~1.0.0"
 
 vary@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
 velocity-animate@^1.4.0:
   version "1.5.0"

From 2688fffd80d1dd8ff955b318d69eb05b0bb0bb12 Mon Sep 17 00:00:00 2001
From: Jason Laster <jason.laster.11@gmail.com>
Date: Tue, 26 Sep 2017 18:53:38 -0400
Subject: [PATCH 5/5] bump mochii (#4172)

---
 package.json | 8 ++++----
 yarn.lock    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 08908d1768..84c8b4d0a5 100644
--- a/package.json
+++ b/package.json
@@ -30,9 +30,9 @@
     "lint-fix": "yarn lint-js -- --fix",
     "mochi":
       "mochii --mc ./firefox --default-test-path devtools/client/debugger/new",
-    "mochid": "yarn mochi -- --jsdebugger",
-    "mochir": "yarn mochi -- --repeat 10",
-    "mochih": "yarn mochi -- --setenv MOZ_HEADLESS=1",
+    "mochid": "yarn mochi -- --jsdebugger --",
+    "mochir": "yarn mochi -- --repeat 10 --",
+    "mochih": "yarn mochi -- --setenv MOZ_HEADLESS=1 --",
     "test": "jest",
     "test:watch": "jest --watch",
     "test-coverage": "yarn test -- --coverage",
@@ -124,7 +124,7 @@
     "jest-serializer-babel-ast": "^0.0.5",
     "lint-staged": "^4.0.1",
     "mocha": "^3.1.2",
-    "mochii": "^0.0.5",
+    "mochii": "^0.0.7",
     "mock-require": "^2.0.2",
     "node-emoji": "^1.8.1",
     "npm-run-all": "^4.0.2",
diff --git a/yarn.lock b/yarn.lock
index 3e73eb560d..2eb9c8a86c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6722,9 +6722,9 @@ mocha@^3.1.2:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-mochii@^0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mochii/-/mochii-0.0.5.tgz#d62483bc4955921dcdfc8cc0329e6dde83a6bec1"
+mochii@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mochii/-/mochii-0.0.7.tgz#3deca5c25da96fd9b86ce01e91e6d4fae77ee4be"
   dependencies:
     chalk "^2.1.0"
     eslint "^4.7.2"