migrate webpack to v2.6.1

Author: RVKen

build-tools/loadersByExtension.js

@@ -3,11 +3,8 @@ var path = require('path')
 var webpack = require('webpack')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var deepExtend = require('deep-extend')
-var autoprefixer = require('autoprefixer')
 const {gitDescribeSync} = require('git-describe');
 
-var loadersByExtension = require('./build-tools/loadersByExtension')
-
 var pkg = require('./package.json')
 
 let gitInfo
@@ -21,7 +18,27 @@ try {
   }
 }
 
-module.exports = function(options) {
+var commonRules = [
+  { test: /\.(js(x)?)(\?.*)?$/,
+    use: [{
+      loader: 'babel-loader',
+      options: {
+        retainLines: true
+      }
+    }],
+    include: [ path.join(__dirname, 'src') ]
+  },
+  { test: /\.(txt|yaml)(\?.*)?$/,
+    loader: 'raw-loader' },
+  { test: /\.(png|jpg|jpeg|gif|svg)(\?.*)?$/,
+    loader: 'url-loader?limit=10000' },
+  { test: /\.(woff|woff2)(\?.*)?$/,
+    loader: 'url-loader?limit=100000' },
+  { test: /\.(ttf|eot)(\?.*)?$/,
+    loader: 'file-loader' }
+]
+
+module.exports = function(rules, options) {
 
   // Special options, that have logic in this file
   // ...with defaults
@@ -33,23 +50,11 @@ module.exports = function(options) {
     sourcemaps: false,
   }, options._special)
 
-  var loadersMap = {
-    'js(x)?': {
-      loader: 'babel?retainLines=true',
-      include: [ path.join(__dirname, 'src') ],
-    },
-    'json': 'json-loader',
-    'txt|yaml': 'raw-loader',
-    'png|jpg|jpeg|gif|svg': specialOptions.disableAssets ? 'null-loader' : 'url-loader?limit=10000',
-    'woff|woff2': specialOptions.disableAssets ? 'null-loader' : 'url-loader?limit=100000',
-    'ttf|eot':  specialOptions.disableAssets ? 'null-loader' : 'file-loader',
-    "worker.js": ["worker-loader?inline=true", "babel"]
-  }
-
   var plugins = []
 
   if( specialOptions.separateStylesheets ) {
-    plugins.push(new ExtractTextPlugin('[name].css' + (specialOptions.longTermCaching ? '?[contenthash]' : ''), {
+    plugins.push(new ExtractTextPlugin({
+      filename: '[name].css' + (specialOptions.longTermCaching ? '?[contenthash]' : ''),
       allChunks: true
     }))
   }
@@ -58,11 +63,13 @@ module.exports = function(options) {
 
     plugins.push(
       new webpack.optimize.UglifyJsPlugin({
-        compressor: {
-          warnings: false
-        }
+        sourceMap: true,
       }),
-      new webpack.optimize.DedupePlugin()
+      new webpack.LoaderOptionsPlugin({
+        options: {
+          context: __dirname
+        }
+      })
     )
 
     plugins.push( new webpack.NoErrorsPlugin())
@@ -83,34 +90,7 @@ module.exports = function(options) {
       })
     }))
 
-  var cssLoader = 'css-loader!postcss-loader'
-
-  var completeStylesheetLoaders = deepExtend({
-    'css': cssLoader,
-    'scss': cssLoader + '!' + 'sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true',
-    'less': cssLoader + '!' + 'less-loader',
-  }, specialOptions.stylesheetLoaders)
-
-  if(specialOptions.cssModules) {
-    cssLoader = cssLoader + '?module' +  (specialOptions.minimize ? '' : '&localIdentName=[path][name]---[local]---[hash:base64:5]')
-  }
-
-  Object.keys(completeStylesheetLoaders).forEach(function(ext) {
-    var ori = completeStylesheetLoaders[ext]
-    if(specialOptions.separateStylesheets) {
-      completeStylesheetLoaders[ext] = ExtractTextPlugin.extract('style-loader', ori)
-    } else {
-      completeStylesheetLoaders[ext] = 'style-loader!' + ori
-    }
-  })
-
-  var loaders = loadersByExtension(deepExtend({}, loadersMap, specialOptions.loaders, completeStylesheetLoaders))
-  var extraLoaders = (options.module || {} ).loaders
-
-  if(Array.isArray(extraLoaders)) {
-    loaders = loaders.concat(extraLoaders)
-    delete options.module.loaders
-  }
+  delete options._special
 
   var completeConfig =  deepExtend({
     entry: {},
@@ -130,31 +110,28 @@ module.exports = function(options) {
     },
 
     module: {
-      loaders: loaders,
+      rules: commonRules.concat(rules),
     },
 
     resolveLoader: {
-      root: path.join(__dirname, 'node_modules'),
+      modules: [path.join(__dirname, 'node_modules')],
     },
 
     externals: {
       'buffertools': true // json-react-schema/deeper depends on buffertools, which fails.
     },
 
     resolve: {
-      root: path.join(__dirname, './src'),
-      modulesDirectories: ['node_modules'],
-      extensions: ["", ".web.js", ".js", ".jsx", ".json", ".less"],
-      packageAlias: 'browser',
+      modules: [
+        path.join(__dirname, './src'),
+        'node_modules'
+      ],
+      extensions: [".web.js", ".js", ".jsx", ".json", ".less"],
       alias: {
         base: "getbase/src/less/base"
       }
     },
 
-    postcss: function() {
-      return [autoprefixer]
-    },
-
     devtool: specialOptions.sourcemaps ? 'cheap-module-source-map' : null,
 
     plugins,

dist/swagger-ui-bundle.js

@@ -37,93 +37,94 @@
   "dependencies": {
     "babel-polyfill": "^6.23.0",
     "base64-js": "^1.2.0",
-    "brace": "0.7.0",
+    "brace": "0.10.0",
     "deep-extend": "0.4.1",
     "expect": "1.20.2",
-    "getbase": "^2.8.2",
+    "getbase": "^3.4.2",
     "ieee754": "^1.1.8",
     "immutable": "^3.x.x",
     "js-yaml": "^3.5.5",
     "less": "2.7.1",
-    "lodash": "4.17.2",
-    "matcher": "^0.1.2",
-    "memoizee": "0.4.1",
+    "lodash": "4.17.4",
+    "matcher": "^1.0.0",
+    "memoizee": "0.4.5",
     "promise-worker": "^1.1.1",
     "react": "^15.4.0",
-    "react-addons-perf": "0.14.8",
-    "react-addons-shallow-compare": "0.14.8",
+    "react-addons-perf": "15.4.2",
+    "react-addons-shallow-compare": "15.6.0",
     "react-addons-test-utils": "^15.4.0",
-    "react-collapse": "2.3.1",
+    "react-collapse": "4.0.2",
     "react-dom": "^15.4.0",
-    "react-height": "^2.0.0",
+    "react-height": "^3.0.0",
     "react-hot-loader": "1.3.1",
     "react-immutable-proptypes": "2.1.0",
-    "react-motion": "0.4.4",
+    "react-motion": "0.5.0",
     "react-object-inspector": "0.2.1",
-    "react-redux": "^4.x.x",
+    "react-redux": "^5.x.x",
     "react-remarkable": "1.1.1",
-    "react-split-pane": "0.1.57",
+    "react-split-pane": "0.1.63",
     "redux": "^3.x.x",
-    "redux-immutable": "3.0.8",
+    "redux-immutable": "4.0.0",
     "redux-logger": "*",
-    "reselect": "2.5.3",
+    "reselect": "3.0.1",
     "sanitize-html": "^1.14.1",
-    "serialize-error": "2.0.0",
-    "shallowequal": "0.2.2",
+    "serialize-error": "2.1.0",
+    "shallowequal": "1.0.1",
     "swagger-client": "~3.0.15",
     "url-parse": "^1.1.8",
-    "whatwg-fetch": "0.11.1",
-    "worker-loader": "^0.7.1",
+    "whatwg-fetch": "2.0.3",
+    "worker-loader": "^0.8.0",
     "xml": "1.0.1",
-    "yaml-js": "^0.1.3"
+    "yaml-js": "^0.2.0"
   },
   "devDependencies": {
-    "autoprefixer": "6.6.1",
+    "autoprefixer": "7.1.1",
     "babel-core": "^6.23.1",
     "babel-eslint": "^7.1.1",
-    "babel-loader": "^6.3.2",
+    "babel-loader": "^7.1.0",
     "babel-plugin-module-alias": "^1.6.0",
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-es2015-ie": "^6.6.2",
     "babel-preset-react": "^6.23.0",
     "babel-preset-stage-0": "^6.22.0",
     "babel-runtime": "^6.23.0",
-    "css-loader": "0.22.0",
-    "deep-extend": "^0.4.1",
+    "css-loader": "0.28.4",
+    "deep-extend": "^0.5.0",
     "deepmerge": "^1.3.2",
     "enzyme": "^2.7.1",
-    "eslint": "^2.13.1",
-    "eslint-plugin-react": "^6.10.3",
-    "extract-text-webpack-plugin": "0.8.2",
-    "file-loader": "0.8.4",
+    "eslint": "^4.1.1",
+    "eslint-plugin-import": "^2.6.0",
+    "eslint-plugin-react": "^7.1.0",
+    "extract-text-webpack-plugin": "^2.1.2",
+    "file-loader": "0.11.2",
     "git-describe": "^4.0.1",
     "html-webpack-plugin": "^2.28.0",
-    "imports-loader": "0.6.5",
-    "json-loader": "0.5.3",
-    "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.3",
-    "karma-mocha": "^0.2.2",
+    "imports-loader": "0.7.1",
+    "json-loader": "0.5.4",
+    "karma": "^1.7.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-mocha": "^1.3.0",
     "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "1.8.0",
-    "less": "2.5.3",
-    "less-loader": "2.2.1",
-    "license-checker": "^8.0.4",
-    "mocha": "^2.5.3",
+    "karma-webpack": "2.0.3",
+    "less": "2.7.2",
+    "less-loader": "4.0.4",
+    "license-checker": "^11.0.0",
+    "mocha": "^3.4.2",
     "node-sass": "^4.5.0",
-    "npm-run-all": "3.1.1",
+    "npm-run-all": "4.0.2",
     "null-loader": "0.1.1",
     "open": "0.0.5",
-    "postcss-loader": "0.7.0",
+    "postcss-loader": "2.0.6",
     "raw-loader": "0.5.1",
     "react-hot-loader": "^1.3.1",
     "react-test-renderer": "^15.5.4",
     "rimraf": "^2.6.0",
     "sass-loader": "^6.0.2",
-    "standard": "^8.6.0",
-    "standard-loader": "^5.0.0",
-    "style-loader": "0.13.0",
-    "url-loader": "0.5.6",
-    "webpack": "^1.14.0",
+    "standard": "^10.0.2",
+    "standard-loader": "^6.0.1",
+    "style-loader": "0.18.2",
+    "url-loader": "0.5.9",
+    "webpack": "^2.6.1",
     "webpack-bundle-size-analyzer": "^2.5.0"
   },
   "config": {
@@ -135,6 +136,6 @@
     "IE 10"
   ],
   "optionalDependencies": {
-    "webpack-dev-server": "1.14.0"
+    "webpack-dev-server": "2.5.0"
   }
 }

dist/swagger-ui-bundle.js.map

@@ -0,0 +1 @@
+module.exports = {};