update master & update translation

README.md

@@ -56,7 +56,7 @@ they are going:
 - [Guides - Review and Simplify][1]
 - [Concepts - Review, Organize, Define Clear Goals][2]
 
-We haven't created issues for the other sections yet but they will be coming soon. For
+We haven't created issues for the other sections yet, but they will be coming soon. For
 dev-related work please see [General - Current Longterm Plan][3], which will soon be
 replaced by a more dev-specific issue.
 
@@ -68,7 +68,7 @@ If you hope to localize this documentation please jump to the [translate branch]
 
 ## Contributing
 
-Read throug the [writer's guide][7] if you're interested in editing the conent on this
+Read through the [writer's guide][7] if you're interested in editing the content on this
 site. See the [contributors page][5] to learn how to set up and start working on the site
 locally.
 

antwar.config.js

@@ -13,155 +13,121 @@ module.exports = {
   layout: () => require('./src/components/Site/Site.jsx').default,
   paths: {
     '/': {
-      title: "Home",
-      content: () => require.context('./loaders/page-loader!./src/content', false, /^\.\/.*\.md$/),
-      index: () => {
-        const index = require('./src/components/Splash/Splash.jsx').default;
-        index.title = 'webpack 中文文档';
-        index.description = 'webpack 是一个模块打包器。它的主要目标是将 JavaScript 文件打包在一起，打包后的文件用于在浏览器中使用，但它也能够胜任转换(transform)、打包(bundle)或包裹(package)任何资源(resource or asset)。';
-
-        return index;
-      },
+      title: 'Home',
       layout: () => require('./src/components/Page/Page.jsx').default,
-    },
-    'get-started': {
+      content: () => require.context('./loaders/page-loader!./src/content', false, /^\.\/.*\.md$/),
+      index: () => require('./src/components/Splash/Splash.jsx').default,
       redirects: {
-        '': '/guides/getting-started',
-        'install-webpack': '/guides/installation',
-        'why-webpack': '/guides/why-webpack',
+        'support': '/contribute',
+        'writers-guide': '/contribute/writers-guide'
       }
     },
-    api: {
-      title: "API",
-      layout: () => require('./src/components/Page/Page.jsx').default,
+    concepts: {
+      title: '概念',
       url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      content: () => require.context('./loaders/page-loader!./src/content/api', false, /^\.\/.*\.md$/),
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
-      },
-      redirects: {
-        'passing-a-config': 'configuration-types'
-      }
+      layout: () => require('./src/components/Page/Page.jsx').default,
+      content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/)
     },
-    'api/plugins': {
-      title: "API 插件",
+    configuration: {
+      title: '配置',
+      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
       layout: () => require('./src/components/Page/Page.jsx').default,
+      content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/)
+    },
+    api: {
+      title: 'API',
       url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      content: () => require.context('./loaders/page-loader!./src/content/api/plugins', false, /^\.\/.*\.md$/),
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
-      },
+      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'
       }
     },
-    pluginsapi: {
-      title: 'API 插件',
-      redirects: {
-        '': '/api/plugins',
-        'compiler': '/api/plugins/compiler',
-        'template': '/api/plugins/template'
-      },
-      hideInSidebar: true
-    },
-    concepts: {
-      title: "概念",
-      layout: () => require('./src/components/Page/Page.jsx').default,
-      content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/),
+    guides: {
+      title: '指南',
       url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
-      }
-    },
-    development: {
-      title: "开发",
       layout: () => require('./src/components/Page/Page.jsx').default,
-      content: () => require.context('./loaders/page-loader!./src/content/development', false, /^\.\/.*\.md$/),
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
+      content: () => require.context('./loaders/page-loader!./src/content/guides', false, /^\.\/.*\.md$/),
+      redirects: {
+        'code-splitting-import': '/guides/code-splitting',
+        'code-splitting-require': '/guides/code-splitting',
+        'code-splitting-async': '/guides/code-splitting',
+        'code-splitting-css': '/guides/code-splitting',
+        'code-splitting-libraries': '/guides/code-splitting',
+        'why-webpack': '/comparison',
+        'production-build': '/guides/production'
       }
     },
     plugins: {
-      title: "插件",
+      title: '插件',
+      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$/)
         );
-      },
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
-      },
-      layout: () => require('./src/components/Page/Page.jsx').default
+      }
     },
     loaders: {
-      title: "loaders",
+      title: 'loaders',
       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$/)
         );
-      },
+      }
     },
-    guides: {
-      title: "指南",
-      layout: () => require('./src/components/Page/Page.jsx').default,
+    contribute: {
+      title: '贡献',
       url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      content: () => require.context('./loaders/page-loader!./src/content/guides', false, /^\.\/.*\.md$/),
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
-      },
+      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: {
-        'code-splitting-import': '/guides/code-splitting',
-        'code-splitting-require': '/guides/code-splitting',
-        'code-splitting-async': '/guides/code-splitting',
-        'code-splitting-css': '/guides/code-splitting',
-        'code-splitting-libraries': '/guides/code-splitting',
-        'why-webpack': '/comparison',
-        'production-build': '/guides/production'
+        '': '/guides/getting-started',
+        'install-webpack': '/guides/installation',
+        'why-webpack': '/guides/why-webpack',
       }
     },
-    configuration: {
-      title: "配置",
-      layout: () => require('./src/components/Page/Page.jsx').default,
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/),
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
+    pluginsapi: {
+      hidden: true,
+      redirects: {
+        '': '/api/plugins',
+        'compiler': '/api/compiler',
+        'template': '/api/template'
       }
     },
-    support: {
-      title: "支持",
-      layout: () => require('./src/components/Page/Page.jsx').default,
-      url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
-      content: () => require.context('./loaders/page-loader!./src/content/support', false, /^\.\/.*\.md$/),
-      transform: (pages) => {
-        return _.sortBy(pages, (page) => page.file.sort)
+    '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'
       }
     },
-    vote: () => {
-      const page = require('./src/components/Vote/List.jsx').default;
-      page.title = '投票';
-
-      return page;
-    },
-    organization: () => {
-      const page = require('./src/components/Organization/Organization.jsx').default;
-
-      page.title = '组织';
-
-      return page;
-    },
-    'guides/starter-kits': () => {
-      const page = require('./src/components/StarterKits/StarterKits.jsx').default;
-
-      page.title = '配套工具';
-
-      return page;
+    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'
+      }
     }
   }
 };

loaders/page-loader.js

@@ -8,6 +8,7 @@ module.exports = function (source) {
   const result = frontmatter(source);
 
   result.attributes = result.attributes || {};
+  result.attributes.group = result.attributes.group || '-';
   result.attributes.anchors = markdown().getAnchors(result.body);
   result.attributes.contributors = (result.attributes.contributors || []).sort();
   result.attributes.related = Array.isArray(result.attributes.related) ? result.attributes.related : [];

src/components/Dropdown/LinkDropdown.scss

@@ -0,0 +1,7 @@
+
+.navigation__hrefs {
+  margin-left: 40px;
+  .dropdown__list {
+    width: 130px;
+  }
+}

src/components/Footer/Footer.jsx

@@ -12,7 +12,7 @@ const Footer = () => (
       <section className="footer__left">
         <Link className="footer__link" to="/guides/getting-started/">起步</Link>
         <Link className="footer__link" to="/organization/">组织</Link>
-        <Link className="footer__link" to="/support/">支持</Link>
+        <Link className="footer__link" to="/starter-kits/">配套工具</Link>
         <Link className="footer__link" to="/comparison/">比较</Link>
       </section>
 

src/components/Navigation/Links.json

@@ -0,0 +1,22 @@
+[
+  {
+    "title": "Documentation",
+    "url": "concepts",
+    "children": [
+      { "title": "Concepts", "url": "concepts" },
+      { "title": "Configuration", "url": "configuration" },
+      { "title": "API", "url": "api" },
+      { "title": "Guides", "url": "guides" },
+      { "title": "Loaders", "url": "loaders" },
+      { "title": "Plugins", "url": "plugins" }
+    ]
+  },
+  {
+    "title": "Contribute",
+    "url": "contribute"
+  },
+  {
+    "title": "Blog",
+    "url": "//medium.com/webpack"
+  }
+]