Skip to content

Commit f11a442

Browse files
authored
Merge pull request #252 from webpack/develop
Deploy
2 parents 8404a99 + 02eba78 commit f11a442

File tree

93 files changed

+1621
-996
lines changed

Some content is hidden

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

93 files changed

+1621
-996
lines changed

CONTRIBUTING.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,30 @@ After getting some feedback, push to your fork branch and submit a pull request.
6262

6363
Issue the PR to the [develop](https://github.com/webpack/webpack.js.org/tree/develop) branch.
6464

65+
## Contribution Recognition
66+
67+
Any document that you edit, you can choose to add your Github username at the top of the document for recognition:
68+
69+
**example.md**
70+
71+
```markdown
72+
===
73+
title: Some Example Page
74+
contributors:
75+
- TheLarkInn
76+
- Sokra
77+
- Bebraw
78+
- Jhnns
79+
- SpaceK33z
80+
===
81+
82+
## Some Documentation
83+
84+
```
85+
86+
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.
87+
88+
6589
## Thank you
6690

6791
Webpack is insanely feature rich and documentation is a huge time sink. We greatly appreciate any time spent fixing typos or clarifying sections in the documentation.

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@ Fully completed can be removed from this list. If there's a topic you would like
3535

3636
### `/concepts`
3737

38-
- Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.js.org/issues/48)
3938
- Modules - ![](https://img.shields.io/badge/progress-50%25-yellowgreen.svg) - [#49](https://github.com/webpack/webpack.js.org/issues/49)
4039
- Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.js.org/issues/50)
41-
- Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.js.org/issues/51)
4240

4341
### `/how-to`
4442

antwar.config.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ module.exports = {
99
title: 'webpack',
1010
file: path.join(__dirname, 'template.ejs')
1111
},
12-
assets: [
13-
{
14-
from: './fonts',
15-
to: 'assets'
16-
}
17-
],
1812
output: 'build',
1913
title: 'webpack',
2014
keywords: ['webpack', 'javascript', 'web development', 'programming'],
@@ -31,7 +25,7 @@ module.exports = {
3125
prevnextPlugin()
3226
],
3327
layout: function() {
34-
return require('./components/Site.jsx').default
28+
return require('./components/site/site.jsx').default
3529
},
3630
paths: {
3731
'/': root(
@@ -95,7 +89,7 @@ function root(contentCb) {
9589
processPage: processPage(), // Process individual page (url, content)
9690
layouts: { // Layouts (page/section)
9791
page: function() {
98-
return require('./components/Splash.jsx').default
92+
return require('./components/splash/splash.jsx').default
9993
}
10094
},
10195
redirects: {} // Redirects <from>: <to>
@@ -114,10 +108,10 @@ function section(title, contentCb) {
114108
processPage: processPage(),
115109
layouts: {
116110
index: function() {
117-
return require('./components/Page.jsx').default
111+
return require('./components/page/page.jsx').default
118112
},
119113
page: function() {
120-
return require('./components/Page.jsx').default
114+
return require('./components/page/page.jsx').default
121115
}
122116
},
123117
redirects: {} // <from>: <to>

assets/cube.png

22 KB
Loading

assets/favicon.ico

31.3 KB
Binary file not shown.

assets/geomanist-medium.woff

40.1 KB
Binary file not shown.

assets/geomanist-medium.woff2

28 KB
Binary file not shown.

assets/geomanist-regular.woff

39.9 KB
Binary file not shown.

assets/geomanist-regular.woff2

27.5 KB
Binary file not shown.

assets/icons.woff

3.36 KB
Binary file not shown.

0 commit comments

Comments
 (0)