Merge pull request webpack#4 from webpack-china/cn

merge from webpack-china/cn

Author: lcxfs1991

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 npm-debug.log
 build
-# generated
+generated
 .antwar
 .idea

antwar.config.js

@@ -239,6 +239,8 @@ function combineContexts(context1, context2) {
     }
   }
   webpackContext.keys = () => {
+    "use strict";
+
     let keys1 = context1.keys();
     let keys2 = context2.keys();
     return _.chain(keys1).concat(keys2).sortBy().uniq().value();