Merge branch 'master' into bug/3279-markdown-falsey-values

shockey · web-flow · commit 4fb43fc88616 · 2017-06-22T22:15:33.000-07:00
diff --git a/.babelrc b/.babelrc
@@ -5,6 +5,7 @@
     "stage-0"
   ],
   "plugins": [
+    "transform-runtime",
     [
       "module-alias",
       [
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 
 **This is the new version of swagger-ui, 3.x. Want to learn more? Check out our [FAQ](http://swagger.io/new-ui-faq/).**
 
+**👉🏼 Want to score an easy open-source contribution?** Check out our [Good first contribution](https://github.com/swagger-api/swagger-ui/issues?q=is%3Aissue+is%3Aopen+label%3A%22Good+first+contribution%22) label.
+
 As a brand new version, written from the ground up, there are some known issues and unimplemented features. Check out the [Known Issues](#known-issues) section for more details.
 
 This repo publishes to two different NPM packages:
diff --git a/dist/swagger-ui-bundle.js b/dist/swagger-ui-bundle.js
diff --git a/dist/swagger-ui-bundle.js.map b/dist/swagger-ui-bundle.js.map
diff --git a/dist/swagger-ui-standalone-preset.js b/dist/swagger-ui-standalone-preset.js
diff --git a/dist/swagger-ui-standalone-preset.js.map b/dist/swagger-ui-standalone-preset.js.map
diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
diff --git a/dist/swagger-ui.js.map b/dist/swagger-ui.js.map
diff --git a/make-webpack-config.js b/make-webpack-config.js
@@ -147,7 +147,7 @@ module.exports = function(options) {
       extensions: ["", ".web.js", ".js", ".jsx", ".json", ".less"],
       packageAlias: 'browser',
       alias: {
-        base: "getbase/src/less/base"
+        base: "getbase/src/less/base",
       }
     },
 
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/core test/components test/bugs test/swagger-ui-dist-package"
   },
   "dependencies": {
-    "babel-polyfill": "^6.23.0",
     "base64-js": "^1.2.0",
     "brace": "0.7.0",
     "deep-extend": "0.4.1",
@@ -75,14 +74,15 @@
     "whatwg-fetch": "0.11.1",
     "worker-loader": "^0.7.1",
     "xml": "1.0.1",
-    "yaml-js": "^0.1.3"
+    "yaml-js": "0.2.0"
   },
   "devDependencies": {
     "autoprefixer": "6.6.1",
     "babel-core": "^6.23.1",
     "babel-eslint": "^7.1.1",
     "babel-loader": "^6.3.2",
     "babel-plugin-module-alias": "^1.6.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-es2015-ie": "^6.6.2",
     "babel-preset-react": "^6.23.0",
@@ -132,7 +132,7 @@
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "IE 10"
+    "IE 11"
   ],
   "optionalDependencies": {
     "webpack-dev-server": "1.14.0"
diff --git a/src/core/index.js b/src/core/index.js
@@ -117,6 +117,7 @@ module.exports = function SwaggerUI(opts) {
     return downloadSpec()
   }
 
+  return system
 }
 
 // Add presets
diff --git a/src/core/plugins/spec/reducers.js b/src/core/plugins/spec/reducers.js
@@ -1,6 +1,7 @@
 import { fromJS } from "immutable"
 import { fromJSOrdered, validateParam } from "core/utils"
 import win from "../../window"
+import findIndex from "lodash/findIndex"
 
 import {
 	UPDATE_SPEC,
@@ -41,7 +42,7 @@ export default {
   [UPDATE_PARAM]: ( state, {payload} ) => {
     let { path, paramName, value, isXml } = payload
     return state.updateIn( [ "resolved", "paths", ...path, "parameters" ], fromJS([]), parameters => {
-      let index = parameters.findIndex( p => p.get( "name" ) === paramName )
+      const index = findIndex(parameters, p => p.get( "name" ) === paramName )
       if (!(value instanceof win.File)) {
         value = fromJSOrdered( value )
       }
diff --git a/src/core/utils.js b/src/core/utils.js
@@ -1,9 +1,9 @@
 import Im from "immutable"
-import shallowEqual from "shallowequal"
 
 import camelCase from "lodash/camelCase"
 import upperFirst from "lodash/upperFirst"
 import _memoize from "lodash/memoize"
+import find from "lodash/find"
 import some from "lodash/some"
 import eq from "lodash/eq"
 import { memoizedSampleFromSchema, memoizedCreateXMLExample } from "core/plugins/samples/fn"
@@ -418,11 +418,6 @@ export function pascalCaseFilename(filename) {
   return pascalCase(filename.replace(/\.[^./]*$/, ""))
 }
 
-// Only compare a set of props
-export function shallowEqualKeys(a,b, keys) {
-  return !!keys.find(key => !shallowEqual(a[key], b[key]))
-}
-
 // Check if ...
 // - new props
 // - If immutable, use .is()
@@ -593,3 +588,10 @@ export const filterConfigs = (configs, allowed) => {
 
     return filteredConfigs
 }
+
+// Is this really required as a helper? Perhaps. TODO: expose the system of presets.apis in docs, so we know what is supported
+export const shallowEqualKeys = (a,b, keys) => {
+  return !!find(keys, (key) => {
+    return eq(a[key], b[key])
+  })
+}
diff --git a/src/polyfills.js b/src/polyfills.js
@@ -0,0 +1,2 @@
+// Promise global, Used ( at least ) by 'whatwg-fetch'. And required by IE 11
+require("core-js/fn/promise")
diff --git a/webpack-dist-bundle.config.js b/webpack-dist-bundle.config.js
@@ -13,7 +13,7 @@ module.exports = require('./make-webpack-config.js')({
 
   entry: {
     'swagger-ui-bundle': [
-      'babel-polyfill',
+      './src/polyfills',
       './src/core/index.js'
     ]
   },
diff --git a/webpack-dist-standalone.config.js b/webpack-dist-standalone.config.js
@@ -13,6 +13,7 @@ module.exports = require('./make-webpack-config.js')({
 
   entry: {
     'swagger-ui-standalone-preset': [
+      './src/polyfills',
       './src/standalone/index.js'
     ]
   },
diff --git a/webpack-dist.config.js b/webpack-dist.config.js
@@ -1,9 +1,8 @@
-var path = require('path')
-var fs = require('fs')
-var node_modules = fs.readdirSync('node_modules').filter(function(x) { return x !== '.bin' })
+const path = require("path")
+const fs = require("fs")
+const nodeModules = fs.readdirSync("node_modules").filter(function(x) { return x !== ".bin" })
 
-
-module.exports = require('./make-webpack-config.js')({
+module.exports = require("./make-webpack-config.js")({
   _special: {
     separateStylesheets: true,
     minimize: true,
@@ -15,21 +14,21 @@ module.exports = require('./make-webpack-config.js')({
 
   entry: {
     "swagger-ui": [
-      'babel-polyfill',
-      './src/style/main.scss',
-      './src/core/index.js'
+      "./src/style/main.scss",
+      "./src/polyfills",
+      "./src/core/index.js"
     ]
   },
 
   externals: function(context, request, cb) {
     // webpack injects some stuff into the resulting file,
     // these libs need to be pulled in to keep that working.
     var exceptionsForWebpack = ["ieee754", "base64-js"]
-    if(node_modules.indexOf(request) !== -1 || exceptionsForWebpack.indexOf(request) !== -1) {
-      cb(null, 'commonjs ' + request)
-      return;
+    if(nodeModules.indexOf(request) !== -1 || exceptionsForWebpack.indexOf(request) !== -1) {
+      cb(null, "commonjs " + request)
+      return
     }
-    cb();
+    cb()
   },
 
   output:  {
diff --git a/webpack-hot-dev-server.config.js b/webpack-hot-dev-server.config.js
@@ -10,12 +10,12 @@ module.exports = require("./make-webpack-config")({
 	devtool: "eval",
   entry: {
     'swagger-ui-bundle': [
-      'webpack/hot/dev-server',
-      'babel-polyfill',
-      './src/core/index.js',
+      './src/polyfills',
+      './src/core/index.js'
     ],
     'swagger-ui-standalone-preset': [
       'webpack/hot/dev-server',
+      './src/polyfills',
       './src/standalone/index.js',
     ]
   },

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`"stage-0"`
`6`	`6`	`],`
`7`	`7`	`"plugins": [`
	`8`	`+ "transform-runtime",`
`8`	`9`	`[`
`9`	`10`	`"module-alias",`
`10`	`11`	`[`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ module.exports = function(options) {`
`147`	`147`	`extensions: ["", ".web.js", ".js", ".jsx", ".json", ".less"],`
`148`	`148`	`packageAlias: 'browser',`
`149`	`149`	`alias: {`
`150`		`- base: "getbase/src/less/base"`
	`150`	`+ base: "getbase/src/less/base",`
`151`	`151`	`}`
`152`	`152`	`},`
`153`	`153`