Sync with master (#5370)

* improvement: OAS3 $ref friendly-name regex in model.jsx (via #5334)

* improvement: relax schema description styling so Markdown can be effective (via #5340)

* improvement: add `isShown` check to <ModelCollapse />'s prop `expanded` logic (via #5331)

* security: CVE-2018-20834 (via #5368)

* bump minimum `bundlesize` version

* bump `node-sass`

* bump webpack + webpack-dev-server; update lockfile

* release: v3.22.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.22.1",
+  "version": "3.22.2",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -96,7 +96,7 @@
     "babel-preset-stage-0": "^6.22.0",
     "babel-runtime": "^6.23.0",
     "body-parser": "^1.18.3",
-    "bundlesize": "^0.17.0",
+    "bundlesize": "^0.17.2",
     "chromedriver": "^2.38.3",
     "copy-webpack-plugin": "^4.0.1",
     "cors": "^2.8.4",
@@ -124,7 +124,7 @@
     "license-checker": "^19.0.0",
     "mocha": "^5.1.1",
     "nightwatch": "^0.9.16",
-    "node-sass": "^4.5.0",
+    "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.2",
     "null-loader": "0.1.1",
     "nyc": "^11.3.0",
@@ -143,10 +143,10 @@
     "tachyons-sass": "^4.9.2",
     "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "^1.0.1",
-    "webpack": "^3.1.0",
+    "webpack": "^3.12.0",
     "webpack-bundle-size-analyzer": "^2.5.0",
     "webpack-cli": "^2.0.4",
-    "webpack-dev-server": "^2.11.1",
+    "webpack-dev-server": "^2.11.5",
     "worker-loader": "^1.1.1"
   },
   "config": {

src/core/components/model.jsx

@@ -23,7 +23,7 @@ export default class Model extends ImmutablePureComponent {
       return ref.replace(/^.*#\/definitions\//, "")
     }
     if ( ref.indexOf("#/components/schemas/") !== -1 ) {
-      return ref.replace("#/components/schemas/", "")
+      return ref.replace(/^.*#\/components\/schemas\//, "")
     }
   }
 

src/core/components/models.jsx

@@ -62,10 +62,11 @@ export default class Models extends Component {
 
             const schema = Map.isMap(schemaValue) ? schemaValue : Im.Map()
             const rawSchema = Map.isMap(rawSchemaValue) ? rawSchemaValue : Im.Map()
-            
+
             const displayName = schema.get("title") || rawSchema.get("title") || name
+            const isShown = layoutSelectors.isShown( ["models", name], false )
 
-            if(layoutSelectors.isShown(["models", name], false) && (schema.size === 0 && rawSchema.size > 0)) {
+            if( isShown && (schema.size === 0 && rawSchema.size > 0) ) {
               // Firing an action in a container render is not great,
               // but it works for now.
               this.props.specActions.requestResolvedSubtree([...this.getSchemaBasePath(), name])
@@ -100,7 +101,7 @@ export default class Models extends Component {
                 displayName={displayName}
                 modelName={name}
                 hideSelfOnExpand={true}
-                expanded={defaultModelsExpandDepth > 1}
+                expanded={ defaultModelsExpandDepth > 0 && isShown }
                 >{content}</ModelCollapse>
               </div>
           }).toArray()

src/core/components/object-model.jsx

@@ -79,8 +79,8 @@ export default class ObjectModel extends Component {
             {
               <table className="model"><tbody>
               {
-                !description ? null : <tr style={{ color: "#666", fontStyle: "italic" }}>
-                    <td>description:</td>
+                !description ? null : <tr style={{ color: "#666", fontWeight: "normal" }}>
+                    <td style={{ fontWeight: "bold" }}>description:</td>
                     <td>
                       <Markdown source={ description } />
                     </td>