Merge pull request #535 from webpack/develop

Deploy

Author: SpaceK33z

CONTRIBUTING.md

@@ -14,6 +14,12 @@ From adding an issue for a documentation suggestion to creating a pull request:
 * `npm start`
 * Visit [http://localhost:3000](http://localhost:3000) to preview your changes before making a pull request.
 
+## Contributor License Agreement
+
+When submitting your contribution, a CLA (Contributor License Agreement) bot will come by to verify that you signed the CLA. If it is your first time, it will link you to the right place to sign it. However, if you have committed your contributions using an email that is not the same as your email used on GitHub, the CLA bot can't accept your contribution.
+
+Run `git config user.email` to see your Git email, and verify it with [your GitHub email](https://github.com/settings/emails).
+
 ## Editor Config
 
 The [.editorconfig](https://github.com/webpack/webpack.js.org/blob/develop/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
@@ -88,4 +94,4 @@ This will add your name and Github profile photo to the document in production.
 
 ## Thank you
 
-Webpack is insanely feature rich and documentation is a huge time sink. We greatly appreciate any time spent fixing typos or clarifying sections in the documentation.
+webpack is insanely feature rich and documentation is a huge time sink. We greatly appreciate any time spent fixing typos or clarifying sections in the documentation.

antwar.config.js

@@ -37,6 +37,7 @@ module.exports = {
         );
       }
     ),
+
     'get-started': section(
       'Get-Started',
       function() {
@@ -47,6 +48,7 @@ module.exports = {
         )
       }
     ),
+
     concepts: section(
       'Concepts',
       function() {
@@ -57,6 +59,7 @@ module.exports = {
         );
       }
     ),
+
     guides: section(
       'Guides',
       function() {
@@ -67,6 +70,7 @@ module.exports = {
         );
       }
     ),
+
     configuration: section(
       'Configuration',
       function() {
@@ -77,6 +81,7 @@ module.exports = {
         );
       }
     ),
+
     api: section(
       'API',
       function() {
@@ -87,6 +92,7 @@ module.exports = {
         );
       }
     ),
+
     pluginsapi: section(
       'Plugins API',
       function() {
@@ -97,6 +103,7 @@ module.exports = {
         );
       }
     ),
+
     loaders: section(
       'Loaders',
       function() {
@@ -107,6 +114,7 @@ module.exports = {
         );
       }
     ),
+
     plugins: section(
       'Plugins',
       function() {
@@ -117,14 +125,30 @@ module.exports = {
         );
       }
     ),
-    vote: voteList(
-      'Voting',
-      {
-        index: true,
-        feedback: true,
-        moneyDistribution: true,
+    
+    vote: {
+      path() {
+        return require('./components/vote/list.jsx').default
+      }
+    },
+
+    'vote/feedback': {
+      path() {
+        return require('./components/vote/list.jsx').default
+      }
+    },
+
+    'vote/moneyDistribution': {
+      path() {
+        return require('./components/vote/list.jsx').default
       }
-    )
+    },
+
+    organization: {
+      path() {
+        return require('./components/organization/organization.jsx').default
+      }
+    }
   }
 };
 
@@ -185,45 +209,3 @@ function processPage() {
     }
   };
 }
-
-function voteList(title, lists) {
-  return {
-    title: title,
-    path: function() {
-      function context(request) {
-        var name = /^\.\/(.*)\.md$/.exec(request)[1];
-        return {
-          name: name,
-          __content: '' // make antwar happy
-        };
-      }
-      context.keys = function() {
-        return Object.keys(lists).map(k => './' + k + '.md');
-      };
-      return context;
-    },
-    processPage: {
-      url: function(o) {
-        return 'vote/' + o.file.name;
-      },
-      name: function(o) {
-        return o.file.name;
-      },
-      anchors: function(o) {
-        return [];
-      },
-      content: function(o) {
-        return '';
-      }
-    },
-    layouts: {
-      index: function() {
-        return require('./components/vote/list.jsx').default
-      },
-      page: function() {
-        return require('./components/vote/list.jsx').default
-      }
-    },
-    redirects: {} // <from>: <to>
-  };
-}