update master(webpack v4 legato & new api docs)

Author: hello-lizhihua

.alexignore

@@ -1 +1 @@
-generated/plugins/npm-install-webpack-plugin.md
+generated/plugins/*

.alexrc

@@ -22,6 +22,7 @@
     "host-hostess",
     "hosts",
     "jade",
+    "kill",
     "laid",
     "lies",
     "period",

.gitignore

@@ -5,4 +5,6 @@ generated
 support-*.json
 starter-kits-data.json
 .antwar
+.vscode
 .idea
+.DS_Store

antwar.bootstrap.js

@@ -7,8 +7,14 @@ process.env.BABEL_ENV = environment;
 
 antwar[environment]({
   environment,
-  antwar: require('./antwar.config'),
-  webpack: require('./webpack.config')
+	configurationPaths: {
+		antwar: require.resolve("./antwar.config.js"),
+		webpack: require.resolve("./webpack.config.js"),
+	},
+}).then(() => {
+	if (environment !== "build") {
+		console.log("Surf to localhost:3000");
+	}
 }).catch((err) => {
   console.error(err);
 

antwar.config.js

@@ -1,15 +1,14 @@
 const path = require('path');
-const _ = require('lodash');
 const combineContexts = require('./src/utilities/combine-contexts');
 
-module.exports = {
+module.exports = () => ({
   maximumWorkers: process.env.TRAVIS && 1,
   template: {
     file: path.join(__dirname, 'template.ejs')
   },
   output: 'build',
-  //title: 'webpack 中文文档',
-  //keywords: ['webpack', 'javascript', 'web development', 'programming'],
+  // title: 'webpack 中文文档',
+  // keywords: ['webpack', 'javascript', 'web development', 'programming'],
   layout: () => require('./src/components/Site/Site.jsx').default,
   paths: {
     '/': {
@@ -24,28 +23,28 @@ module.exports = {
     },
     concepts: {
       title: '概念',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
-      content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/)
+      content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/),
     },
     configuration: {
       title: '配置',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
-      content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/)
+      content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/),
     },
     api: {
       title: 'API',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
       content: () => require.context('./loaders/page-loader!./src/content/api', false, /^\.\/.*\.md$/),
       redirects: {
-        'passing-a-config': 'configuration-types'
-      }
+        'passing-a-config': 'configuration-types',
+      },
     },
     guides: {
       title: '指南',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
       content: () => require.context('./loaders/page-loader!./src/content/guides', false, /^\.\/.*\.md$/),
       redirects: {
@@ -55,79 +54,39 @@ module.exports = {
         'code-splitting-css': '/guides/code-splitting',
         'code-splitting-libraries': '/guides/code-splitting',
         'why-webpack': '/comparison',
-        'production-build': '/guides/production'
-      }
+        'production-build': '/guides/production',
+      },
     },
     plugins: {
       title: '插件',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
       content: () => {
         return combineContexts(
           require.context('./loaders/page-loader!./src/content/plugins', false, /^\.\/.*\.md$/),
-          require.context('./loaders/page-loader!./generated/plugins', false, /^\.\/.*\.md$/)
-        );
-      }
+          require.context('./loaders/page-loader!./generated/plugins', false, /^\.\/.*\.md$/),
+        )
+      },
     },
     loaders: {
       title: 'loaders',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
       content: () => {
         return combineContexts(
           require.context('./loaders/page-loader!./src/content/loaders', false, /^\.\/.*\.md$/),
-          require.context('./loaders/page-loader!./generated/loaders', false, /^\.\/.*\.md$/)
-        );
-      }
+          require.context('./loaders/page-loader!./generated/loaders', false, /^\.\/.*\.md$/),
+        )
+      },
     },
     contribute: {
       title: '贡献',
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
+      url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
       content: () => require.context('./loaders/page-loader!./src/content/contribute', false, /^\.\/.*\.md$/),
     },
     vote: () => require('./src/components/Vote/Vote.jsx').default,
     organization: () => require('./src/components/Organization/Organization.jsx').default,
     'starter-kits': () => require('./src/components/StarterKits/StarterKits.jsx').default,
-
-    /*************************
-     Redirects for Old Content
-     *************************/
-    'get-started': {
-      hidden: true,
-      redirects: {
-        '': '/guides/getting-started',
-        'install-webpack': '/guides/installation',
-        'why-webpack': '/guides/why-webpack',
-      }
-    },
-    pluginsapi: {
-      hidden: true,
-      redirects: {
-        '': '/api/plugins',
-        'compiler': '/api/compiler',
-        'template': '/api/template'
-      }
-    },
-    'api/plugins': {
-      redirects: {
-        'compiler': '/api/compiler',
-        'compilation': '/api/compilation',
-        'module-factories': '/api/module-factories',
-        'parser': '/api/parser',
-        'tapable': '/api/tapable',
-        'template': '/api/template',
-        'resolver': '/api/resolver'
-      }
-    },
-    development: {
-      redirects: {
-        '': '/contribute',
-        'plugin-patterns': '/contribute/plugin-patterns',
-        'release-process': '/contribute/release-process',
-        'how-to-write-a-loader': '/contribute/writing-a-loader',
-        'how-to-write-a-plugin': '/contribute/writing-a-plugin'
-      }
-    }
   }
-};
+});