remove extraneous Webpack alias

.eslintrc

@@ -13,15 +13,11 @@
     }
   },
 
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended"
-  ],
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
 
   "plugins": [
     "react",
-    "mocha",
-    "import"
+    "mocha"
   ],
 
   "rules": {
@@ -38,7 +34,6 @@
     "no-console": ["error", { allow: ["warn", "error"] }],
     "react/jsx-no-bind": 1,
     "react/display-name": 0,
-    "mocha/no-exclusive-tests": "error",
-    "import/no-extraneous-dependencies": [2]
+    "mocha/no-exclusive-tests": "error"
   }
 }

README.md

@@ -20,7 +20,7 @@ The OpenAPI Specification has undergone 5 revisions since initial creation in 20
 
 Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 ------------------ | ------------ | -------------------------- | -----
-3.17.2 | 2018-06-16 | 2.0, 3.0 | [tag v3.17.2](https://github.com/swagger-api/swagger-ui/tree/v3.17.2)
+3.17.1 | 2018-06-16 | 2.0, 3.0 | [tag v3.17.1](https://github.com/swagger-api/swagger-ui/tree/v3.17.1)
 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)

make-webpack-config.js

@@ -73,7 +73,6 @@ module.exports = function(rules, options) {
         uglifyOptions: {
           mangle: specialOptions.mangle,
           beautify: !specialOptions.mangle,
-          keep_fnames: true
         },
         sourceMap: true,
       }),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-ui",
-  "version": "3.17.2",
+  "version": "3.17.1",
   "main": "dist/swagger-ui.js",
   "repository": "git@github.com:swagger-api/swagger-ui.git",
   "contributors": [
@@ -14,7 +14,7 @@
   ],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "run-p --aggregate-output build-core build-bundle build-standalone",
+    "build": "npm run build-core && npm run build-bundle && npm run build-standalone",
     "build-bundle": "webpack --config webpack-dist-bundle.config.js --colors",
     "build-core": "webpack --config webpack-dist.config.js --colors",
     "build-standalone": "webpack --config webpack-dist-standalone.config.js --colors",
@@ -24,19 +24,19 @@
     "hot-server": "webpack-dev-server --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress --content-base dev-helpers/",
     "deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
     "deps-size": "webpack -p --config webpack.check.js --json | webpack-bundle-size-analyzer >| $npm_package_config_deps_check_dir/sizes.txt",
-    "deps-check": "run-s deps-license deps-size",
+    "deps-check": "npm run deps-license && npm run deps-size",
     "lint": "eslint --cache --ext '.js,.jsx' src test",
     "lint-errors": "eslint --cache --quiet --ext '.js,.jsx' src test",
     "lint-fix": "eslint --cache --ext '.js,.jsx' src test --fix",
-    "test": "run-s just-test-in-node lint-errors",
-    "test-in-node": "run-s lint-errors just-test-in-node",
-    "just-test-in-node": "mocha --require test/setup.js --recursive --compilers js:babel-core/register --require source-map-support test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
+    "test": "npm run just-test-in-node && npm run lint-errors",
+    "test-in-node": "npm run lint-errors && npm run just-test-in-node",
+    "just-test-in-node": "mocha --require test/setup.js --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package test/xss",
     "just-check-coverage": "nyc npm run just-test-in-node",
     "test-e2e": "sleep 3 && nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json",
     "e2e-initial-render": "nightwatch test/e2e/scenarios/ --config test/e2e/nightwatch.json --group initial-render",
     "mock-api": "json-server --watch test/e2e/db.json --port 3204",
     "hot-e2e-server": "webpack-dev-server --port 3230 --content-base test/e2e/helpers --host 0.0.0.0 --config webpack-hot-dev-server.config.js --inline --hot --progress",
-    "e2e": "run-p -r hot-e2e-server mock-api test-e2e",
+    "e2e": "npm-run-all --parallel -r hot-e2e-server mock-api test-e2e",
     "open-static": "node -e 'require(\"open\")(\"http://localhost:3002\")'",
     "serve-static": "http-server dist/ -i -a 0.0.0.0 -p 3002",
     "start": "npm-run-all --parallel serve-static open-static"
@@ -72,9 +72,9 @@
     "redux": "^3.x.x",
     "redux-immutable": "3.0.8",
     "remarkable": "^1.7.1",
-    "reselect": "^2.5.4",
+    "reselect": "^3.0.1",
     "serialize-error": "^2.1.0",
-    "swagger-client": "^3.8.7",
+    "swagger-client": "^3.8.5",
     "url-parse": "^1.1.8",
     "xml": "1.0.1",
     "xml-but-prettier": "^1.0.1",
@@ -100,7 +100,7 @@
     "deepmerge": "^2.1.0",
     "enzyme": "^2.7.1",
     "eslint": "^4.1.1",
-    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-mocha": "^4.11.0",
     "eslint-plugin-react": "~7.7.0",
     "expect": "^1.20.2",

src/.eslintrc

@@ -1,10 +0,0 @@
-{
-  "rules": {
-    "import/no-extraneous-dependencies": [
-      2,
-      {
-        "devDependencies": false
-      }
-    ]
-  }
-}

src/core/components/models.jsx

@@ -41,7 +41,6 @@ export default class Models extends Component {
     const ModelWrapper = getComponent("ModelWrapper")
     const Collapse = getComponent("Collapse")
     const ModelCollapse = getComponent("ModelCollapse")
-    const JumpToPath = getComponent("JumpToPath")
 
     return <section className={ showModels ? "models is-open" : "models"}>
       <h4 onClick={() => layoutActions.show("models", !showModels)}>
@@ -65,13 +64,11 @@ export default class Models extends Component {
               this.props.specActions.requestResolvedSubtree([...this.getSchemaBasePath(), name])
             }
 
-            const specPath = Im.List([...specPathBase, name])
-
             const content = <ModelWrapper name={ name }
               expandDepth={ defaultModelsExpandDepth }
               schema={ schema || Im.Map() }
               displayName={displayName}
-              specPath={specPath}
+              specPath={Im.List([...specPathBase, name])}
               getComponent={ getComponent }
               specSelectors={ specSelectors }
               getConfigs = {getConfigs}
@@ -85,7 +82,6 @@ export default class Models extends Component {
             </span>
 
             return <div id={ `model-${name}` } className="model-container" key={ `models-section-${name}` }>
-              <span className="models-jump-to-path"><JumpToPath specPath={specPath} /></span>
               <ModelCollapse
                 classes="model-box"
                 collapsedContent={this.getCollapsedContent(name)}

src/core/components/try-it-out-button.jsx

@@ -21,8 +21,8 @@ export default class TryItOutButton extends React.Component {
     return (
       <div className="try-out">
         {
-          enabled ? <button className="btn try-out__btn cancel" onClick={ onCancelClick }>Cancel</button>
-                  : <button className="btn try-out__btn" onClick={ onTryoutClick }>Try it out </button>
+          enabled ? <button className="btn try-out__btn cancel" onClick={ onTryoutClick }>Cancel</button>
+                  : <button className="btn try-out__btn" onClick={ onCancelClick }>Try it out </button>
         }
       </div>
     )

src/core/containers/OperationContainer.jsx

@@ -113,11 +113,11 @@ export default class OperationContainer extends PureComponent {
     layoutActions.show(["operations", tag, operationId], !isShown)
   }
 
-  onCancelClick=() => {
+  onTryoutClick =() => {
     this.setState({tryItOutEnabled: !this.state.tryItOutEnabled})
   }
 
-  onTryoutClick =() => {
+  onCancelClick =() => {
     let { specActions, path, method } = this.props
     this.setState({tryItOutEnabled: !this.state.tryItOutEnabled})
     specActions.clearValidateParams([path, method])

src/core/plugins/oas3/helpers.js

@@ -2,20 +2,16 @@ import React from "react"
 
 export function isOAS3(jsSpec) {
   const oasVersion = jsSpec.get("openapi")
-  if(typeof oasVersion !== "string") {
+  if(!oasVersion) {
     return false
   }
 
-  // we gate against `3.1` becasue we want to explicitly opt into supporting it
-  // at some point in the future -- KS, 7/2018
-
-  // starts with, but is not `3.0.` exactly
-  return oasVersion.startsWith("3.0.") && oasVersion.length > 4
+  return oasVersion.startsWith("3.0.")
 }
 
 export function isSwagger2(jsSpec) {
   const swaggerVersion = jsSpec.get("swagger")
-  if(typeof swaggerVersion !== "string") {
+  if(!swaggerVersion) {
     return false
   }
 

src/core/plugins/samples/fn.js

@@ -29,7 +29,6 @@ export const sampleFromSchema = (schema, config={}) => {
   let { type, example, properties, additionalProperties, items } = objectify(schema)
   let { includeReadOnly, includeWriteOnly } = config
 
-
   if(example !== undefined) {
     return deeplyStripKey(example, "$$ref", (val) => {
       // do a couple of quick sanity tests to ensure the value

src/core/utils.js

@@ -742,7 +742,7 @@ export const getCommonExtensions = (defObj) => defObj.filter((v, k) => /^pattern
 // `predicate` can be used to discriminate the stripping further,
 // by preserving the key's place in the object based on its value.
 export function deeplyStripKey(input, keyToStrip, predicate = () => true) {
-  if(typeof input !== "object" || Array.isArray(input) || input === null || !keyToStrip) {
+  if(typeof input !== "object" || Array.isArray(input) || !keyToStrip) {
     return input
   }
 

src/style/_models.scss

@@ -166,7 +166,6 @@ section.models
     .model-container
     {
         margin: 0 20px 15px;
-        position: relative;
 
         transition: all .5s;
 
@@ -187,13 +186,6 @@ section.models
         {
             margin: 0 20px;
         }
-
-        .models-jump-to-path {
-          position: absolute;
-          top: 8px;
-          right: 5px;
-          opacity: 0.65;
-        }
     }
 
     .model-box

test/core/plugins/oas3/helpers.js

@@ -1,68 +0,0 @@
-import { fromJS } from "immutable"
-import { isOAS3, isSwagger2 } from "corePlugins/oas3/helpers"
-import expect from "expect"
-
-const isOAS3Shorthand = (version) => isOAS3(fromJS({
-  openapi: version
-}))
-
-const isSwagger2Shorthand = (version) => isSwagger2(fromJS({
-  swagger: version
-}))
-
-describe("isOAS3", function () {
-  it("should recognize valid OAS3 version values", function () {
-    expect(isOAS3Shorthand("3.0.0")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.1")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.11111")).toEqual(true)
-    expect(isOAS3Shorthand("3.0.0-rc0")).toEqual(true)
-  })
-
-  it("should fail for invalid OAS3 version values", function () {
-    expect(isOAS3Shorthand("3.0")).toEqual(false)
-    expect(isOAS3Shorthand("3.0.")).toEqual(false)
-    expect(isOAS3Shorthand("2.0")).toEqual(false)
-  })
-
-  it("should gracefully fail for non-string values", function () {
-    expect(isOAS3Shorthand(3.0)).toEqual(false)
-    expect(isOAS3Shorthand(3)).toEqual(false)
-    expect(isOAS3Shorthand({})).toEqual(false)
-    expect(isOAS3Shorthand(null)).toEqual(false)
-  })
-
-  it("should gracefully fail when `openapi` field is missing", function () {
-    expect(isOAS3(fromJS({
-      openApi: "3.0.0"
-    }))).toEqual(false)
-    expect(isOAS3Shorthand(null)).toEqual(false)
-  })
-})
-
-describe("isSwagger2", function () {
-  it("should recognize valid Swagger 2.0 version values", function () {
-    expect(isSwagger2Shorthand("2.0")).toEqual(true)
-    expect(isSwagger2Shorthand("2.0-rc0")).toEqual(true)
-  })
-
-  it("should fail for invalid Swagger 2.0 version values", function () {
-    expect(isSwagger2Shorthand("3.0")).toEqual(false)
-    expect(isSwagger2Shorthand("3.0.")).toEqual(false)
-    expect(isSwagger2Shorthand("2.1")).toEqual(false)
-    expect(isSwagger2Shorthand("1.2")).toEqual(false)
-    expect(isSwagger2Shorthand("2")).toEqual(false)
-  })
-
-  it("should gracefully fail for non-string values", function () {
-    expect(isSwagger2Shorthand(2.0)).toEqual(false)
-    expect(isSwagger2Shorthand(2)).toEqual(false)
-    expect(isSwagger2Shorthand({})).toEqual(false)
-    expect(isSwagger2Shorthand(null)).toEqual(false)
-  })
-
-  it("should gracefully fail when `swagger` field is missing", function () {
-    expect(isSwagger2(fromJS({
-      Swagger: "2.0"
-    }))).toEqual(false)
-  })
-})

test/core/plugins/samples/fn.js

@@ -379,46 +379,6 @@ describe("sampleFromSchema", function() {
 
       expect(sampleFromSchema(definition)).toEqual(expected)
     })
-
-    it("returns null for a null example", function() {
-      var definition = {
-        "type": "object",
-        "properties": {
-          "foo": {
-            "type": "string",
-            "nullable": true,
-            "example": null
-          }
-        }
-      }
-
-      var expected = {
-        foo: null
-      }
-
-      expect(sampleFromSchema(definition)).toEqual(expected)
-    })
-
-    it("returns null for a null object-level example", function() {
-      var definition = {
-        "type": "object",
-        "properties": {
-          "foo": {
-            "type": "string",
-            "nullable": true
-          }
-        },
-        "example": {
-          "foo": null
-        }
-      }
-
-      var expected = {
-        foo: null
-      }
-
-      expect(sampleFromSchema(definition)).toEqual(expected)
-    })
   })
 })