Merge branch 'develop' into cn

dear-lizhihua · dear-lizhihua · commit a31bdd6f230d · 2016-10-19T07:14:19.000+08:00
# Conflicts:
#	components/splash/splash.jsx
#	content/contribute.md
#	content/index.md
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
+build/
 antwar.config.js
diff --git a/antwar.config.js b/antwar.config.js
@@ -78,7 +78,7 @@ module.exports = {
       }
     )
   }
-}
+};
 
 function root(contentCb) {
   return {
diff --git a/components/splash/splash-style.scss b/components/splash/splash-style.scss
@@ -4,9 +4,7 @@
   &__viz {
     position:relative;
     display:flex;
-    height:100vh;
-    min-height:600px;
-    max-height:900px;
+    height:500px;
   }
 
   &__modules,
diff --git a/components/splash/splash.jsx b/components/splash/splash.jsx
@@ -20,24 +20,12 @@ export default props => {
         </Container>
       </section>
       <section className="splash__viz">
-        <div className="splash__modules">
-
-        </div>
-
         <div className="splash__icon">
           <Cube className="splash__cube" depth={ 150 } />
         </div>
 
-        <div className="splash__output">
-
-        </div>
-
         <span className="splash__headline">
-          webpack 将&nbsp;
-          <Link to="/concepts/modules">模块</Link>
-          &nbsp;转换为 生产环境下的&nbsp;
-          <Link to="/concepts/output">包</Link>
-          &nbsp;和资源
+          Who said front-end code can't be modular?
         </span>
       </section>
 
diff --git a/content/concepts/modules.md b/content/concepts/modules.md
@@ -42,4 +42,4 @@ The webpack community has built _loaders_ for a wide variety of popular language
 
 And many others! Overall, webpack provides a powerful and rich API for customization that allows one to use webpack for **any stack**, while staying **unopinionated** about your development, testing, and production workflows.
 
-For a full list, see [**the list of loaders**](https://webpack.github.io/docs/list-of-loaders.html) or [**write your own**](./api/loaders).
+For a full list, see [**the list of loaders**](https://webpack.github.io/docs/list-of-loaders.html) or [**write your own**](/api/loaders).
diff --git a/content/contribute.md b/content/contribute.md
@@ -6,7 +6,7 @@ title: 贡献
 
 ## 文档
 
-[作者指南](writers-guide)
+[作者指南](/writers-guide)
 
 ## 技术贡献
 
diff --git a/content/index.md b/content/index.md
@@ -1,5 +1,46 @@
----
-title: 快速内容
----
+**index.js**
 
-仍然在讨论如何处理这一部分。
+```js
+const foo = require('./foo.js')
+
+foo.bar()
+```
+
+**foo.js**
+
+```js
+module.exports = {
+  bar: function () {
+    //
+  }
+}
+```
+
+## Bundle your [modules](/concepts/modules) with webpack.
+
+**webpack.config.js**
+
+```js
+module.exports = {
+  entry: './index.js',
+  output: {
+    path: 'bundle.js'
+  }
+}
+```
+
+**page.html**
+
+```html
+<html>
+  <head>
+    ...
+  </head>
+  <body>
+    ...
+    <script src="/bundle.js"></script>
+  </body>
+</html>
+```
+
+## It's really that simple. [Get started](/get-started) now!
diff --git a/content/writers-guide.md b/content/writers-guide.md
@@ -19,7 +19,7 @@ title: 作者指南
 
 1. `npm i`
 2. `npm start`
-3. [http://localhost:3000](http://localhost:3000)
+3. `open http://localhost:3000`
 
 The site will update itself as you make changes.
 
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
     "build-test": "http-server build/",
     "deploy": "gh-pages -d build",
     "lint": "run-s lint:*",
+    "lint:links": "hyperlink build/index.html -r",
     "lint:js": "eslint . --ext .js --ext .jsx",
     "lint:md": "eslint . --ext .md",
     "lint:markdown": "markdownlint --config ./.markdownlintrc **/*.md *.md ./content/**/*.md",
@@ -36,10 +37,10 @@
   },
   "devDependencies": {
     "alex": "^3.1.0",
-    "antwar": "0.8.1-alpha.95152042",
-    "antwar-helpers": "0.8.1-alpha.95152042",
-    "antwar-interactive": "0.8.1-alpha.95152042",
-    "antwar-prevnext-plugin": "0.8.1-alpha.95152042",
+    "antwar": "0.8.1-alpha.50699ca3",
+    "antwar-helpers": "0.8.1-alpha.50699ca3",
+    "antwar-interactive": "0.8.1-alpha.50699ca3",
+    "antwar-prevnext-plugin": "0.8.1-alpha.50699ca3",
     "autoprefixer": "^6.3.7",
     "babel-core": "^6.10.4",
     "babel-eslint": "^6.1.2",
@@ -57,6 +58,7 @@
     "gh-pages": "^0.11.0",
     "html-webpack-plugin": "^2.22.0",
     "http-server": "^0.9.0",
+    "hyperlink": "^2.5.0",
     "json-loader": "^0.5.4",
     "lodash": "^4.16.1",
     "markdown-loader": "^0.1.7",
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -6,8 +6,9 @@ SOURCE_BRANCH="master"
 
 # Pull requests and commits to other branches shouldn't try to deploy, just build to verify
 if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
-    echo "Skipping deploy; just doing a build."
+    echo "Skipping deploy; just doing a build and linting links."
     npm run build
+    npm run lint:links
     exit 0
 fi
 
diff --git a/webpack.config.js b/webpack.config.js
@@ -140,6 +140,7 @@ module.exports = function(env) {
         interactiveConfig
       );
     case 'build':
+    case 'lint:links':
       return merge(
         commonConfig,
         buildConfig

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ module.exports = {`
`78`	`78`	`}`
`79`	`79`	`)`
`80`	`80`	`}`
`81`		`-}`
	`81`	`+};`
`82`	`82`
`83`	`83`	`function root(contentCb) {`
`84`	`84`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,4 @@ The webpack community has built _loaders_ for a wide variety of popular language`
`42`	`42`
`43`	`43`	`And many others! Overall, webpack provides a powerful and rich API for customization that allows one to use webpack for any stack, while staying unopinionated about your development, testing, and production workflows.`
`44`	`44`
`45`		`-For a full list, see [the list of loaders](https://webpack.github.io/docs/list-of-loaders.html) or [write your own](./api/loaders).`
	`45`	`+For a full list, see [the list of loaders](https://webpack.github.io/docs/list-of-loaders.html) or [write your own](/api/loaders).`