From 4b44505378794fe1efb7432c5fb0580703d2d728 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 16:50:12 -0500
Subject: [PATCH 01/12] set new bundlesize goal

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 271a4897b0b..1a2ef8287b7 100644
--- a/package.json
+++ b/package.json
@@ -158,7 +158,7 @@
   "bundlesize": [
     {
       "path": "./dist/swagger-ui-bundle.js",
-      "maxSize": "1.5 MB",
+      "maxSize": "1 MB",
       "compression": "none"
     }
   ]

From db9dde85e9c7e86f16467dbfa2f8c514987b4be2 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 17:16:49 -0500
Subject: [PATCH 02/12] preserve `GeneratorFunction` instead of all function
 names

---
 make-webpack-config.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make-webpack-config.js b/make-webpack-config.js
index c9be0b23766..9e98e72a93c 100644
--- a/make-webpack-config.js
+++ b/make-webpack-config.js
@@ -71,10 +71,13 @@ module.exports = function(rules, options) {
     plugins.push(
       new UglifyJsPlugin({
         uglifyOptions: {
-          mangle: specialOptions.mangle,
+          mangle: specialOptions.mangle ? {
+            reserved: ["GeneratorFunction"]
+          } : false,
+          compress: specialOptions.mangle,
           beautify: !specialOptions.mangle,
-          keep_fnames: true
         },
+        
         sourceMap: true,
       }),
       new webpack.LoaderOptionsPlugin({

From 8466409235f8606ae4554f61be97e0b365fa51b7 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 17:22:05 -0500
Subject: [PATCH 03/12] use js-yaml fork that doesn't require esprima

---
 make-webpack-config.js              |  4 ++-
 package-lock.json                   | 45 ++++++++++++++++++++++++++++-
 package.json                        |  2 +-
 src/core/plugins/configs/helpers.js |  2 +-
 src/core/plugins/spec/actions.js    |  2 +-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/make-webpack-config.js b/make-webpack-config.js
index 9e98e72a93c..780fa7c3602 100644
--- a/make-webpack-config.js
+++ b/make-webpack-config.js
@@ -145,7 +145,9 @@ module.exports = function(rules, options) {
         "node_modules"
       ],
       extensions: [".web.js", ".js", ".jsx", ".json", ".less"],
-      alias: {}
+      alias: {
+        "js-yaml": "@kyleshockey/js-yaml"
+      }
     },
 
   devtool: specialOptions.sourcemaps ? "nosource-source-map" : false,
diff --git a/package-lock.json b/package-lock.json
index fdad7ea47fe..4ac69bf3807 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.17.2",
+  "version": "3.17.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -9,6 +9,14 @@
       "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-2.1.0.tgz",
       "integrity": "sha1-VJqdH5I8m8eVOlhdPpqpQpvo/ig="
     },
+    "@kyleshockey/js-yaml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@kyleshockey/js-yaml/-/js-yaml-1.0.1.tgz",
+      "integrity": "sha512-coFyIk1LvTscq1cUU4nCCfYwv+cmG4fCP+wgDKgYZjhM4f++YwZy+g0k+1tUqa4GuUpBTEOGH2KUqKFFWdT73g==",
+      "requires": {
+        "argparse": "^1.0.7"
+      }
+    },
     "@kyleshockey/object-assign-deep": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz",
@@ -4543,6 +4551,36 @@
         }
       }
     },
+    "eslint-plugin-import": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.13.0.tgz",
+      "integrity": "sha512-t6hGKQDMIt9N8R7vLepsYXgDfeuhp6ZJSgtrLEDxonpSubyxUZHjhm6LsAaZX8q6GYVxkbT3kTsV9G5mBCFR6A==",
+      "dev": true,
+      "requires": {
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.1",
+        "eslint-module-utils": "^2.2.0",
+        "has": "^1.0.1",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.3",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.6.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        }
+      }
+    },
     "eslint-plugin-mocha": {
       "version": "4.12.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-4.12.1.tgz",
@@ -16494,6 +16532,11 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
+    "reselect": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-2.5.4.tgz",
+      "integrity": "sha1-t9I/3wC4P6etAnlUb427vXZccEc="
+    },
     "resolve": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
diff --git a/package.json b/package.json
index 1a2ef8287b7..7ab5792321a 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "^2.0.2",
+    "@kyleshockey/js-yaml": "^1.0.1",
     "base64-js": "^1.2.0",
     "classnames": "^2.2.5",
     "commonmark": "^0.28.1",
@@ -53,7 +54,6 @@
     "ieee754": "^1.1.8",
     "immutable": "^3.x.x",
     "js-file-download": "^0.4.1",
-    "js-yaml": "^3.5.5",
     "lodash": "^4.17.10",
     "memoizee": "^0.4.12",
     "prop-types": "^15.5.10",
diff --git a/src/core/plugins/configs/helpers.js b/src/core/plugins/configs/helpers.js
index d36e42774fb..51d8a29a7b8 100644
--- a/src/core/plugins/configs/helpers.js
+++ b/src/core/plugins/configs/helpers.js
@@ -1,4 +1,4 @@
-import YAML from "js-yaml"
+import YAML from "@kyleshockey/js-yaml"
 
 export const parseYamlConfig = (yaml, system) => {
   try {
diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index b062ecf227b..d8b2103c2dd 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -1,4 +1,4 @@
-import YAML from "js-yaml"
+import YAML from "@kyleshockey/js-yaml"
 import { Map } from "immutable"
 import parseUrl from "url-parse"
 import serializeError from "serialize-error"

From dea6d039695b71008548c558294d46316f7620b6 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 17:35:39 -0500
Subject: [PATCH 04/12] set HTML content directly, instead of using
 React-Markdown

---
 package-lock.json                             | 48 +++----------------
 package.json                                  |  1 -
 .../plugins/oas3/wrap-components/markdown.js  |  7 +--
 3 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ac69bf3807..239a18f39d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2938,17 +2938,6 @@
         "string.prototype.repeat": "^0.2.0"
       }
     },
-    "commonmark-react-renderer": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/commonmark-react-renderer/-/commonmark-react-renderer-4.3.4.tgz",
-      "integrity": "sha512-+/Rzo3sI37NR8LaVdkUiqBH3+CEW75hc86shwY4E9eEERg78VCy4rSkaP/p7OG5bTvosUMkvhn5d1ZJ5iyt/ag==",
-      "requires": {
-        "lodash.assign": "^4.2.0",
-        "lodash.isplainobject": "^4.0.6",
-        "pascalcase": "^0.1.1",
-        "xss-filters": "^1.2.6"
-      }
-    },
     "compressible": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
@@ -6802,7 +6791,8 @@
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
     },
     "indent-string": {
       "version": "2.1.0",
@@ -8223,7 +8213,8 @@
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
     },
     "lodash.assignin": {
       "version": "4.2.0",
@@ -8337,7 +8328,8 @@
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
     },
     "lodash.keys": {
       "version": "3.1.2",
@@ -16005,29 +15997,6 @@
         "is-dom": "^1.0.9"
       }
     },
-    "react-markdown": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-2.5.0.tgz",
-      "integrity": "sha1-scYZBP7liViGgDvZ332yPD3DqJ4=",
-      "requires": {
-        "commonmark": "^0.24.0",
-        "commonmark-react-renderer": "^4.2.4",
-        "in-publish": "^2.0.0",
-        "prop-types": "^15.5.1"
-      },
-      "dependencies": {
-        "commonmark": {
-          "version": "0.24.0",
-          "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.24.0.tgz",
-          "integrity": "sha1-uA3gGCxUY1VkOqFdsSv7KCNoJ48=",
-          "requires": {
-            "entities": "~ 1.1.1",
-            "mdurl": "~ 1.0.1",
-            "string.prototype.repeat": "^0.2.0"
-          }
-        }
-      }
-    },
     "react-motion": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
@@ -19715,11 +19684,6 @@
       "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
       "dev": true
     },
-    "xss-filters": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/xss-filters/-/xss-filters-1.2.7.tgz",
-      "integrity": "sha1-Wfod4gHzby80cNysX1jMwoMLCpo="
-    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 7ab5792321a..558ed0c7d26 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "react-immutable-proptypes": "2.1.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-inspector": "^2.3.0",
-    "react-markdown": "^2.5.0",
     "react-motion": "^0.5.2",
     "react-redux": "^4.x.x",
     "react-split-pane": "^0.1.77",
diff --git a/src/core/plugins/oas3/wrap-components/markdown.js b/src/core/plugins/oas3/wrap-components/markdown.js
index 9bfdffb931d..650e099bab1 100644
--- a/src/core/plugins/oas3/wrap-components/markdown.js
+++ b/src/core/plugins/oas3/wrap-components/markdown.js
@@ -1,6 +1,5 @@
 import React from "react"
 import PropTypes from "prop-types"
-import ReactMarkdown from "react-markdown"
 import cx from "classnames"
 import { Parser, HtmlRenderer } from "commonmark"
 import { OAS3ComponentWrapFactory } from "../helpers"
@@ -18,8 +17,10 @@ export const Markdown = ({ source, className = "" }) => {
     }
 
     return (
-      <ReactMarkdown
-        source={sanitized}
+      <div
+        dangerouslySetInnerHTML={{
+          __html: sanitized
+        }}
         className={cx(className, "renderedMarkdown")}
       />
     )

From 2b4b9418146282d805d28c36be982d5e81e13edd Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 18:49:19 -0500
Subject: [PATCH 05/12] use remarkable for all Markdown rendering

---
 package-lock.json                             | 24 ++-----------------
 package.json                                  |  1 -
 .../plugins/oas3/wrap-components/markdown.js  | 12 ++++------
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 239a18f39d2..e52ca05e669 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2927,17 +2927,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "commonmark": {
-      "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
-      "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
-      "requires": {
-        "entities": "~ 1.1.1",
-        "mdurl": "~ 1.0.1",
-        "minimist": "~ 1.2.0",
-        "string.prototype.repeat": "^0.2.0"
-      }
-    },
     "compressible": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
@@ -4217,7 +4206,8 @@
     "entities": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
     },
     "enzyme": {
       "version": "2.9.1",
@@ -8593,11 +8583,6 @@
         "inherits": "^2.0.1"
       }
     },
-    "mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -17923,11 +17908,6 @@
         "function-bind": "^1.0.2"
       }
     },
-    "string.prototype.repeat": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
-      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
-    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
diff --git a/package.json b/package.json
index 558ed0c7d26..995ff8e1005 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "@kyleshockey/js-yaml": "^1.0.1",
     "base64-js": "^1.2.0",
     "classnames": "^2.2.5",
-    "commonmark": "^0.28.1",
     "core-js": "^2.5.1",
     "css.escape": "1.5.1",
     "deep-extend": "0.5.1",
diff --git a/src/core/plugins/oas3/wrap-components/markdown.js b/src/core/plugins/oas3/wrap-components/markdown.js
index 650e099bab1..e825e37cd36 100644
--- a/src/core/plugins/oas3/wrap-components/markdown.js
+++ b/src/core/plugins/oas3/wrap-components/markdown.js
@@ -1,21 +1,17 @@
 import React from "react"
 import PropTypes from "prop-types"
 import cx from "classnames"
-import { Parser, HtmlRenderer } from "commonmark"
+import Remarkable from "remarkable"
 import { OAS3ComponentWrapFactory } from "../helpers"
 import { sanitizer } from "core/components/providers/markdown"
 
+const parser = new Remarkable("commonmark")
+
 export const Markdown = ({ source, className = "" }) => {
   if ( source ) {
-    const parser = new Parser()
-    const writer = new HtmlRenderer()
-    const html = writer.render(parser.parse(source || ""))
+    const html = parser.render(source)
     const sanitized = sanitizer(html)
 
-    if ( !source || !html || !sanitized ) {
-        return null
-    }
-
     return (
       <div
         dangerouslySetInnerHTML={{

From 557675239976cc9693a14a82ae47034d451612fb Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Tue, 10 Jul 2018 23:13:07 -0500
Subject: [PATCH 06/12] add babel-plugin-transform-react-remove-prop-types

---
 .babelrc          | 3 +++
 package-lock.json | 6 ++++++
 package.json      | 1 +
 3 files changed, 10 insertions(+)

diff --git a/.babelrc b/.babelrc
index 50f9abc80f7..db2042afa43 100644
--- a/.babelrc
+++ b/.babelrc
@@ -7,6 +7,9 @@
   "plugins": [
     "transform-runtime",
     "babel-plugin-transform-es2015-constants",
+    ["transform-react-remove-prop-types", {
+      "additionalLibraries": ["react-immutable-proptypes"]
+    }],
     [
       "module-alias",
       [
diff --git a/package-lock.json b/package-lock.json
index e52ca05e669..fe809e5e8b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1531,6 +1531,12 @@
         "babel-runtime": "^6.22.0"
       }
     },
+    "babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.13.tgz",
+      "integrity": "sha1-Mxz8BQmagII4MR14MZwnRg1IEYk=",
+      "dev": true
+    },
     "babel-plugin-transform-regenerator": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
diff --git a/package.json b/package.json
index 995ff8e1005..b844fbbafb2 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "babel-loader": "^7.1.0",
     "babel-plugin-module-alias": "^1.6.0",
     "babel-plugin-transform-es2015-constants": "^6.1.4",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.13",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-es2015-ie": "^6.6.2",

From 9bb5b4fdd36d071e418ef9efdfb901f5f213d201 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Wed, 11 Jul 2018 13:59:34 -0400
Subject: [PATCH 07/12] remove SplitPaneMode plugin

---
 .../components/split-pane-mode.jsx            | 85 -------------------
 src/core/plugins/split-pane-mode/index.js     | 15 ----
 src/core/presets/base.js                      |  2 -
 3 files changed, 102 deletions(-)
 delete mode 100644 src/core/plugins/split-pane-mode/components/split-pane-mode.jsx
 delete mode 100644 src/core/plugins/split-pane-mode/index.js

diff --git a/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx b/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx
deleted file mode 100644
index c1a8fa9c2a9..00000000000
--- a/src/core/plugins/split-pane-mode/components/split-pane-mode.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from "react"
-import PropTypes from "prop-types"
-import SplitPane from "react-split-pane"
-
-const MODE_KEY = ["split-pane-mode"]
-const MODE_LEFT = "left"
-const MODE_RIGHT = "right"
-const MODE_BOTH = "both" // or anything other than left/right
-
-export default class SplitPaneMode extends React.Component {
-
-  static propTypes = {
-    threshold: PropTypes.number,
-
-    children: PropTypes.array,
-
-    layoutSelectors: PropTypes.object.isRequired,
-    layoutActions: PropTypes.object.isRequired,
-  };
-
-  static defaultProps = {
-    threshold: 100, // in pixels
-    children: [],
-  };
-
-  initializeComponent = (c) => {
-    this.splitPane = c
-  }
-
-  onDragFinished = () => {
-    let { threshold, layoutActions } = this.props
-    let { position, draggedSize } = this.splitPane.state
-    this.draggedSize = draggedSize
-
-    let nearLeftEdge = position <= threshold
-    let nearRightEdge = draggedSize <= threshold
-
-    layoutActions
-      .changeMode(MODE_KEY, (
-        nearLeftEdge
-        ? MODE_RIGHT : nearRightEdge
-        ? MODE_LEFT : MODE_BOTH
-      ))
-  }
-
-  sizeFromMode = (mode, defaultSize) => {
-    if(mode === MODE_LEFT) {
-      this.draggedSize = null
-      return "0px"
-    } else if (mode === MODE_RIGHT) {
-      this.draggedSize = null
-      return "100%"
-    }
-    // mode === "both"
-    return this.draggedSize || defaultSize
-  }
-
-  render() {
-    let { children, layoutSelectors } = this.props
-
-    const mode = layoutSelectors.whatMode(MODE_KEY)
-    const left = mode === MODE_RIGHT ? <noscript/> : children[0]
-    const right = mode === MODE_LEFT ? <noscript/> : children[1]
-    const size = this.sizeFromMode(mode, "50%")
-
-    return (
-      <SplitPane
-        disabledClass={""}
-        ref={this.initializeComponent}
-        split='vertical'
-        defaultSize={"50%"}
-        primary="second"
-        minSize={0}
-        size={size}
-        onDragFinished={this.onDragFinished}
-        allowResize={mode !== MODE_LEFT && mode !== MODE_RIGHT }
-        resizerStyle={{"flex": "0 0 auto", "position": "relative"}}
-      >
-        { left }
-        { right }
-      </SplitPane>
-    )
-  }
-
-}
diff --git a/src/core/plugins/split-pane-mode/index.js b/src/core/plugins/split-pane-mode/index.js
deleted file mode 100644
index 913738c48ca..00000000000
--- a/src/core/plugins/split-pane-mode/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import SplitPaneMode from "./components/split-pane-mode"
-export default function SplitPaneModePlugin() {
-  return {
-    // statePlugins: {
-    //   layout: {
-    //     actions,
-    //     selectors,
-    //   }
-    // },
-
-    components: {
-      SplitPaneMode
-    }
-  }
-}
diff --git a/src/core/presets/base.js b/src/core/presets/base.js
index 77cabf598a7..111fd8c5282 100644
--- a/src/core/presets/base.js
+++ b/src/core/presets/base.js
@@ -8,7 +8,6 @@ import ast from "core/plugins/ast"
 import swaggerJs from "core/plugins/swagger-js"
 import auth from "core/plugins/auth"
 import util from "core/plugins/util"
-import SplitPaneModePlugin from "core/plugins/split-pane-mode"
 import downloadUrlPlugin from "core/plugins/download-url"
 import configsPlugin from "core/plugins/configs"
 import deepLinkingPlugin from "core/plugins/deep-linking"
@@ -169,7 +168,6 @@ export default function() {
     jsonSchemaComponents,
     auth,
     ast,
-    SplitPaneModePlugin,
     downloadUrlPlugin,
     deepLinkingPlugin,
     filter,

From 1f4d9228dca1980e2126e1f4b37e11180514a364 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Wed, 11 Jul 2018 16:51:04 -0400
Subject: [PATCH 08/12] remove react-collapse

---
 package-lock.json                    | 54 ----------------------------
 package.json                         |  2 --
 src/core/components/debug.jsx        |  5 +--
 src/core/components/errors.jsx       |  5 +--
 src/core/components/layout-utils.jsx |  9 ++---
 5 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe809e5e8b2..9a26b4b9375 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1974,11 +1974,6 @@
         "hoek": "4.x.x"
       }
     },
-    "bowser": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.3.tgz",
-      "integrity": "sha512-/gp96UlcFw5DbV2KQPCqTqi0Mb9gZRyDAHiDsGEH+4B/KOQjeoE5lM1PxlVX8DQDvfEfitmC1rW2Oy8fk/XBDg=="
-    },
     "boxen": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@@ -3331,15 +3326,6 @@
       "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
-    "css-in-js-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz",
-      "integrity": "sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==",
-      "requires": {
-        "hyphenate-style-name": "^1.0.2",
-        "isobject": "^3.0.1"
-      }
-    },
     "css-loader": {
       "version": "0.28.11",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
@@ -6683,11 +6669,6 @@
       "integrity": "sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=",
       "dev": true
     },
-    "hyphenate-style-name": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
-      "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es="
-    },
     "iconv-lite": {
       "version": "0.4.21",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
@@ -6830,15 +6811,6 @@
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
       "dev": true
     },
-    "inline-style-prefixer": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz",
-      "integrity": "sha1-hVG45bTVcyROZqNLBPfTIHaitTQ=",
-      "requires": {
-        "bowser": "^1.7.3",
-        "css-in-js-utils": "^2.0.0"
-      }
-    },
     "inquirer": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
@@ -15941,14 +15913,6 @@
         "object-assign": "^4.1.0"
       }
     },
-    "react-collapse": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-4.0.3.tgz",
-      "integrity": "sha512-OO4NhtEqFtz+1ma31J1B7+ezdRnzHCZiTGSSd/Pxoks9hxrZYhzFEddeYt05A/1477xTtdrwo7xEa2FLJyWGCQ==",
-      "requires": {
-        "prop-types": "^15.5.8"
-      }
-    },
     "react-debounce-input": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/react-debounce-input/-/react-debounce-input-3.2.0.tgz",
@@ -16011,24 +15975,6 @@
         "prop-types": "^15.5.4"
       }
     },
-    "react-split-pane": {
-      "version": "0.1.77",
-      "resolved": "https://registry.npmjs.org/react-split-pane/-/react-split-pane-0.1.77.tgz",
-      "integrity": "sha512-xq0PPsbkNI9xEd6yTrGPr7hzf6XfIgnsxuUEdRJELq+kLPHMsO3ymFCjhiYP35wlDPn9W46+rHDsJd7LFYteMw==",
-      "requires": {
-        "inline-style-prefixer": "^3.0.6",
-        "prop-types": "^15.5.10",
-        "react-style-proptype": "^3.0.0"
-      }
-    },
-    "react-style-proptype": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/react-style-proptype/-/react-style-proptype-3.2.1.tgz",
-      "integrity": "sha512-Z02QsgmdZ4wYNxJsHhNGGZsIF8+MO93fYmdPaC+ljdqX3rq8tl/fSMXOGBbofGJNzq5W/2LFcONllmV6vzyYHA==",
-      "requires": {
-        "prop-types": "^15.5.4"
-      }
-    },
     "react-test-renderer": {
       "version": "15.6.2",
       "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-15.6.2.tgz",
diff --git a/package.json b/package.json
index b844fbbafb2..6f6b25017da 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
     "prop-types": "^15.5.10",
     "react": "^15.6.2",
     "react-addons-perf": "^15.4.0",
-    "react-collapse": "^4.0.3",
     "react-debounce-input": "^3.2.0",
     "react-dom": "^15.6.2",
     "react-immutable-proptypes": "2.1.0",
@@ -66,7 +65,6 @@
     "react-inspector": "^2.3.0",
     "react-motion": "^0.5.2",
     "react-redux": "^4.x.x",
-    "react-split-pane": "^0.1.77",
     "redux": "^3.x.x",
     "redux-immutable": "3.0.8",
     "remarkable": "^1.7.1",
diff --git a/src/core/components/debug.jsx b/src/core/components/debug.jsx
index 521280049d4..eccd719b4e9 100644
--- a/src/core/components/debug.jsx
+++ b/src/core/components/debug.jsx
@@ -1,6 +1,5 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { Collapse } from "react-collapse"
 import { presets } from "react-motion"
 import ObjectInspector from "react-inspector"
 import Perf from "react-addons-perf"
@@ -25,10 +24,12 @@ export default class Debug extends React.Component {
 
   render() {
 
-    let { getState } = this.props
+    let { getState, getComponent } = this.props
 
     window.props = this.props
 
+    const Collapse = getComponent("Collapse")
+
     return (
       <div className="info">
         <h3><a onClick={this.toggleJsonDump}> {this.plusOrMinus(this.state.jsonDumpOpen)} App </a></h3>
diff --git a/src/core/components/errors.jsx b/src/core/components/errors.jsx
index 459b584a66d..3d61c40911a 100644
--- a/src/core/components/errors.jsx
+++ b/src/core/components/errors.jsx
@@ -1,7 +1,6 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { List } from "immutable"
-import { Collapse } from "react-collapse"
 
 export default class Errors extends React.Component {
 
@@ -13,7 +12,9 @@ export default class Errors extends React.Component {
   }
 
   render() {
-    let { editorActions, errSelectors, layoutSelectors, layoutActions } = this.props
+    let { editorActions, errSelectors, layoutSelectors, layoutActions, getComponent } = this.props
+
+    const Collapse = getComponent("Collapse")
 
     if(editorActions && editorActions.jumpToLine) {
       var jumpToLine = editorActions.jumpToLine
diff --git a/src/core/components/layout-utils.jsx b/src/core/components/layout-utils.jsx
index b8b99ae279d..9f27bb3d888 100644
--- a/src/core/components/layout-utils.jsx
+++ b/src/core/components/layout-utils.jsx
@@ -1,6 +1,5 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { Collapse as OriCollapse } from "react-collapse"
 
 function xclass(...args) {
   return args.filter(a => !!a).join(" ").trim()
@@ -243,11 +242,9 @@ export class Collapse extends React.Component {
 
     children = isOpened ? children : null
     return (
-      <OriCollapse isOpened={isOpened}>
-        <NoMargin>
-          {children}
-        </NoMargin>
-      </OriCollapse>
+      <NoMargin>
+        {children}
+      </NoMargin>
     )
   }
 

From 935f3842ca37748fddd6583d5deb0e326d6e6052 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Wed, 11 Jul 2018 18:04:16 -0400
Subject: [PATCH 09/12] remove AST plugin, and yaml-js

---
 package-lock.json                             |   5 -
 package.json                                  |   1 -
 .../components/auth/authorization-popup.jsx   |   2 +-
 .../ast => components}/jump-to-path.jsx       |   0
 src/core/plugins/ast/ast.js                   | 300 ------------------
 src/core/plugins/ast/index.js                 |   9 -
 src/core/plugins/spec/actions.js              |   8 +-
 src/core/presets/base.js                      |   4 +-
 8 files changed, 8 insertions(+), 321 deletions(-)
 rename src/core/{plugins/ast => components}/jump-to-path.jsx (100%)
 delete mode 100644 src/core/plugins/ast/ast.js
 delete mode 100644 src/core/plugins/ast/index.js

diff --git a/package-lock.json b/package-lock.json
index 9a26b4b9375..2ea1144e1f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19634,11 +19634,6 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
-    "yaml-js": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/yaml-js/-/yaml-js-0.2.3.tgz",
-      "integrity": "sha512-6xUQtVKl1qcd0EXtTEzUDVJy9Ji1fYa47LtkDtYKlIjhibPE9knNPmoRyf6SGREFHlOAUyDe9OdYqRP4DuSi5Q=="
-    },
     "yargs": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
diff --git a/package.json b/package.json
index 6f6b25017da..98a9d53ef05 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,6 @@
     "url-parse": "^1.1.8",
     "xml": "1.0.1",
     "xml-but-prettier": "^1.0.1",
-    "yaml-js": "^0.2.3",
     "zenscroll": "^4.0.2"
   },
   "devDependencies": {
diff --git a/src/core/components/auth/authorization-popup.jsx b/src/core/components/auth/authorization-popup.jsx
index 0746bcb56e7..14406c877cc 100644
--- a/src/core/components/auth/authorization-popup.jsx
+++ b/src/core/components/auth/authorization-popup.jsx
@@ -9,7 +9,7 @@ export default class AuthorizationPopup extends React.Component {
   }
 
   render() {
-    let { authSelectors, authActions, getComponent, errSelectors, specSelectors, fn: { AST } } = this.props
+    let { authSelectors, authActions, getComponent, errSelectors, specSelectors, fn: { AST = {} } } = this.props
     let definitions = authSelectors.shownDefinitions()
     const Auths = getComponent("auths")
 
diff --git a/src/core/plugins/ast/jump-to-path.jsx b/src/core/components/jump-to-path.jsx
similarity index 100%
rename from src/core/plugins/ast/jump-to-path.jsx
rename to src/core/components/jump-to-path.jsx
diff --git a/src/core/plugins/ast/ast.js b/src/core/plugins/ast/ast.js
deleted file mode 100644
index 752f8faf668..00000000000
--- a/src/core/plugins/ast/ast.js
+++ /dev/null
@@ -1,300 +0,0 @@
-import YAML from "yaml-js"
-import isArray from "lodash/isArray"
-import lodashFind from "lodash/find"
-import { memoize } from "core/utils"
-
-let cachedCompose = memoize(YAML.compose) // TODO: build a custom cache based on content
-
-var MAP_TAG = "tag:yaml.org,2002:map"
-var SEQ_TAG = "tag:yaml.org,2002:seq"
-
-export function getLineNumberForPath(yaml, path) {
-
-  // Type check
-  if (typeof yaml !== "string") {
-    throw new TypeError("yaml should be a string")
-  }
-  if (!isArray(path)) {
-    throw new TypeError("path should be an array of strings")
-  }
-
-  var i = 0
-
-  let ast = cachedCompose(yaml)
-
-  // simply walks the tree using current path recursively to the point that
-  // path is empty
-
-  return find(ast, path)
-
-  function find(current, path, last) {
-    if(!current) {
-      // something has gone quite wrong
-      // return the last start_mark as a best-effort
-      if(last && last.start_mark)
-        return last.start_mark.line
-      return 0
-    }
-
-    if (path.length && current.tag === MAP_TAG) {
-      for (i = 0; i < current.value.length; i++) {
-        var pair = current.value[i]
-        var key = pair[0]
-        var value = pair[1]
-
-        if (key.value === path[0]) {
-          return find(value, path.slice(1), current)
-        }
-
-        if (key.value === path[0].replace(/\[.*/, "")) {
-          // access the array at the index in the path (example: grab the 2 in "tags[2]")
-          var index = parseInt(path[0].match(/\[(.*)\]/)[1])
-          if(value.value.length === 1 && index !== 0 && !!index) {
-            var nextVal = lodashFind(value.value[0], { value: index.toString() })
-          } else { // eslint-disable-next-line no-redeclare
-            var nextVal = value.value[index]
-          }
-          return find(nextVal, path.slice(1), value.value)
-        }
-      }
-    }
-
-    if (path.length && current.tag === SEQ_TAG) {
-      var item = current.value[path[0]]
-
-      if (item && item.tag) {
-        return find(item, path.slice(1), current.value)
-      }
-    }
-
-    if (current.tag === MAP_TAG && !Array.isArray(last)) {
-      return current.start_mark.line
-    } else {
-      return current.start_mark.line + 1
-    }
-  }
-}
-
-/**
-* Get a position object with given
-* @param  {string}   yaml
-* YAML or JSON string
-* @param  {array}   path
-* an array of stings that constructs a
-* JSON Path similar to JSON Pointers(RFC 6901). The difference is, each
-* component of path is an item of the array instead of being separated with
-* slash(/) in a string
-*/
-export function positionRangeForPath(yaml, path) {
-
-  // Type check
-  if (typeof yaml !== "string") {
-    throw new TypeError("yaml should be a string")
-  }
-  if (!isArray(path)) {
-    throw new TypeError("path should be an array of strings")
-  }
-
-  var invalidRange = {
-    start: {line: -1, column: -1},
-    end: {line: -1, column: -1}
-  }
-  var i = 0
-
-  let ast = cachedCompose(yaml)
-
-  // simply walks the tree using astValue path recursively to the point that
-  // path is empty.
-  return find(ast)
-
-  function find(astValue, astKeyValue) {
-    if (astValue.tag === MAP_TAG) {
-      for (i = 0; i < astValue.value.length; i++) {
-        var pair = astValue.value[i]
-        var key = pair[0]
-        var value = pair[1]
-
-        if (key.value === path[0]) {
-          path.shift()
-          return find(value, key)
-        }
-      }
-    }
-
-    if (astValue.tag === SEQ_TAG) {
-      var item = astValue.value[path[0]]
-
-      if (item && item.tag) {
-        path.shift()
-        return find(item, astKeyValue)
-      }
-    }
-
-    // if path is still not empty we were not able to find the node
-    if (path.length) {
-      return invalidRange
-    }
-
-    const range = {
-      start: {
-        line: astValue.start_mark.line,
-        column: astValue.start_mark.column,
-        pointer: astValue.start_mark.pointer,
-      },
-      end: {
-        line: astValue.end_mark.line,
-        column: astValue.end_mark.column,
-        pointer: astValue.end_mark.pointer,
-      }
-    }
-
-    if(astKeyValue) {
-      // eslint-disable-next-line camelcase
-      range.key_start = {
-        line: astKeyValue.start_mark.line,
-        column: astKeyValue.start_mark.column,
-        pointer: astKeyValue.start_mark.pointer,
-      }
-      // eslint-disable-next-line camelcase
-      range.key_end = {
-        line: astKeyValue.end_mark.line,
-        column: astKeyValue.end_mark.column,
-        pointer: astKeyValue.end_mark.pointer,
-      }
-    }
-
-    return range
-  }
-}
-
-/**
-* Get a JSON Path for position object in the spec
-* @param  {string} yaml
-* YAML or JSON string
-* @param  {object} position
-* position in the YAML or JSON string with `line` and `column` properties.
-* `line` and `column` number are zero indexed
-*/
-export function pathForPosition(yaml, position) {
-
-  // Type check
-  if (typeof yaml !== "string") {
-    throw new TypeError("yaml should be a string")
-  }
-  if (typeof position !== "object" || typeof position.line !== "number" ||
-  typeof position.column !== "number") {
-    throw new TypeError("position should be an object with line and column" +
-    " properties")
-  }
-
-  try {
-    var ast = cachedCompose(yaml)
-  } catch (e) {
-    console.error("Error composing AST", e)
-    console.error(`Problem area:\n`, yaml.split("\n").slice(position.line - 5, position.line + 5).join("\n"))
-    return null
-  }
-
-
-  var path = []
-
-  return find(ast)
-
-  /**
-  * recursive find function that finds the node matching the position
-  * @param  {object} current - AST object to serach into
-  */
-  function find(current) {
-
-    // algorythm:
-    // is current a promitive?
-    //   // finish recursion without modifying the path
-    // is current a hash?
-    //   // find a key or value that position is in their range
-    //     // if key is in range, terminate recursion with exisiting path
-    //     // if a value is in range push the corresponding key to the path
-    //     //   andcontinue recursion
-    // is current an array
-    //   // find the item that position is in it"s range and push the index
-    //   //  of the item to the path and continue recursion with that item.
-
-    var i = 0
-
-    if (!current || [MAP_TAG, SEQ_TAG].indexOf(current.tag) === -1) {
-      return path
-    }
-
-    if (current.tag === MAP_TAG) {
-      for (i = 0; i < current.value.length; i++) {
-        var pair = current.value[i]
-        var key = pair[0]
-        var value = pair[1]
-
-        if (isInRange(key)) {
-          return path
-        } else if (isInRange(value)) {
-          path.push(key.value)
-          return find(value)
-        }
-      }
-    }
-
-    if (current.tag === SEQ_TAG) {
-      for (i = 0; i < current.value.length; i++) {
-        var item = current.value[i]
-
-        if (isInRange(item)) {
-          path.push(i.toString())
-          return find(item)
-        }
-      }
-    }
-
-    return path
-
-    /**
-    * Determines if position is in node"s range
-    * @param  {object}  node - AST node
-    * @return {Boolean}      true if position is in node"s range
-    */
-    function isInRange(node) {
-      /* jshint camelcase: false */
-
-      // if node is in a single line
-      if (node.start_mark.line === node.end_mark.line) {
-
-        return (position.line === node.start_mark.line) &&
-        (node.start_mark.column <= position.column) &&
-        (node.end_mark.column >= position.column)
-      }
-
-      // if position is in the same line as start_mark
-      if (position.line === node.start_mark.line) {
-        return position.column >= node.start_mark.column
-      }
-
-      // if position is in the same line as end_mark
-      if (position.line === node.end_mark.line) {
-        return position.column <= node.end_mark.column
-      }
-
-      // if position is between start and end lines return true, otherwise
-      // return false.
-      return (node.start_mark.line < position.line) &&
-      (node.end_mark.line > position.line)
-    }
-  }
-}
-
-// utility fns
-
-
-export let pathForPositionAsync = promisifySyncFn(pathForPosition)
-export let positionRangeForPathAsync = promisifySyncFn(positionRangeForPath)
-export let getLineNumberForPathAsync = promisifySyncFn(getLineNumberForPath)
-
-function promisifySyncFn(fn) {
-  return function(...args) {
-    return new Promise((resolve) => resolve(fn(...args)))
-  }
-}
diff --git a/src/core/plugins/ast/index.js b/src/core/plugins/ast/index.js
deleted file mode 100644
index 39bda25073f..00000000000
--- a/src/core/plugins/ast/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import * as AST from "./ast"
-import JumpToPath from "./jump-to-path"
-
-export default function() {
-  return {
-    fn: { AST },
-    components: { JumpToPath }
-  }
-}
diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index d8b2103c2dd..9099089fc2d 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -80,7 +80,7 @@ export const parseToJson = (str) => ({specActions, specSelectors, errActions}) =
 
 let hasWarnedAboutResolveSpecDeprecation = false
 
-export const resolveSpec = (json, url) => ({specActions, specSelectors, errActions, fn: { fetch, resolve, AST }, getConfigs}) => {
+export const resolveSpec = (json, url) => ({specActions, specSelectors, errActions, fn: { fetch, resolve, AST = {} }, getConfigs}) => {
   if(!hasWarnedAboutResolveSpecDeprecation) {
     console.warn(`specActions.resolveSpec is deprecated since v3.10.0 and will be removed in v4.0.0; use requestResolvedSubtree instead!`)
     hasWarnedAboutResolveSpecDeprecation = true
@@ -100,7 +100,7 @@ export const resolveSpec = (json, url) => ({specActions, specSelectors, errActio
     url = specSelectors.url()
   }
 
-  let { getLineNumberForPath } = AST
+  let getLineNumberForPath = AST.getLineNumberForPath ? AST.getLineNumberForPath : () => undefined
 
   let specStr = specSelectors.specStr()
 
@@ -149,7 +149,7 @@ const debResolveSubtrees = debounce(async () => {
       errSelectors,
       fn: {
         resolveSubtree,
-        AST: { getLineNumberForPath }
+        AST = {}
       },
       specSelectors,
       specActions,
@@ -160,6 +160,8 @@ const debResolveSubtrees = debounce(async () => {
     return
   }
 
+  let getLineNumberForPath = AST.getLineNumberForPath ? AST.getLineNumberForPath : () => undefined
+
   const specStr = specSelectors.specStr()
 
   const {
diff --git a/src/core/presets/base.js b/src/core/presets/base.js
index 111fd8c5282..ac7e73e1e92 100644
--- a/src/core/presets/base.js
+++ b/src/core/presets/base.js
@@ -4,7 +4,6 @@ import spec from "core/plugins/spec"
 import view from "core/plugins/view"
 import samples from "core/plugins/samples"
 import logs from "core/plugins/logs"
-import ast from "core/plugins/ast"
 import swaggerJs from "core/plugins/swagger-js"
 import auth from "core/plugins/auth"
 import util from "core/plugins/util"
@@ -51,6 +50,7 @@ import Info, {
   InfoBasePath
 } from "core/components/info"
 import InfoContainer from "core/containers/info"
+import JumpToPath from "core/components/jump-to-path"
 import Footer from "core/components/footer"
 import FilterContainer from "core/containers/filter"
 import ParamBody from "core/components/param-body"
@@ -98,6 +98,7 @@ export default function() {
       liveResponse: LiveResponse,
       info: Info,
       InfoContainer,
+      JumpToPath,
       onlineValidatorBadge: OnlineValidatorBadge,
       operations: Operations,
       operation: Operation,
@@ -167,7 +168,6 @@ export default function() {
     swaggerJs,
     jsonSchemaComponents,
     auth,
-    ast,
     downloadUrlPlugin,
     deepLinkingPlugin,
     filter,

From aaabe7c32b3fec623001e2791a9cd6ba6b5628fd Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Wed, 18 Jul 2018 18:53:49 -0700
Subject: [PATCH 10/12] trim Markdown HTML string output before rendering

---
 src/core/plugins/oas3/wrap-components/markdown.js | 8 +++++++-
 test/components/markdown.js                       | 8 ++++----
 test/xss/markdown-script-sanitization.js          | 4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/core/plugins/oas3/wrap-components/markdown.js b/src/core/plugins/oas3/wrap-components/markdown.js
index e825e37cd36..f78cfdbfe60 100644
--- a/src/core/plugins/oas3/wrap-components/markdown.js
+++ b/src/core/plugins/oas3/wrap-components/markdown.js
@@ -12,10 +12,16 @@ export const Markdown = ({ source, className = "" }) => {
     const html = parser.render(source)
     const sanitized = sanitizer(html)
 
+    let trimmed
+
+    if(typeof sanitized === "string") {
+      trimmed = sanitized.trim()
+    }
+
     return (
       <div
         dangerouslySetInnerHTML={{
-          __html: sanitized
+          __html: trimmed
         }}
         className={cx(className, "renderedMarkdown")}
       />
diff --git a/test/components/markdown.js b/test/components/markdown.js
index ebf765bcbef..d1a3ad3b78b 100644
--- a/test/components/markdown.js
+++ b/test/components/markdown.js
@@ -60,19 +60,19 @@ describe("Markdown component", function() {
         it("allows image elements", function() {
             const str = `![Image alt text](http://image.source "Image title")`
             const el = render(<OAS3Markdown source={str} />)
-            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><p><img title="Image title" alt="Image alt text" src="http://image.source"></p></div></div>`)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><p><img title="Image title" alt="Image alt text" src="http://image.source"></p></div>`)
         })
 
         it("allows image elements with https scheme", function() {
             const str = `![Image alt text](https://image.source "Image title")`
             const el = render(<OAS3Markdown source={str} />)
-            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><p><img title="Image title" alt="Image alt text" src="https://image.source"></p></div></div>`)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><p><img title="Image title" alt="Image alt text" src="https://image.source"></p></div>`)
         })
 
         it("allows image elements with data scheme", function() {
             const str = `<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==">`
             const el = render(<OAS3Markdown source={str} />)
-            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div>` + str + `</div></div>`)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><p>` + str + `</p></div>`)
         })
 
         it("allows heading elements", function() {
@@ -84,7 +84,7 @@ describe("Markdown component", function() {
 ##### h5
 ###### h6`
             const el = render(<OAS3Markdown source={str} />)
-            expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><h1>h1</h1>\n<h2>h2</h2>\n<h3>h3</h3>\n<h4>h4</h4>\n<h5>h5</h5>\n<h6>h6</h6></div></div>`)
+            expect(el.html()).toEqual(`<div class="renderedMarkdown"><h1>h1</h1>\n<h2>h2</h2>\n<h3>h3</h3>\n<h4>h4</h4>\n<h5>h5</h5>\n<h6>h6</h6></div>`)
         })
     })
 })
diff --git a/test/xss/markdown-script-sanitization.js b/test/xss/markdown-script-sanitization.js
index 9d6624c775e..6fcb6338b0a 100644
--- a/test/xss/markdown-script-sanitization.js
+++ b/test/xss/markdown-script-sanitization.js
@@ -24,13 +24,13 @@ describe("Markdown Script Sanitization", function() {
     it("sanitizes <script> elements", function() {
       const str = `script <script>alert(1)</script>`
       const el = render(<OAS3Markdown source={str} />)
-      expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><p>script </p></div></div>`)
+      expect(el.html()).toEqual(`<div class="renderedMarkdown"><p>script </p></div>`)
     })
 
     it("sanitizes <img> elements", function() {
       const str = `<img src=x onerror="alert('img-in-description')">`
       const el = render(<OAS3Markdown source={str} />)
-      expect(el.html()).toEqual(`<div class="renderedMarkdown"><div><img src="x"></div></div>`)
+      expect(el.html()).toEqual(`<div class="renderedMarkdown"><p><img src="x"></p></div>`)
     })
   })
 })

From fc0ee15c4835f5562388bb7982cb86590a34b224 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Wed, 18 Jul 2018 23:21:55 -0700
Subject: [PATCH 11/12] disable obsolete function name preservation

---
 make-webpack-config.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/make-webpack-config.js b/make-webpack-config.js
index 780fa7c3602..c50cd947377 100644
--- a/make-webpack-config.js
+++ b/make-webpack-config.js
@@ -71,9 +71,7 @@ module.exports = function(rules, options) {
     plugins.push(
       new UglifyJsPlugin({
         uglifyOptions: {
-          mangle: specialOptions.mangle ? {
-            reserved: ["GeneratorFunction"]
-          } : false,
+          mangle: specialOptions.mangle,
           compress: specialOptions.mangle,
           beautify: !specialOptions.mangle,
         },

From 9da574e0ac5c34ffbce10070c964aa2a76c761a3 Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 19 Jul 2018 12:42:18 -0700
Subject: [PATCH 12/12] add `getComponent` to propTypes

---
 src/core/components/debug.jsx  | 3 ++-
 src/core/components/errors.jsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/components/debug.jsx b/src/core/components/debug.jsx
index eccd719b4e9..f778e598b38 100644
--- a/src/core/components/debug.jsx
+++ b/src/core/components/debug.jsx
@@ -48,6 +48,7 @@ export default class Debug extends React.Component {
 }
 
 Debug.propTypes = {
-  getState: PropTypes.func.isRequired
+  getState: PropTypes.func.isRequired,
+  getComponent: PropTypes.func.isRequired,
 }
 
diff --git a/src/core/components/errors.jsx b/src/core/components/errors.jsx
index 3d61c40911a..d06128fac2c 100644
--- a/src/core/components/errors.jsx
+++ b/src/core/components/errors.jsx
@@ -8,7 +8,8 @@ export default class Errors extends React.Component {
     editorActions: PropTypes.object,
     errSelectors: PropTypes.object.isRequired,
     layoutSelectors: PropTypes.object.isRequired,
-    layoutActions: PropTypes.object.isRequired
+    layoutActions: PropTypes.object.isRequired,
+    getComponent: PropTypes.func.isRequired,
   }
 
   render() {