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

update from the origin

Author: madneal

.travis.yml

@@ -8,6 +8,8 @@ node_js:
 script:
   - bash ./scripts/deploy.sh
 sudo: required
+cache: yarn
 install:
-  - npm install
+  - npm i yarn -g
+  - yarn
   - sudo pip install proselint

CONTRIBUTING.md

@@ -40,7 +40,7 @@ Issue the PR to the [master](https://github.com/webpack/webpack.js.org/tree/mast
 
 ## Contribution Recognition
 
-Any document that you edit, you can choose to add your GitHub username at the top of the document for recognition:
+You can choose to add your GitHub username for recognition at the top of any markdown document you edit:
 
 **example.md**
 
@@ -59,7 +59,7 @@ contributors:
 
 ```
 
-This will add your name and GitHub profile photo to the document in production. This is a great way to own the awesome work that you do and encourage that you remember to do this in your PR's.
+This will add your name and GitHub profile photo to the document in production. It's a great way to own the awesome work that you do and we encourage you to do this in your PRs.
 
 
 ## Thank you

PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,4 @@
 1. [Read and sign the CLA](https://cla.js.foundation/webpack/webpack.js.org). This needs to be done only once. PRs that haven't signed it won't be accepted.
 2. Make sure your PR complies with [the writer's guide](https://webpack.js.org/writers-guide/).
 3. Read through the PR diff carefully as sometimes this can reveal issues. The work will be reviewed, but this can save some effort.
+4. Remove these instructions from your PR as they are for your eyes only.

README.md

@@ -1,5 +1,6 @@
 # webpack 中文文档
 
+> https://doc.webpack-china.org webpack 中文文档
 > https://webpack-china.org webpack 中文社区
 
 - [webpack 2 翻译任务认领说明 - 入口目录](https://github.com/webpack-china/webpack.js.org/issues/17)

antwar.config.js

@@ -71,6 +71,17 @@ module.exports = {
       }
     ),
 
+    development: section(
+      '开发',
+      function() {
+        return require.context(
+          'json-loader!yaml-frontmatter-loader!./content/development',
+          true,
+          /^\.\/.*\.md$/
+        );
+      }
+    ),
+
     configuration: section(
       '配置',
       function() {
@@ -137,7 +148,7 @@ module.exports = {
         return combineContexts(content, generated);
       }
     ),
-    
+
     vote: {
       path() {
         return require('./components/vote/list.jsx').default
@@ -166,7 +177,7 @@ module.exports = {
 
 function root(contentCb) {
   return {
-    title: 'Webpack',
+    title: 'webpack',
     path: function() { // Load path content
       return contentCb();
     },
@@ -235,7 +246,7 @@ function combineContexts(context1, context2) {
 
     let keys1 = context1.keys();
     let keys2 = context2.keys();
-    return _.chain(keys1).concat(keys2).uniq().value();
+    return _.chain(keys1).concat(keys2).sortBy().uniq().value();
   };
   return webpackContext;
 }

assets/icon-square-small-slack.png

@@ -78,12 +78,22 @@ export default class Cube extends React.Component {
       let degrees = 0;
       let axis = 'y';
 
-      this._interval = setInterval(() => {
-        let obj = {};
-        obj[axis] = degrees += 90;
-
-        this.setState({ ...obj, iteration: (this.state.iteration + 1) % 4 });
-      }, repeatDelay);
+      let lastTime = performance.now();
+      let animation = () => {
+        let nowTime = performance.now();
+        let deltaTime = nowTime - lastTime;
+
+        if (repeatDelay <= deltaTime) {
+          let obj = {};
+          obj[axis] = degrees += 90;
+
+          this.setState({ ...obj, iteration: (this.state.iteration + 1) % 4 });
+          lastTime = performance.now();
+        }
+
+        this._requestAnimation = requestAnimationFrame(animation);
+      };
+      animation();
     }
   }
 
@@ -95,7 +105,7 @@ export default class Cube extends React.Component {
       this.container.removeEventListener('mouseleave', this.listeners.reset);
 
     } else if (continuous) {
-      clearInterval(this._interval);
+      cancelAnimationFrame(this._requestAnimation);
     }
   }
 

components/cube/cube.jsx

@@ -19,21 +19,26 @@ let Sections = [
     children: [
       { title: 'API', url: 'api' },
       { title: '配置', url: 'configuration' },
-      { title: '加载器', url: 'loaders' },
-      { title: '插件', url: 'plugins' }
+      { title: 'LOADER', url: 'loaders' },
+      { title: '插件', url: 'plugins' },
+      { title: '开发', url: 'development' }
     ]
   },
   {
     title: '捐赠',
     url: '//opencollective.com/webpack'
+  },
+  {
+    title: 'Blog',
+    url: '//medium.com/webpack'
   }
 ];
 
 // TODO: Move back to using state once we can handle algolia on our own
 export default class Navigation extends React.Component {
   render() {
     let { pageUrl = '' } = this.props;
-    
+
     return (
       <header className="navigation">
         <Container className="navigation__inner">

components/navigation/navigation.jsx

@@ -15,7 +15,7 @@
 	{
 		"repo": "webpack/loader-utils",
 		"npm": "loader-utils",
-		"description": "Webpack loader utilities.",
+		"description": "webpack loader utilities.",
 		"maintainer": "sokra"
 	},
 	{
@@ -289,4 +289,3 @@
 		"maintainer": "thelarkinn"
 	}
 ]
-	

components/organization/projects.json

@@ -28,8 +28,8 @@ export default props => {
       }))
     }));
 
-  // Rename the root section ("Webpack" => "Other") and push it to the end
-  let rootIndex = sections.findIndex(section => section.title === 'Webpack');
+  // Rename the root section ("webpack" => "Other") and push it to the end
+  let rootIndex = sections.findIndex(section => section.title === 'webpack');
   let rootSection = sections.splice(rootIndex, 1)[0];
   rootSection.title = '其他';
   sections.push(rootSection);

components/site/site.jsx

@@ -4,19 +4,23 @@
 .splash {
   &__section {
     position:relative;
-    padding:5em 1em;
     text-align:center;
 
-    &:last-child {
-      padding-top: 0;
+    &__dark {
+      background-color:#f3f3f3;
     }
 
-    @include break {
-      padding:8em 1.5em;
+    .container {
+      padding:5em 1em;
+
+      @include break {
+        padding-left:1.5em;
+        padding-right:1.5em;
+      }
     }
 
-    pre { 
-      text-align:left; 
+    pre {
+      text-align:left;
     }
 
     .icon-link {

components/splash/splash-style.scss

@@ -17,24 +17,27 @@ export default props => {
         id="components/splash-viz/splash-viz.jsx"
         component={ SplashViz } />
 
-      <Container className="splash__section">
-        <h1>{ page.title }</h1>
-        <div dangerouslySetInnerHTML={{
-          __html: page.content
-        }} />
-      </Container>
+      <div className="splash__section splash__section__dark">
+        <Container>
+          <div dangerouslySetInnerHTML={{
+            __html: page.content
+          }} />
+        </Container>
+      </div>
 
-      <Container className="splash__section">
-        <h1>支持团队</h1>
+      <div className="splash__section">
+        <Container>
+          <h1>支持团队</h1>
 
-        <p>通过你的贡献、捐款或者赞助，webpack 将获得繁荣发展。你的捐助直接用于支持我们付出工作、持续改进，最加重要的是有助于我们提供优秀的文档和资料！</p>
+          <p>通过你的贡献、捐款或者赞助，webpack 将获得繁荣发展。你的捐助直接用于支持我们付出工作、持续改进，最加重要的是有助于我们提供优秀的文档和资料！</p>
 
-        <h2>赞助商</h2>
-        <Support number={ 40 } type="sponsor" />
+          <h2>赞助商</h2>
+          <Support number={ 40 } type="sponsor" />
 
-        <h2>赞助支持</h2>
-        <Support number={ 130 } type="backer" />
-      </Container>
+          <h2>赞助支持</h2>
+          <Support number={ 130 } type="backer" />
+        </Container>
+      </div>
     </div>
   );
 };

components/splash/splash.jsx

@@ -136,6 +136,8 @@
   &__item-card {
     display: flex;
     flex-direction: column;
+    margin-top: 30px;
+    margin-bottom: 30px;
 
     @include break(medium){
       flex-direction: row;
@@ -215,4 +217,4 @@
       width: 100%;
     }
   }
-}
+}

components/vote/app-style.scss

@@ -234,10 +234,10 @@ These options allow webpack to display various stats and style them differently
 
 ### Shortcuts
 
-| Shortcut | Replaces                                                                                  |
-|----------|-------------------------------------------------------------------------------------------|
-| -d       | --debug --devtool eval-cheap-module-source-map --output-pathinfo                          |
-| -p       | --optimize-minimize --define,process.env.NODE_ENV="production" --optimize-occurence-order |
+| Shortcut | Replaces                                                         |
+|----------|------------------------------------------------------------------|
+| -d       | --debug --devtool eval-cheap-module-source-map --output-pathinfo |
+| -p       | --optimize-minimize --define process.env.NODE_ENV="production"   |
 
 ### Profiling
 

content/api/cli.md

@@ -125,7 +125,7 @@ A data object shared between the pitch and the normal phase.
 cacheable(flag = true: boolean)
 ```
 
-Make this loader result cacheable. By default it's not cacheable.
+By default, loader results are cacheable. Call this method passing `false` to make the loader's result not cacheable.
 
 A cacheable loader must have a deterministic result, when inputs and dependencies haven't changed. This means the loader shouldn't have other dependencies than specified with `this.addDependency`. Most loaders are deterministic and cacheable.