Skip to content

Commit ab18f9d

Browse files
Merge branch 'cn' into patch-1
2 parents 65282b0 + 87fb9b4 commit ab18f9d

File tree

138 files changed

+113
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+113
-629
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222

2323
webpack 中文文档
2424
========
25-
[![Travis](https://img.shields.io/travis/webpack-china/webpack.js.org.svg)](https://travis-ci.org/webpack-china/webpack.js.org)
25+
[![Travis](https://img.shields.io/travis/docschina/webpack.js.org.svg)](https://travis-ci.org/docschina/webpack.js.org)
2626

2727
## 翻译 ##
2828

29-
> [webpack 中文文档](https://doc.webpack-china.org)
29+
> [webpack 中文文档](https://webpack.docschina.org)
3030
> [webpack 中文社区](https://webpack-china.org)
3131
3232

3333
### 中文站点
3434
- [英文站点](https://webpack.js.org/)是由 CI 自动构建并部署到 gh-pages 分支。
35-
- [中文站点](https://doc.webpack-china.org/)是由 CI 自动构建并部署到 gh-pages 分支。
35+
- [中文站点](https://webpack.docschina.org/)是由 CI 自动构建并部署到 gh-pages 分支。
3636

3737

3838
### 印记中文翻译流程
@@ -54,6 +54,6 @@ npm start
5454

5555
- [说明 - 你想要知道的所有都在这里了](https://github.com/webpack-china/webpack.js.org/issues/17)
5656

57-
- [翻译人员名单](https://doc.webpack-china.org/about/)中如未收录你的名字,请[访问此处](https://github.com/webpack-china/webpack.js.org/issues/180)留下你的大名(^_^)
57+
- [翻译人员名单](https://webpack.docschina.org/about/)中如未收录你的名字,请[访问此处](https://github.com/webpack-china/webpack.js.org/issues/180)留下你的大名(^_^)
5858

5959
- Thanks

src/components/Navigation/Navigation.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,20 @@ export default class Navigation extends React.Component {
7171
items={[
7272
{ title: '印记中文首页', url: 'https://docschina.org/' },
7373
{ title: '加入我们翻译文档', url: 'https://docschina.org/talk' },
74-
{ title: 'Vue.js 中文文档', url: 'https://vuefe.cn/' },
74+
{ title: 'Vue.js 中文文档', url: 'https://vue.docschina.org/' },
7575
{ title: 'Parcel.js 中文文档', url: 'https://parceljs.docschina.org/' },
7676
{ title: 'React.js 中文文档', url: 'https://doc.react-china.org/' },
7777
{ title: 'Node.js 中文文档', url: 'http://nodejs.cn/' },
7878
{ title: 'Babel 中文文档', url: 'https://babel.docschina.org/' },
79-
{ title: 'Koa 中文文档', url: 'https://koajs.cn/' }
79+
{ title: 'VuePress 中文文档', url: 'https://vuepress.docschina.org/' },
80+
{ title: 'Koa 中文文档', url: 'https://koajs.docschina.org/' }
8081
]} />
8182

8283
<Dropdown
8384
className="navigation__languages"
8485
items={[
8586
{ title: 'English', url: 'https://webpack.js.org/' },
86-
{ title: '中文', url: 'https://doc.webpack-china.org/' }
87+
{ title: '中文', url: 'https://webpack.docschina.org/' }
8788
]} />
8889
</Container>
8990

src/components/PageLinks/PageLinks.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ export default ({
66
section = '',
77
page = {}
88
}) => {
9-
let baseURL = 'https://github.com/webpack-china/webpack.js.org/edit/cn/src/content';
9+
let enURL = 'https://webpack.js.org';
10+
let baseURL = 'https://github.com/docschina/webpack.js.org/edit/cn/src/content';
1011
let indexPath = page.type === 'index' ? '/index' : '';
1112
let mainPath = page.url.startsWith('/') ? page.url : `/${page.url}`;
1213
let editLink = page.file.attributes.edit || baseURL + TrimEnd(mainPath, '/') + indexPath + '.md';
1314

1415
return (
1516
<div className="page-links">
17+
<span>
18+
<a className="page-links__link" href={ enURL + mainPath } target="_blank">
19+
查看原文
20+
</a>
21+
<span className="page-links__gap">|</span>
22+
</span>
23+
1624
{ page.file.attributes.repo ? (
1725
<span>
1826
<a className="page-links__link" href={ page.file.attributes.repo }>

src/components/Splash/Splash.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ const Splash = () => (
5252

5353
Splash.title = 'webpack 中文文档(@印记中文) https://docschina.org/';
5454
Splash.description = 'webpack 是一个模块打包器。它的主要目标是将 JavaScript 文件打包在一起,打包后的文件用于在浏览器中使用,但它也能够胜任转换(transform)、打包(bundle)或包裹(package)任何资源(resource or asset)。';
55-
Splash.keywords = ['webpack', 'webpack 中文文档', '印记中文', 'docschina', 'docschina.org', 'doc.webpack-china.org, doc.react-china.org, nodejs.cn, vuefe.cn, babeljs.cn, parceljs.io, rollupjs.cn, koajs.cn'].join(', ');
55+
Splash.keywords = ['webpack', 'webpack 中文文档', '印记中文', 'docschina', 'docschina.org', 'webpack.docschina.org, doc.react-china.org, nodejs.cn, vue.docschina.org, babel.docschina.org, parceljs.docschina.org, rollup.docschina.org, koajs.docschina.org'].join(', ');
5656

5757
export default Splash;

src/content/api/cli.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 命令行接口(Command Line Interface)
2+
title: 命令行接口(command line interface)
33
sort: 2
44
contributors:
55
- ev1stensberg
@@ -359,7 +359,3 @@ webpack --progress --profile
359359
6ms emitting
360360
361361
```
362-
363-
***
364-
365-
> 原文:https://webpack.js.org/api/cli/

src/content/api/compilation-hooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Compilation 钩子
2+
title: compilation 钩子
33
group: Plugins
44
sort: 2
55
---

src/content/api/compiler-hooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Compiler 钩子
2+
title: compiler 钩子
33
group: Plugins
44
sort: 1
55
contributors:

src/content/api/hot-module-replacement.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 模块热替换(Hot Module Replacement)
2+
title: 模块热替换(hot module replacement)
33
contributors:
44
- sokra
55
- skipjack
@@ -166,7 +166,3 @@ module.hot.addStatusHandler(status => {
166166
``` js
167167
module.hot.removeStatusHandler(callback)
168168
```
169-
170-
***
171-
172-
> 原文:https://webpack.js.org/api/hot-module-replacement/

src/content/api/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,3 @@ loader 被编写为,接受源代码作为参数的函数,
5757
插件能够完全访问到编译(compilation)的当前状态。
5858

5959
[了解更多关于插件的信息!](/api/plugins)
60-
61-
***
62-
63-
> 原文:https://webpack.js.org/api/

src/content/api/loaders.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,3 @@ options 的值将会传递给 Complier
451451
### `this._module`
452452
453453
一种 hack 写法。用于访问当前加载的 Module 对象。
454-
455-
***
456-
457-
> 原文:https://webpack.js.org/api/loaders/

0 commit comments

Comments
 (0)