chore: release v1.6.0

o2team · May 4, 2017 · 6fca99e · 6fca99e
1 parent 7fa3700
commit 6fca99e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elf-cli",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "HTML5 boilerplate and build tool",
   "scripts": {
     "commit": "git-cz",

diff --git a/webpack/plugins.js b/webpack/plugins.js
@@ -99,41 +99,41 @@ HeadJavascriptInjectPlugin.prototype.apply = function (compiler) {
   })
 }
 
-var addOneOrMorePlugins = _.curry(function(pluginClass, plugins, config) {
-    if (_.isArray(config)) {
-        Array.prototype.push.apply(plugins, config.map(function (c) {
-            return new pluginClass(c)
-        }))
-    } else {
-        plugins.push(new pluginClass(config))
-    }
-    return plugins
+var addOneOrMorePlugins = _.curry(function (pluginClass, plugins, options) {
+  if (_.isArray(options)) {
+    Array.prototype.push.apply(plugins, options.map(function (c) {
+      return new pluginClass(c)
+    }))
+  } else {
+    plugins.push(new pluginClass(options))
+  }
+  return plugins
 })
 
-var addZeptoPlugin = function(plugins, config) {
-    plugins.push(new webpack.ProvidePlugin({
-        $: zeptoPath,
-        Zepto: zeptoPath,
-        'window.Zepto': zeptoPath
-    }))
+var addZeptoPlugin = function (plugins, config) {
+  plugins.push(new webpack.ProvidePlugin({
+    $: zeptoPath,
+    Zepto: zeptoPath,
+    'window.Zepto': zeptoPath
+  }))
 }
 
 var addHtmlWebpackPlugins = addOneOrMorePlugins(HtmlWebpackPlugin)
 
 var addCommonChunkPlugins = addOneOrMorePlugins(webpack.optimize.CommonsChunkPlugin)
 
-var addHeadJsInjectPlugin = function(plugins, config) {
-    plugins.push(new HeadJavascriptInjectPlugin())
+var addHeadJsInjectPlugin = function (plugins, config) {
+  plugins.push(new HeadJavascriptInjectPlugin())
 }
 
 var getPlugins = function (config) {
-    var plugins = []
+  var plugins = []
 
-    addZeptoPlugin(plugins, config)
-    addHtmlWebpackPlugins(plugins, config.htmlWebpackPluginOptions)
-    addCommonChunkPlugins(plugins, config.commonsChunkPluginOptions)
-    addHeadJsInjectPlugin(plugins, config)
-    return plugins
+  addZeptoPlugin(plugins, config)
+  addHtmlWebpackPlugins(plugins, config.htmlWebpackPluginOptions)
+  addCommonChunkPlugins(plugins, config.commonsChunkPluginOptions)
+  addHeadJsInjectPlugin(plugins, config)
+  return plugins
 }
 
 exports.HeadJavascriptInjectPlugin = HeadJavascriptInjectPlugin

diff --git a/webpack/webpack.base.js b/webpack/webpack.base.js
@@ -7,7 +7,7 @@ const {
   getPlugins
 } = require('./plugins.js')
 const allConfig = require('../config/index.js')
-const ROOT = process.cwd()
+
 const NODE_ENV = process.env.NODE_ENV || ''
 const config = _.merge({}, allConfig, allConfig[NODE_ENV.toUpperCase()])
 
@@ -33,8 +33,7 @@ const baseConfig = {
       use: [{
         loader: 'exports-loader',
         options: 'window.$'
-      },
-      'script-loader']
+      }, 'script-loader']
     }, {
       test: /\.(mp3|mp4|webm|mov|ogg|ogv)(\?\S*)?$/,
       use: [{