From 4a6716ffed3f71c24f7d2e94ed206895691552f2 Mon Sep 17 00:00:00 2001 From: Josh Ponelat Date: Wed, 19 Apr 2017 11:18:30 +0200 Subject: [PATCH] Replace babel-polyfill with runtime transform --- .babelrc | 1 + make-webpack-config.js | 2 +- package.json | 2 +- src/core/index.js | 1 + webpack-dist-bundle.config.js | 1 - webpack-dist.config.js | 22 ++++++++++------------ webpack-hot-dev-server.config.js | 4 +--- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.babelrc b/.babelrc index c406fe77..bdd50676 100644 --- a/.babelrc +++ b/.babelrc @@ -5,6 +5,7 @@ "stage-0" ], "plugins": [ + "transform-runtime", [ "module-alias", [ diff --git a/make-webpack-config.js b/make-webpack-config.js index 4a92c7d5..199f8cdd 100644 --- 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 index 40ad9d5a..1106faec 100644 --- 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", @@ -83,6 +82,7 @@ "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", diff --git a/src/core/index.js b/src/core/index.js index c68124d4..461a67cd 100644 --- 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/webpack-dist-bundle.config.js b/webpack-dist-bundle.config.js index c20d73b2..7f1c0223 100644 --- a/webpack-dist-bundle.config.js +++ b/webpack-dist-bundle.config.js @@ -13,7 +13,6 @@ module.exports = require('./make-webpack-config.js')({ entry: { 'swagger-ui-bundle': [ - 'babel-polyfill', './src/core/index.js' ] }, diff --git a/webpack-dist.config.js b/webpack-dist.config.js index 2c13b192..95c361de 100644 --- 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,9 +14,8 @@ 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/core/index.js" ] }, @@ -25,11 +23,11 @@ module.exports = require('./make-webpack-config.js')({ // 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 index adafeee2..ded7b61e 100644 --- a/webpack-hot-dev-server.config.js +++ b/webpack-hot-dev-server.config.js @@ -10,9 +10,7 @@ module.exports = require("./make-webpack-config")({ devtool: "eval", entry: { 'swagger-ui-bundle': [ - 'webpack/hot/dev-server', - 'babel-polyfill', - './src/core/index.js', + './src/core/index.js' ], 'swagger-ui-standalone-preset': [ 'webpack/hot/dev-server',