Merge branch 'hotfix/url'

sokra · sokra · commit 2c236a8ef86d · 2016-09-07T20:12:50.000+02:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,8 +8,8 @@ please create an issue first.
 
 * Install [Node.js](https://nodejs.org/) if you have not already.  
   *Note: Node 6 or greater may be required for "best results".*
-* Fork the **webpack.io** repo at [https://github.com/webpack/webpack.io](https://github.com/webpack/webpack.io).
-* `git clone <your-clone-url> && cd webpack.io`
+* Fork the **webpack.js.org** repo at [https://github.com/webpack/webpack.js.org](https://github.com/webpack/webpack.js.org).
+* `git clone <your-clone-url> && cd webpack.js.org`
 * `git checkout develop`
 * `npm install`
 * `npm run build`
@@ -59,7 +59,7 @@ After getting some feedback, push to your fork branch and submit a pull request.
 may suggest some changes or improvements or alternatives, but for small changes
 your pull request should be accepted quickly.
 
-Issue the PR to the [develop](https://github.com/webpack/webpack.io/tree/develop) branch.  
+Issue the PR to the [develop](https://github.com/webpack/webpack.js.org/tree/develop) branch.
 
 ## Thank you!
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Webpack.io
+## webpack.js.org
 
 Guides, documentation, and all things Webpack.
 
@@ -10,7 +10,7 @@ To develop, please pull the project, `cd` into the directory and run:
 - `npm run build` to create a production version of the site.
 - `npm start` to develop on a local webpack-dev-server (should be [here](http://localhost:3000/)).
 
-For more information see the [contributors page](https://github.com/webpack/webpack.io/blob/develop/CONTRIBUTING.md)
+For more information see the [contributors page](https://github.com/webpack/webpack.js.org/blob/develop/CONTRIBUTING.md)
 
 ## Content Progress
 
@@ -21,7 +21,7 @@ Fully completed can be removed from this list. If there's a topic you would like
 * Analyze - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
 * Changelog - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg)
 * Contribute - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg)
-* Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.io/issues/15)
+* Get Started - ![](https://img.shields.io/badge/progress-10%25-yellowgreen.svg) - [#15](https://github.com/webpack/webpack.js.org/issues/15)
 * Writer's Guide - ![](https://img.shields.io/badge/progress-50%25-yellowgreen.svg)
 
 #### Done
@@ -30,51 +30,51 @@ Fully completed can be removed from this list. If there's a topic you would like
 
 ### `/api`
 
-* Configuration - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#25](https://github.com/webpack/webpack.io/issues/25)
-* Loaders - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#21](https://github.com/webpack/webpack.io/issues/21)
-* Module Resolution - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#12](https://github.com/webpack/webpack.io/issues/12)
-* Node - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#23](https://github.com/webpack/webpack.io/issues/23)
-* Plugins - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#37](https://github.com/webpack/webpack.io/issues/37)
+* Configuration - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#25](https://github.com/webpack/webpack.js.org/issues/25)
+* Loaders - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#21](https://github.com/webpack/webpack.js.org/issues/21)
+* Module Resolution - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#12](https://github.com/webpack/webpack.js.org/issues/12)
+* Node - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#23](https://github.com/webpack/webpack.js.org/issues/23)
+* Plugins - ![](https://img.shields.io/badge/progress-0%25-yellowgreen.svg) - [#37](https://github.com/webpack/webpack.js.org/issues/37)
 
 #### Done
 
-* CLI - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#24](https://github.com/webpack/webpack.io/issues/24)
+* CLI - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#24](https://github.com/webpack/webpack.js.org/issues/24)
 
 ### `/concepts`
 
-* Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.io/issues/48)
-* Entry points - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#8](https://github.com/webpack/webpack.io/issues/8)
-* Everything is a module - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#49](https://github.com/webpack/webpack.io/issues/49)
-* Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.io/issues/50)
-* Output - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#10](https://github.com/webpack/webpack.io/issues/10)
-* Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.io/issues/51)
+* Compared to other systems - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#48](https://github.com/webpack/webpack.js.org/issues/48)
+* Entry points - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#8](https://github.com/webpack/webpack.js.org/issues/8)
+* Everything is a module - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#49](https://github.com/webpack/webpack.js.org/issues/49)
+* Loaders - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#50](https://github.com/webpack/webpack.js.org/issues/50)
+* Output - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#10](https://github.com/webpack/webpack.js.org/issues/10)
+* Plugins - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#51](https://github.com/webpack/webpack.js.org/issues/51)
 
 #### Done
 
-* Targets - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#14](https://github.com/webpack/webpack.io/issues/14)
+* Targets - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#14](https://github.com/webpack/webpack.js.org/issues/14)
 
 ### `/how-to`
 
-* Author libraries - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#9](https://github.com/webpack/webpack.io/issues/9)
-* Develop - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#26](https://github.com/webpack/webpack.io/issues/26)
-* Handle compatibility - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#4](https://github.com/webpack/webpack.io/issues/4)
-* Handle dependencies - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#5](https://github.com/webpack/webpack.io/issues/5)
-* Improve build performance - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#16](https://github.com/webpack/webpack.io/issues/16)
-* Shim - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#13](https://github.com/webpack/webpack.io/issues/13)
-* Split code - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#3](https://github.com/webpack/webpack.io/issues/3)
-* Upgrade from webpack 1 - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#20](https://github.com/webpack/webpack.io/issues/20)
-* Use with Docker - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#44](https://github.com/webpack/webpack.io/issues/44)
-* Use with third party tools - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#53](https://github.com/webpack/webpack.io/issues/53)
+* Author libraries - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#9](https://github.com/webpack/webpack.js.org/issues/9)
+* Develop - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#26](https://github.com/webpack/webpack.js.org/issues/26)
+* Handle compatibility - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#4](https://github.com/webpack/webpack.js.org/issues/4)
+* Handle dependencies - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#5](https://github.com/webpack/webpack.js.org/issues/5)
+* Improve build performance - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#16](https://github.com/webpack/webpack.js.org/issues/16)
+* Shim - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#13](https://github.com/webpack/webpack.js.org/issues/13)
+* Split code - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#3](https://github.com/webpack/webpack.js.org/issues/3)
+* Upgrade from webpack 1 - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#20](https://github.com/webpack/webpack.js.org/issues/20)
+* Use with Docker - ![](https://img.shields.io/badge/progress-5%25-yellowgreen.svg) - [#44](https://github.com/webpack/webpack.js.org/issues/44)
+* 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)
 
 #### Done
 
-* Cache - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#2](https://github.com/webpack/webpack.io/issues/2)
-* Generate a production build - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#11](https://github.com/webpack/webpack.io/issues/11)
+* Cache - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#2](https://github.com/webpack/webpack.js.org/issues/2)
+* Generate a production build - ![](https://img.shields.io/badge/progress-100%25-green.svg) - [#11](https://github.com/webpack/webpack.js.org/issues/11)
 
 ## Git Flow
 
-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.
+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.
 
 ## Editor Config
 
-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.
+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.
diff --git a/antwar.config.js b/antwar.config.js
@@ -5,7 +5,7 @@ var highlight = require('./utilities/highlight');
 
 module.exports = {
   //assets: [] // custom assets to copy into the build
-  siteBase: '//webpack.github.io/webpack.io/',
+  siteBase: '//webpack.js.org/',
   home: 'index.html', // XXX: drop once there's a root domain
   output: 'build',
   title: 'webpack',
diff --git a/components/Body.jsx b/components/Body.jsx
@@ -8,7 +8,7 @@ const pages = [
   { title: 'Concepts', url: 'concepts' },
   { title: 'How to', url: 'how-to' },
   { title: 'API', url: 'api' },
-  { title: 'Github', url: '//github.com/webpack/webpack.io' }
+  { title: 'Github', url: '//github.com/webpack/webpack.js.org' }
 ];
 
 export default props => {
diff --git a/components/Page.jsx b/components/Page.jsx
@@ -5,7 +5,7 @@ import Sidebar from './Sidebar';
 
 export default props => {
   let { section, page } = props,
-      edit = `https://github.com/webpack/webpack.io/edit/master/content/${page.url}.md`;
+      edit = `https://github.com/webpack/webpack.js.org/edit/master/content/${page.url}.md`;
 
   return (
     <Container className="page">
diff --git a/content/api/cli.md b/content/api/cli.md
@@ -75,7 +75,7 @@ webpack --env=DEVELOPMENT
 
 **Print result of webpack as a JSON**
 
-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.
+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.
 
 ?> (TODO: Link to webpack analyse article)
 
diff --git a/content/how-to/cache.md b/content/how-to/cache.md
@@ -57,7 +57,7 @@ But the problem here is that, *each* time we create a new build, all filenames w
 
 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.
 
-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.
+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.
 
 Webpack allows you to generate hashes depending on the file contents. Here is the updated config:
 
diff --git a/content/how-to/hot-module-reload.md b/content/how-to/hot-module-reload.md
@@ -12,7 +12,7 @@ given the needs of a particular project. The approach described below uses Babel
 React, but these tools are not necessary for HMR to work.
 If you'd like to see examples of other approaches,
 please request them or, better yet,
-[open up a PR with an addition](https://github.com/webpack/webpack.io)!
+[open up a PR with an addition](https://github.com/webpack/webpack.js.org)!
 
 ##Project Config
 This guide will be demonstrating the use of HMR with Babel,
@@ -141,8 +141,8 @@ module.exports = env => {
 There's a lot going on above, and not all of it is related to HMR.
 You may benefit from reading the
 [full documentation](https://webpack.github.io/docs/webpack-dev-server.html)
-on webpack dev server, and the [other articles](https://webpack.github.io/webpack.io/concepts/)
-here on webpack.io.
+on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
+here on webpack.js.org.
 
 The basic assumption here is that your JS entry is located at `./src/index.js`,
 and that you're using CSS Modules for your styling.
diff --git a/content/how-to/set-up-hmr-with-react.md b/content/how-to/set-up-hmr-with-react.md
@@ -134,8 +134,8 @@ module.exports = env => {
 There's a lot going on above, and not all of it is related to HMR.
 You may benefit from reading the
 [full documentation](https://webpack.github.io/docs/webpack-dev-server.html)
-on webpack dev server, and the [other articles](https://webpack.github.io/webpack.io/concepts/)
-here on webpack.io.
+on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
+here on webpack.js.org.
 
 The basic assumption here is that your JS entry is located at `./src/index.js`,
 and that you're using CSS Modules for your styling.
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "webpack.io",
+  "name": "webpack.js.org",
   "version": "0.0.0",
   "private": true,
   "description": "The main site for all things Webpack.",
-  "homepage": "https://github.com/webpack/webpack.io",
+  "homepage": "https://github.com/webpack/webpack.js.org",
   "author": "Greg Venech",
   "license": "ISC",
   "main": "n/a",
@@ -15,18 +15,18 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/webpack/webpack.io.git"
+    "url": "https://github.com/webpack/webpack.js.org.git"
   },
   "bugs": {
-    "url": "https://github.com/webpack/webpack.io/issues"
+    "url": "https://github.com/webpack/webpack.js.org/issues"
   },
   "scripts": {
     "start": "antwar -d",
     "build": "antwar -b && npm run sitemap",
     "deploy": "antwar -D",
     "lint": "eslint . --ext .js --ext .jsx --ext .md",
     "test": "npm run lint",
-    "sitemap": "cd build && sitemap-static --prefix=http://webpack.github.io/webpack.io/ > sitemap.xml"
+    "sitemap": "cd build && sitemap-static --prefix=https://webpack.js.org/ > sitemap.xml"
   },
   "devDependencies": {
     "antwar": "^0.8.1",
