From 05e1a8d8e612522baff5015ea54ca1cdbc5ea183 Mon Sep 17 00:00:00 2001
From: Maxime Thirouin <m@moox.io>
Date: Fri, 8 Jan 2016 09:06:47 +0100
Subject: [PATCH] 2.4.0

---
 CHANGELOG.md      |  5 +++++
 README.md         | 11 +++++++----
 package.json      | 10 +++++++---
 webpack.config.js | 12 +++++++++++-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 265f560..cf34d61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.4.0 - 2016-01-08
+
+- Added: documentation is now included in the npm package in
+  `postcss-cssnext/docs/content`
+
 # 2.3.0 - 2015-12-16
 
 - Added: we use latest version of pixrem(@^3)
diff --git a/README.md b/README.md
index 78e42ac..51ab529 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![Travis Build Status](https://img.shields.io/travis/MoOx/postcss-cssnext.svg?label=unix%20build)](https://travis-ci.org/cssnext/postcss-cssnext)
 [![AppVeyor Build Status](https://img.shields.io/appveyor/ci/MoOx/postcss-cssnext.svg?label=windows%20build)](https://ci.appveyor.com/project/MoOx/postcss-cssnext)
-[![NPM version](http://img.shields.io/npm/v/postcss-cssnext.svg?style=flat)](https://www.npmjs.org/package/postcss-cssnext)
+[![Package Quality](http://npm.packagequality.com/shield/postcss-cssnext.svg)](http://packagequality.com/#?package=postcss-cssnext)
+[![Version](https://img.shields.io/github/release/MoOx/postcss-cssnext.svg)](https://github.com/MoOx/postcss-cssnext/blob/master/CHANGELOG.md)
 [![Support on gitter chat](https://img.shields.io/badge/support-gitter%20chat-E40255.svg)](https://gitter.im/MoOx/postcss-cssnext)
 
 
@@ -22,15 +23,17 @@ It transforms CSS specs into more compatible CSS so you don’t need to wait for
 - [Migration to postcss-cssnext](http://cssnext.io/postcss/)
 
 For questions and support please visit the
-[gitter room](https://gitter.im/MoOx/postcss-cssnext).
+[support chat](https://gitter.im/MoOx/postcss-cssnext).
 
 For offline documentation, check out `statinamic/docs/content`.
 
 ---
 
-_The [issue tracker](https://github.com/MoOx/postcss-cssnext/issues) is exclusively for bug reports and feature requests._
+## CONTRIBUTING
 
----
+* ⇄ Pull requests and ★ Stars are always welcome.
+* For bugs and feature requests, please create an issue.
+* Pull requests must be accompanied by passing automated tests (`$ npm test`).
 
 ## [Changelog](CHANGELOG.md)
 
diff --git a/package.json b/package.json
index a50678f..624285e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-cssnext",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Use tomorrow’s CSS syntax, today",
   "keywords": [
     "postcss",
@@ -11,7 +11,7 @@
   ],
   "author": "Maxime Thirouin",
   "license": "MIT",
-  "repository": "https://github.com/cssnext/postcss-cssnext.git",
+  "repository": "https://github.com/MoOx/postcss-cssnext.git",
   "homepage": "http://cssnext.io/",
   "main": "lib/index.js",
   "files": [
@@ -54,7 +54,6 @@
     "chalk": "^1.1.1",
     "classnames": "^2.1.1",
     "css-loader": "^0.13.1",
-    "cssnext-loader": "^1.0.1",
     "cssrecipes-custom-media-queries": "^0.3.0",
     "cssrecipes-defaults": "^0.5.0",
     "cssrecipes-grid": "^0.4.0",
@@ -85,6 +84,11 @@
     "normalize.css": "^3.0.3",
     "object-assign": "^3.0.0",
     "opn": "^1.0.2",
+    "postcss-browser-reporter": "^0.4.0",
+    "postcss-import": "^7.1.3",
+    "postcss-loader": "^0.8.0",
+    "postcss-reporter": "^1.3.0",
+    "postcss-url": "^5.0.2",
     "react": "^0.13.3",
     "rimraf": "^2.4.3",
     "style-loader": "^0.12.2",
diff --git a/webpack.config.js b/webpack.config.js
index 249cf29..1bfb010 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,7 +34,7 @@ module.exports = {
         test: /\.css$/,
         loader: ExtractTextPlugin.extract(
           "style-loader",
-          "css-loader!cssnext-loader"
+          "css-loader!postcss-loader"
         ),
       },
       {
@@ -46,6 +46,16 @@ module.exports = {
     ],
   },
 
+  postcss: (webpack) => {
+    return [
+      require("postcss-import")({ addDependencyTo: webpack }),
+      require("postcss-url")(),
+      require("./lib/index.js")(), // postcss-cssnext !
+      require("postcss-browser-reporter")(),
+      require("postcss-reporter")(),
+    ]
+  },
+
   plugins: ([
     new webpack.DefinePlugin(buildConfig),
     new ExtractTextPlugin("[name].css", { disable: !buildConfig.__PROD__ }),