Merge remote-tracking branch 'origin/master' into 39-loader

* origin/master: 3.0.1 Adds support for React 15.0.0 (#112) Update README.md removing the react v0.13 example update the changelog with v3.0.0 changesa 3.0.0 fix the postversion npm script Update README.md Update devDependencies Use react-dom
ericclemmons · Jun 29, 2016 · 7627cdb · 7627cdb
2 parents efe3ae6 + d1c3670
commit 7627cdb
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 509 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # React Resolver Changelog
 
+### v3.0.0 - (2016-03-01)
+
+- Require React, React-DOM v0.14
+  + <https://github.com/ericclemmons/react-resolver/pull/100>
+
 ### v2.0.5 - (2015-09-07)
 
 - Fix React Router v0.13.3 `HistoryLocation` bug

diff --git a/README.md b/README.md
@@ -45,6 +45,12 @@ install [ES6 Promise](https://github.com/jakearchibald/es6-promise)._
 $ npm install --save react-resolver
 ```
 
+_For React v0.13 support, install [v2.x.x](https://github.com/ericclemmons/react-resolver/tree/v2.0.5)._
+
+```shell
+$ npm install --save react-resolver@2
+```
+
 
 ## Documentation
 
@@ -53,8 +59,6 @@ Complete documentation can be found here:
 
 - [Introduction](/docs/introduction)
 - [Getting Started](/docs/getting-started)
-- [API Reference](/docs/api)
-- [Troubleshooting](/docs/Troubleshooting.md)
 
 - - -
 

diff --git a/examples/react-v0.13/README.md b/examples/react-v0.13/README.md
diff --git a/examples/react-v0.13/package.json b/examples/react-v0.13/package.json
diff --git a/examples/react-v0.13/public/favicon.ico b/examples/react-v0.13/public/favicon.ico
diff --git a/examples/react-v0.13/src/app.js b/examples/react-v0.13/src/app.js
diff --git a/examples/react-v0.13/src/client.js b/examples/react-v0.13/src/client.js
diff --git a/examples/react-v0.13/src/components/App.js b/examples/react-v0.13/src/components/App.js
diff --git a/examples/react-v0.13/src/components/Footer.js b/examples/react-v0.13/src/components/Footer.js
diff --git a/examples/react-v0.13/src/components/Header.js b/examples/react-v0.13/src/components/Header.js
diff --git a/examples/react-v0.13/src/components/Home.js b/examples/react-v0.13/src/components/Home.js
diff --git a/examples/react-v0.13/src/components/Nav.js b/examples/react-v0.13/src/components/Nav.js
diff --git a/examples/react-v0.13/src/components/NotFound.js b/examples/react-v0.13/src/components/NotFound.js