Skip to content

Commit afa6534

Browse files
authored
Merge pull request #155 from webpack/release/0.1
Release/0.1
2 parents f95cd47 + 4625c3b commit afa6534

29 files changed

+1460
-50
lines changed

.eslintrc

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
"node": true
1010
},
1111

12+
"plugins": [
13+
"markdown"
14+
],
15+
1216
rules: {
1317
"no-undef": 2,
1418
"no-unreachable": 2,

CONTRIBUTING.md

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# Contributing
2+
3+
From adding an issue for a documentation suggestion to creating a pull request: every contribution is
4+
appreciated and welcome. If you're planning to implement a new section or page
5+
please create an issue first.
6+
7+
## Setup
8+
9+
* Install [Node.js](https://nodejs.org/) if you have not already.
10+
*Note: Node 6 or greater may be required for "best results".*
11+
* Fork the **webpack.io** repo at [https://github.com/webpack/webpack.io](https://github.com/webpack/webpack.io).
12+
* `git clone <your-clone-url> && cd webpack.io`
13+
* `git checkout develop`
14+
* `npm install`
15+
* `npm run build`
16+
* `npm start`
17+
* Visit [http://localhost:3000](http://localhost:3000) to preview your changes before making a pull request.
18+
19+
## Branching Your Changes
20+
21+
Making a branch in your fork for your contribution is helpful in the following ways:
22+
* It allows you to have multiple contributions in as PRs at once.
23+
* It allows us to identify what your contribution is about from the branch name.
24+
25+
You will want to checkout the `develop` branch locally before creating your new branch.
26+
27+
There are two types of branches:
28+
* Feature
29+
* Hotfix
30+
31+
### Features
32+
If your contribution is something new, like a new section or page or a new chunk
33+
to an existing page, you can create a branch with the
34+
following naming convetion:
35+
```
36+
feature/<the-new-feature>
37+
```
38+
So, for example, if you are adding a page on how to write a custom loader your
39+
branch could have the name:
40+
```
41+
feature/add-custom-loaders-page
42+
```
43+
44+
### Fixes
45+
If you are fixing existing content or code you can create a branch with the
46+
following naming convention:
47+
```
48+
hotfix/<the-fix>
49+
```
50+
So, for example, if you are fixing spelling on the api configuration page for
51+
an option, your branch could have the name:
52+
```
53+
hotfix/fix-option-property-spelling-on-api-configuration
54+
```
55+
56+
## Submitting Changes
57+
58+
After getting some feedback, push to your fork branch and submit a pull request. We
59+
may suggest some changes or improvements or alternatives, but for small changes
60+
your pull request should be accepted quickly.
61+
62+
Issue the PR to the [develop](https://github.com/webpack/webpack.io/tree/develop) branch.
63+
64+
## Thank you!
65+
66+
Webpack is insanely feature rich and documentation is a huge time sink. We
67+
greatly appreciate any time spent fixing typos or clarifying sections in the
68+
documentation.

README.md

+19-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ To develop, please pull the project, `cd` into the directory and run:
1010
- `npm run build` to create a production version of the site.
1111
- `npm start` to develop on a local webpack-dev-server (should be [here](http://localhost:3000/)).
1212

13+
For more information see the [contributors page](https://github.com/webpack/webpack.io/blob/develop/CONTRIBUTING.md)
14+
1315
## Content Progress
1416

1517
Fully completed can be removed from this list. If there's a topic you would like to contribute in, check out the related issue and comment there.
@@ -20,18 +22,24 @@ Fully completed can be removed from this list. If there's a topic you would like
2022
* Changelog - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
2123
* Contribute - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg)
2224
* Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.io/issues/15)
23-
* License - ![](https://img.shields.io/badge/progress-100%25-yellowgreen.svg)
2425
* Writer's Guide - ![](https://img.shields.io/badge/progress-50%25-yellowgreen.svg)
2526

27+
#### Done
28+
29+
* License - ![](https://img.shields.io/badge/progress-100%25-green.svg)
30+
2631
### `/api`
2732

28-
* CLI - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#24](https://github.com/webpack/webpack.io/issues/24)
2933
* Configuration - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#25](https://github.com/webpack/webpack.io/issues/25)
3034
* Loaders - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#21](https://github.com/webpack/webpack.io/issues/21)
3135
* Module Resolution - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#12](https://github.com/webpack/webpack.io/issues/12)
3236
* Node - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#23](https://github.com/webpack/webpack.io/issues/23)
3337
* Plugins - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#37](https://github.com/webpack/webpack.io/issues/37)
3438

39+
#### Done
40+
41+
* CLI - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#24](https://github.com/webpack/webpack.io/issues/24)
42+
3543
### `/concepts`
3644

3745
* Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.io/issues/48)
@@ -40,14 +48,15 @@ Fully completed can be removed from this list. If there's a topic you would like
4048
* Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.io/issues/50)
4149
* Output - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#10](https://github.com/webpack/webpack.io/issues/10)
4250
* Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.io/issues/51)
43-
* Targets - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#14](https://github.com/webpack/webpack.io/issues/14)
51+
52+
#### Done
53+
54+
* Targets - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#14](https://github.com/webpack/webpack.io/issues/14)
4455

4556
### `/how-to`
4657

4758
* Author libraries - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#9](https://github.com/webpack/webpack.io/issues/9)
48-
* Cache - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#2](https://github.com/webpack/webpack.io/issues/2)
4959
* Develop - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#26](https://github.com/webpack/webpack.io/issues/26)
50-
* Generate a production build - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#11](https://github.com/webpack/webpack.io/issues/11)
5160
* Handle compatibility - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#4](https://github.com/webpack/webpack.io/issues/4)
5261
* Handle dependencies - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#5](https://github.com/webpack/webpack.io/issues/5)
5362
* Improve build performance - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#16](https://github.com/webpack/webpack.io/issues/16)
@@ -57,6 +66,11 @@ Fully completed can be removed from this list. If there's a topic you would like
5766
* Use with Docker - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#44](https://github.com/webpack/webpack.io/issues/44)
5867
* Use with third party tools - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#53](https://github.com/webpack/webpack.io/issues/53)
5968

69+
#### Done
70+
71+
* Cache - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#2](https://github.com/webpack/webpack.io/issues/2)
72+
* Generate a production build - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#11](https://github.com/webpack/webpack.io/issues/11)
73+
6074
## Git Flow
6175

6276
We are using the [git flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model. Please direct all pull requests for code changes to the [develop](https://github.com/webpack/webpack.io/tree/develop) branch. [Content](https://github.com/webpack/webpack.io/tree/master/src/content) changes are fine on to make on master.

0 commit comments

Comments
 (0)