Merge branch 'master' into webpack-migration-2.x

# Conflicts: # dist/swagger-ui-bundle.js # dist/swagger-ui-bundle.js.map # dist/swagger-ui-standalone-preset.js # dist/swagger-ui-standalone-preset.js.map # dist/swagger-ui.js # dist/swagger-ui.js.map # package.json # webpack-dist.config.js # webpack-hot-dev-server.config.js
2017-06-28 18:40:52 +02:00
parent e81eee00aa 10c35c4be3
commit 4b85dc55d3
32 changed files with 283 additions and 101 deletions
--- a/webpack-hot-dev-server.config.js
+++ b/webpack-hot-dev-server.config.js
@@ -61,10 +61,11 @@ module.exports = require("./make-webpack-config")(rules, {
 	devtool: "eval",
  entry: {
    'swagger-ui-bundle': [
-      'babel-polyfill',
-      './src/core/index.js',
+      './src/polyfills',
+      './src/core/index.js'
    ],
    'swagger-ui-standalone-preset': [
+      './src/polyfills',
      './src/standalone/index.js',
    ]
  },