Skip to content

Commit 312ca70

Browse files
authored
Merge pull request #300 from webpack/develop
Deploy
2 parents 911dd0a + d2caca9 commit 312ca70

Some content is hidden

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

70 files changed

+1780
-369
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
node_modules
22
npm-debug.log
33
build
4+
generated
45
.antwar
56

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ To develop, please pull the project, `cd` into the directory and run:
1212
- `npm run build` to create a production version of the site.
1313
- `npm start` to develop on a local webpack-dev-server (should be [here](http://localhost:3000/)).
1414

15+
If you want to fetch data for `/loaders` and `/plugins` pages, run `npm run fetch`.
16+
1517
For more information see the [contributors page](https://github.com/webpack/webpack.js.org/blob/develop/CONTRIBUTING.md)
1618

1719
## Content Progress

antwar.config.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
'/': root(
3232
function() {
3333
return require.context(
34-
'json!yaml-frontmatter!./content',
34+
'json-loader!yaml-frontmatter-loader!./content',
3535
false,
3636
/^\.\/.*\.md$/
3737
);
@@ -41,7 +41,7 @@ module.exports = {
4141
'Concepts',
4242
function() {
4343
return require.context(
44-
'json!yaml-frontmatter!./content/concepts',
44+
'json-loader!yaml-frontmatter-loader!./content/concepts',
4545
false,
4646
/^\.\/.*\.md$/
4747
);
@@ -51,7 +51,7 @@ module.exports = {
5151
'Configuration',
5252
function() {
5353
return require.context(
54-
'json!yaml-frontmatter!./content/configuration',
54+
'json-loader!yaml-frontmatter-loader!./content/configuration',
5555
false,
5656
/^\.\/.*\.md$/
5757
);
@@ -61,7 +61,7 @@ module.exports = {
6161
'How to',
6262
function() {
6363
return require.context(
64-
'json!yaml-frontmatter!./content/how-to',
64+
'json-loader!yaml-frontmatter-loader!./content/how-to',
6565
true,
6666
/^\.\/.*\.md$/
6767
);
@@ -71,7 +71,27 @@ module.exports = {
7171
'API',
7272
function() {
7373
return require.context(
74-
'json!yaml-frontmatter!./content/api',
74+
'json-loader!yaml-frontmatter-loader!./content/api',
75+
false,
76+
/^\.\/.*\.md$/
77+
);
78+
}
79+
),
80+
loaders: section(
81+
'Loaders',
82+
function() {
83+
return require.context(
84+
'json-loader!yaml-frontmatter-loader!./generated/loaders',
85+
false,
86+
/^\.\/.*\.md$/
87+
);
88+
}
89+
),
90+
plugins: section(
91+
'Plugins',
92+
function() {
93+
return require.context(
94+
'json-loader!yaml-frontmatter-loader!./generated/plugins',
7595
false,
7696
/^\.\/.*\.md$/
7797
);

assets/file-blank.png

22.4 KB
Loading

assets/file-css.png

26.1 KB
Loading

assets/file-html.png

29.2 KB
Loading

assets/file-ico.png

31.8 KB
Loading

assets/file-js.png

25.4 KB
Loading

assets/module-coffee.png

46.4 KB
Loading

assets/module-js.png

29.6 KB
Loading

0 commit comments

Comments
 (0)