Skip to content

Commit 2c236a8

Browse files
committed
Merge branch 'hotfix/url'
2 parents afa6534 + 7f0ed57 commit 2c236a8

File tree

10 files changed

+48
-48
lines changed

10 files changed

+48
-48
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ please create an issue first.
88

99
* Install [Node.js](https://nodejs.org/) if you have not already.
1010
*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`
11+
* Fork the **webpack.js.org** repo at [https://github.com/webpack/webpack.js.org](https://github.com/webpack/webpack.js.org).
12+
* `git clone <your-clone-url> && cd webpack.js.org`
1313
* `git checkout develop`
1414
* `npm install`
1515
* `npm run build`
@@ -59,7 +59,7 @@ After getting some feedback, push to your fork branch and submit a pull request.
5959
may suggest some changes or improvements or alternatives, but for small changes
6060
your pull request should be accepted quickly.
6161

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

6464
## Thank you!
6565

README.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Webpack.io
1+
## webpack.js.org
22

33
Guides, documentation, and all things Webpack.
44

@@ -10,7 +10,7 @@ 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)
13+
For more information see the [contributors page](https://github.com/webpack/webpack.js.org/blob/develop/CONTRIBUTING.md)
1414

1515
## Content Progress
1616

@@ -21,7 +21,7 @@ Fully completed can be removed from this list. If there's a topic you would like
2121
* Analyze - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
2222
* Changelog - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
2323
* Contribute - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg)
24-
* Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.io/issues/15)
24+
* Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.js.org/issues/15)
2525
* Writer's Guide - ![](https://img.shields.io/badge/progress-50%25-yellowgreen.svg)
2626

2727
#### Done
@@ -30,51 +30,51 @@ Fully completed can be removed from this list. If there's a topic you would like
3030

3131
### `/api`
3232

33-
* Configuration - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#25](https://github.com/webpack/webpack.io/issues/25)
34-
* Loaders - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#21](https://github.com/webpack/webpack.io/issues/21)
35-
* Module Resolution - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#12](https://github.com/webpack/webpack.io/issues/12)
36-
* Node - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#23](https://github.com/webpack/webpack.io/issues/23)
37-
* Plugins - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#37](https://github.com/webpack/webpack.io/issues/37)
33+
* Configuration - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#25](https://github.com/webpack/webpack.js.org/issues/25)
34+
* Loaders - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#21](https://github.com/webpack/webpack.js.org/issues/21)
35+
* Module Resolution - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#12](https://github.com/webpack/webpack.js.org/issues/12)
36+
* Node - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#23](https://github.com/webpack/webpack.js.org/issues/23)
37+
* Plugins - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#37](https://github.com/webpack/webpack.js.org/issues/37)
3838

3939
#### Done
4040

41-
* CLI - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#24](https://github.com/webpack/webpack.io/issues/24)
41+
* CLI - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#24](https://github.com/webpack/webpack.js.org/issues/24)
4242

4343
### `/concepts`
4444

45-
* Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.io/issues/48)
46-
* Entry points - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#8](https://github.com/webpack/webpack.io/issues/8)
47-
* Everything is a module - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#49](https://github.com/webpack/webpack.io/issues/49)
48-
* Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.io/issues/50)
49-
* Output - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#10](https://github.com/webpack/webpack.io/issues/10)
50-
* Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.io/issues/51)
45+
* Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.js.org/issues/48)
46+
* Entry points - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#8](https://github.com/webpack/webpack.js.org/issues/8)
47+
* Everything is a module - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#49](https://github.com/webpack/webpack.js.org/issues/49)
48+
* Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.js.org/issues/50)
49+
* Output - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#10](https://github.com/webpack/webpack.js.org/issues/10)
50+
* Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.js.org/issues/51)
5151

5252
#### Done
5353

54-
* Targets - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#14](https://github.com/webpack/webpack.io/issues/14)
54+
* Targets - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#14](https://github.com/webpack/webpack.js.org/issues/14)
5555

5656
### `/how-to`
5757

58-
* Author libraries - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#9](https://github.com/webpack/webpack.io/issues/9)
59-
* Develop - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#26](https://github.com/webpack/webpack.io/issues/26)
60-
* Handle compatibility - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#4](https://github.com/webpack/webpack.io/issues/4)
61-
* Handle dependencies - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#5](https://github.com/webpack/webpack.io/issues/5)
62-
* Improve build performance - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#16](https://github.com/webpack/webpack.io/issues/16)
63-
* Shim - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#13](https://github.com/webpack/webpack.io/issues/13)
64-
* Split code - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#3](https://github.com/webpack/webpack.io/issues/3)
65-
* Upgrade from webpack 1 - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#20](https://github.com/webpack/webpack.io/issues/20)
66-
* Use with Docker - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#44](https://github.com/webpack/webpack.io/issues/44)
67-
* Use with third party tools - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#53](https://github.com/webpack/webpack.io/issues/53)
58+
* Author libraries - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#9](https://github.com/webpack/webpack.js.org/issues/9)
59+
* Develop - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#26](https://github.com/webpack/webpack.js.org/issues/26)
60+
* Handle compatibility - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#4](https://github.com/webpack/webpack.js.org/issues/4)
61+
* Handle dependencies - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#5](https://github.com/webpack/webpack.js.org/issues/5)
62+
* Improve build performance - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#16](https://github.com/webpack/webpack.js.org/issues/16)
63+
* Shim - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#13](https://github.com/webpack/webpack.js.org/issues/13)
64+
* Split code - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#3](https://github.com/webpack/webpack.js.org/issues/3)
65+
* Upgrade from webpack 1 - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#20](https://github.com/webpack/webpack.js.org/issues/20)
66+
* Use with Docker - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#44](https://github.com/webpack/webpack.js.org/issues/44)
67+
* Use with third party tools - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#53](https://github.com/webpack/webpack.js.org/issues/53)
6868

6969
#### Done
7070

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)
71+
* Cache - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#2](https://github.com/webpack/webpack.js.org/issues/2)
72+
* Generate a production build - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#11](https://github.com/webpack/webpack.js.org/issues/11)
7373

7474
## Git Flow
7575

76-
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.
76+
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.js.org/tree/develop) branch. [Content](https://github.com/webpack/webpack.js.org/tree/master/src/content) changes are fine on to make on master.
7777

7878
## Editor Config
7979

80-
The [.editorconfig](https://github.com/webpack/webpack.io/blob/develop/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
80+
The [.editorconfig](https://github.com/webpack/webpack.js.org/blob/develop/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.

antwar.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var highlight = require('./utilities/highlight');
55

66
module.exports = {
77
//assets: [] // custom assets to copy into the build
8-
siteBase: '//webpack.github.io/webpack.io/',
8+
siteBase: '//webpack.js.org/',
99
home: 'index.html', // XXX: drop once there's a root domain
1010
output: 'build',
1111
title: 'webpack',

components/Body.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const pages = [
88
{ title: 'Concepts', url: 'concepts' },
99
{ title: 'How to', url: 'how-to' },
1010
{ title: 'API', url: 'api' },
11-
{ title: 'Github', url: '//github.com/webpack/webpack.io' }
11+
{ title: 'Github', url: '//github.com/webpack/webpack.js.org' }
1212
];
1313

1414
export default props => {

components/Page.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Sidebar from './Sidebar';
55

66
export default props => {
77
let { section, page } = props,
8-
edit = `https://github.com/webpack/webpack.io/edit/master/content/${page.url}.md`;
8+
edit = `https://github.com/webpack/webpack.js.org/edit/master/content/${page.url}.md`;
99

1010
return (
1111
<Container className="page">

content/api/cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ webpack --env=DEVELOPMENT
7575

7676
**Print result of webpack as a JSON**
7777

78-
In every other case, webpack prints out a set of stats showing bundle, chunk and timing details. Using this option the output can be a JSON object.This response is accepted by webpack's [analyse tool](http://webpack.github.com/analyse). The analyse tool will take in the JSON and provide all the details of the build in graphical form.
78+
In every other case, webpack prints out a set of stats showing bundle, chunk and timing details. Using this option the output can be a JSON object.This response is accepted by webpack's [analyse tool](https://webpack.github.com/analyse). The analyse tool will take in the JSON and provide all the details of the build in graphical form.
7979

8080
?> (TODO: Link to webpack analyse article)
8181

content/how-to/cache.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ But the problem here is that, *each* time we create a new build, all filenames w
5757

5858
What if we could produce the same filename if the contents of the file did not change between builds? For example, the file where we put all our libraries and other vendor stuff does not change that often.
5959

60-
T> Separate your vendor and application code with [CommonsChunkPlugin](http://webpack.github.io/docs/list-of-plugins.html#2-explicit-vendor-chunk) and create an explicit vendor chunk to prevent it from changing too often.
60+
T> Separate your vendor and application code with [CommonsChunkPlugin](https://webpack.github.io/docs/list-of-plugins.html#2-explicit-vendor-chunk) and create an explicit vendor chunk to prevent it from changing too often.
6161

6262
Webpack allows you to generate hashes depending on the file contents. Here is the updated config:
6363

content/how-to/hot-module-reload.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ given the needs of a particular project. The approach described below uses Babel
1212
React, but these tools are not necessary for HMR to work.
1313
If you'd like to see examples of other approaches,
1414
please request them or, better yet,
15-
[open up a PR with an addition](https://github.com/webpack/webpack.io)!
15+
[open up a PR with an addition](https://github.com/webpack/webpack.js.org)!
1616

1717
##Project Config
1818
This guide will be demonstrating the use of HMR with Babel,
@@ -141,8 +141,8 @@ module.exports = env => {
141141
There's a lot going on above, and not all of it is related to HMR.
142142
You may benefit from reading the
143143
[full documentation](https://webpack.github.io/docs/webpack-dev-server.html)
144-
on webpack dev server, and the [other articles](https://webpack.github.io/webpack.io/concepts/)
145-
here on webpack.io.
144+
on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
145+
here on webpack.js.org.
146146

147147
The basic assumption here is that your JS entry is located at `./src/index.js`,
148148
and that you're using CSS Modules for your styling.

content/how-to/set-up-hmr-with-react.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ module.exports = env => {
134134
There's a lot going on above, and not all of it is related to HMR.
135135
You may benefit from reading the
136136
[full documentation](https://webpack.github.io/docs/webpack-dev-server.html)
137-
on webpack dev server, and the [other articles](https://webpack.github.io/webpack.io/concepts/)
138-
here on webpack.io.
137+
on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
138+
here on webpack.js.org.
139139

140140
The basic assumption here is that your JS entry is located at `./src/index.js`,
141141
and that you're using CSS Modules for your styling.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "webpack.io",
2+
"name": "webpack.js.org",
33
"version": "0.0.0",
44
"private": true,
55
"description": "The main site for all things Webpack.",
6-
"homepage": "https://github.com/webpack/webpack.io",
6+
"homepage": "https://github.com/webpack/webpack.js.org",
77
"author": "Greg Venech",
88
"license": "ISC",
99
"main": "n/a",
@@ -15,18 +15,18 @@
1515
],
1616
"repository": {
1717
"type": "git",
18-
"url": "https://github.com/webpack/webpack.io.git"
18+
"url": "https://github.com/webpack/webpack.js.org.git"
1919
},
2020
"bugs": {
21-
"url": "https://github.com/webpack/webpack.io/issues"
21+
"url": "https://github.com/webpack/webpack.js.org/issues"
2222
},
2323
"scripts": {
2424
"start": "antwar -d",
2525
"build": "antwar -b && npm run sitemap",
2626
"deploy": "antwar -D",
2727
"lint": "eslint . --ext .js --ext .jsx --ext .md",
2828
"test": "npm run lint",
29-
"sitemap": "cd build && sitemap-static --prefix=http://webpack.github.io/webpack.io/ > sitemap.xml"
29+
"sitemap": "cd build && sitemap-static --prefix=https://webpack.js.org/ > sitemap.xml"
3030
},
3131
"devDependencies": {
3232
"antwar": "^0.8.1",

0 commit comments

Comments
 (0)