Skip to content

Commit 41c423e

Browse files
authored
Merge pull request #216 from webpack/develop
Deploy
2 parents 736a719 + 7dc2856 commit 41c423e

File tree

7 files changed

+14
-18
lines changed

7 files changed

+14
-18
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Fully completed can be removed from this list. If there's a topic you would like
2121
### Root Level
2222

2323
- Analyze - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
24-
- Changelog - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
2524
- Contribute - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg)
2625
- Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.js.org/issues/15)
2726
- Writer's Guide - ![](https://img.shields.io/badge/progress-50%25-yellowgreen.svg)

components/Footer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ export default (props) => {
1414
</section>
1515

1616
<section className="footer__middle">
17-
<Link to={{ pathname: '/' }}>
17+
<Link to="/">
1818
<Cube depth={ 18 } hover />
1919
</Link>
2020
</section>
2121

2222
<section className="footer__right">
2323
<Link className="footer__link" to="//gitter.im/webpack/webpack">Support</Link>
24-
<Link className="footer__link" to="/changelog">Changelog</Link>
24+
<Link className="footer__link" to="https://github.com/webpack/webpack/releases">Changelog</Link>
2525
<Link className="footer__link" to="/license">License</Link>
2626
</section>
2727
</div>

components/Navigation.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default ({ home = '/', pages, onToggleNav }) => (
1010
<button id="menu-btn" className="navigation__mobilebtn" onClick={onToggleNav}>
1111
Open navigation
1212
</button>
13-
<Link className="navigation__logo" to={{ pathname: home }}>
13+
<Link className="navigation__logo" to="/">
1414
<Logo theme="light" />
1515
</Link>
1616

content/changelog.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

content/configuration/module.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ A [`Condtion`](#condition) matched with the issuer. See details in [`Rule` condi
9595

9696
`Rule.options` and `Rule.query` are shortcuts to `Rule.use: [ { options } ]`. See [`Rule.use`](#rule-use) and [`UseEntry.options`](#useentry-options) for details.
9797

98-
`Rule.query` only exists for compatiblity reasons. Use `Rule.options` instead.
98+
`Rule.query` only exists for compatibility reasons. Use `Rule.options` instead.
9999

100100

101101
### `Rule.loaders`
102102

103103
`Rule.loaders` is an alias to `Rule.use`. See [`Rule.use`](#rule-use) for details.
104104

105-
It exists for compatiblity reasons. Use `Rule.use` instead.
105+
It exists for compatibility reasons. Use `Rule.use` instead.
106106

107107

108108
### `Rule.use`

content/how-to/upgrade-from-webpack-1.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The `debug` option switched loaders to debug mode in webpack 1. This need to be
3232

3333
The debug mode for loaders will be removed in webpack 3 or later.
3434

35-
To keep compatiblity with old loaders, loaders can be switched to debug mode via plugin:
35+
To keep compatibility with old loaders, loaders can be switched to debug mode via plugin:
3636

3737
``` diff
3838
- debug: true,
@@ -63,7 +63,7 @@ The UglifyJsPlugin does not longer switch loaders into minimize mode. This need
6363

6464
The minimize mode for loaders will be removed in webpack 3 or later.
6565

66-
To keep compatiblity with old loaders, loaders can be switched to minimize mode via plugin:
66+
To keep compatibility with old loaders, loaders can be switched to minimize mode via plugin:
6767

6868
``` diff
6969
plugins: [
@@ -123,9 +123,9 @@ These functions are now always async instead of calling their callback sync if t
123123

124124
### `module.loaders` is now `module.rules`
125125

126-
The old loader configuration was superseeded by a more powerful rules system, which allows to configure loaders and more.
126+
The old loader configuration was superseeded by a more powerful rules system, which allows to configure loaders and more.
127127

128-
For compatiblity reasons the old syntax is still valid and the old names are parsed.
128+
For compatibility reasons the old syntax is still valid and the old names are parsed.
129129

130130
The new naming is easier to understand to there are good reasons to upgrade the configuration.
131131

@@ -171,7 +171,7 @@ The new naming is easier to understand to there are good reasons to upgrade the
171171

172172
Some loaders need context information and read them from the configuration. This need to be passed via loader options in long-term. See loader documentation for relevant options.
173173

174-
To keep compatiblity with old loaders, this information can be passed via plugin:
174+
To keep compatibility with old loaders, this information can be passed via plugin:
175175

176176
``` diff
177177
plugins: [

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
},
3636
"devDependencies": {
3737
"alex": "^3.1.0",
38-
"antwar": "0.8.1-alpha.7317a828",
39-
"antwar-helpers": "0.8.1-alpha.7317a828",
40-
"antwar-interactive": "0.8.1-alpha.7317a828",
41-
"antwar-prevnext-plugin": "0.8.1-alpha.7317a828",
38+
"antwar": "0.8.1-alpha.ceff21c9",
39+
"antwar-helpers": "0.8.1-alpha.ceff21c9",
40+
"antwar-interactive": "0.8.1-alpha.ceff21c9",
41+
"antwar-prevnext-plugin": "0.8.1-alpha.ceff21c9",
4242
"autoprefixer": "^6.3.7",
4343
"babel-core": "^6.10.4",
4444
"babel-eslint": "^6.1.2",

0 commit comments

Comments
 (0)