Merge pull request #1 from ElemeFE/feature/fix-webpack-plugins

Feature/fix webpack plugins

README.MD

@@ -34,7 +34,16 @@ build mode, output assets to the `dist` directory.
 
 # cooking.conf.js
 
-Configure your webpack.
+```javacript
+module.exports = function(webpack) {
+  return {
+    use: 'vue',
+    port: '8080',
+
+    // Configure your webpack.
+  };
+};
+```
 
 # Inspiration
 [@egoist/tooling](https://github.com/egoist/tooling)

bin/cooking-watch

@@ -7,14 +7,17 @@ var utils = require('./../src/utils');
 var CONTACTS = require('./../src/contacts');
 
 module.exports = function() {
-  var userConfig = utils.loadUserConfig();
+  var baseConfig, userConfig, compiler, port, config;
+
+  userConfig = utils.loadUserConfig(webpack);
   if (!userConfig) {
     return;
   }
-  var config = utils.loadWebpackConfig(CONTACTS.DEV, userConfig.use);
-  var compiler = webpack(utils.webpackMerge(config, userConfig));
-  var port = userConfig.port || 8080;
 
+  baseConfig = utils.loadWebpackConfig(CONTACTS.DEV, userConfig.use);
+  config = utils.webpackMerge(baseConfig, userConfig);
+  compiler = webpack(config);
+  port = userConfig.port || 8080;
   WebpackHotServer({
     config: config,
     port: port,

example/angular/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'angular',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'angular',
+    port: '8080'
+  };
 };

example/react/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'react',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'react',
+    port: '8080'
+  };
 };

example/vue/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'vue',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'vue',
+    port: '8080'
+  };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cooking",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "The basic configuration webpack for your project.",
   "bin": {
     "cooking": "bin/cooking"

src/configs/angular/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'angular',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'angular',
+    port: '8080'
+  };
 };

src/configs/react/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'react',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'react',
+    port: '8080'
+  };
 };

src/configs/vue/cooking.conf.js

@@ -1,4 +1,6 @@
-module.exports = {
-  use: 'vue',
-  port: '8080'
+module.exports = function(webpack) {
+  return {
+    use: 'vue',
+    port: '8080'
+  };
 };

src/utils.js

@@ -16,11 +16,11 @@ module.exports = {
     return path.join(__dirname, '../' + filePath);
   },
 
-  loadUserConfig: function() {
+  loadUserConfig: function(webpack) {
     try {
-      return require(cwd('cooking.conf.js'));
+      return require(cwd('cooking.conf.js'))(webpack);
     } catch(err) {
-      console.error('\ncooking.conf.js not exist. please run "cooking init".\n');
+      throw Error(err);
       return;
     }
   },