Update "Order undefined error" branch to [email protected]

.gitignore

@@ -1,5 +1,8 @@
 /node_modules
+
 /example/assets
-/test/js
 
+/test/js
 /coverage
+
+/.idea

README.md

@@ -1,4 +1,6 @@
-# extract text plugin for webpack
+# extract text plugin for webpack 2
+
+The API has changed since version 1. For the webpack 1 version, see [the README in the webpack-1 branch](https://github.com/webpack/extract-text-webpack-plugin/blob/webpack-1/README.md).
 
 ## Usage example with css
 
@@ -7,7 +9,10 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin");
 module.exports = {
 	module: {
 		loaders: [
-			{ test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader") }
+			{ test: /\.css$/, loader: ExtractTextPlugin.extract({
+				fallbackLoader: "style-loader",
+				loader: "css-loader"
+			}) }
 		]
 	},
 	plugins: [
@@ -37,32 +42,30 @@ Caveats:
 ## API
 
 ``` javascript
-new ExtractTextPlugin([id: string], filename: string, [options])
+new ExtractTextPlugin(options: filename | object)
 ```
 
-* `id` Unique ident for this plugin instance. (For advanded usage only, by default automatic generated)
-* `filename` the filename of the result file. May contain `[name]`, `[id]` and `[contenthash]`.
+* `options.filename: string` _(required)_ the filename of the result file. May contain `[name]`, `[id]` and `[contenthash]`
   * `[name]` the name of the chunk
   * `[id]` the number of the chunk
   * `[contenthash]` a hash of the content of the extracted file
-* `options`
-  * `allChunks` extract from all additional chunks too (by default it extracts only from the initial chunk(s))
-  * `disable` disables the plugin
+* `options.allChunks: boolean` extract from all additional chunks too (by default it extracts only from the initial chunk(s))
+* `options.disable: boolean` disables the plugin
+* `options.id: string` Unique ident for this plugin instance. (For advanced usage only, by default automatically generated)
 
 The `ExtractTextPlugin` generates an output file per entry, so you must use `[name]`, `[id]` or `[contenthash]` when using multiple entries.
 
 ``` javascript
-ExtractTextPlugin.extract([notExtractLoader], loader, [options])
+ExtractTextPlugin.extract(options: loader | object)
 ```
 
-Creates an extracting loader from an existing loader.
+Creates an extracting loader from an existing loader. Supports loaders of type `{ loader: string; query: object }`.
 
-* `notExtractLoader` (optional) the loader(s) that should be used when the css is not extracted (i.e. in an additional chunk when `allChunks: false`)
-* `loader` the loader(s) that should be used for converting the resource to a css exporting module.
-* `options`
-  * `publicPath` override the `publicPath` setting for this loader.
+* `options.loader: string | object | loader[]` _(required)_ the loader(s) that should be used for converting the resource to a css exporting module
+* `options.fallbackLoader: string | object | loader[]` the loader(s) that should be used when the css is not extracted (i.e. in an additional chunk when `allChunks: false`)
+* `options.publicPath: string` override the `publicPath` setting for this loader
 
-There is also an `extract` function on the instance. You should use this if you have more than one ExtractTextPlugin.
+There is also an `extract` function on the instance. You should use this if you have more than one `ExtractTextPlugin`.
 
 ```javascript
 let ExtractTextPlugin = require('extract-text-webpack-plugin');
@@ -75,8 +78,8 @@ module.exports = {
   ...
   module: {
     loaders: [
-      {test: /\.scss$/i, loader: extractCSS.extract(['css','sass'])},
-      {test: /\.less$/i, loader: extractLESS.extract(['css','less'])},
+      { test: /\.scss$/i, loader: extractCSS.extract(['css','sass']) },
+      { test: /\.less$/i, loader: extractLESS.extract(['css','less']) },
       ...
     ]
   },

example/webpack.config.js

@@ -13,22 +13,21 @@ module.exports = {
 	},
 	module: {
 		loaders: [
-			{ test: /\.css$/, loader: ExtractTextPlugin.extract(
-				"style-loader",
-				"css-loader?sourceMap",
-				{
-					publicPath: "../"
-				}
-			)},
+			{ test: /\.css$/, loader: ExtractTextPlugin.extract({
+				notExtractLoader: "style-loader",
+				loader: "css-loader?sourceMap",
+				publicPath: "../"
+			}) },
 			{ test: /\.png$/, loader: "file-loader" }
 		]
 	},
 	devtool: "source-map",
 	plugins: [
-		new ExtractTextPlugin("css/[name].css?[hash]-[chunkhash]-[contenthash]-[name]", {
+		new ExtractTextPlugin({
+			filename: "css/[name].css?[hash]-[chunkhash]-[contenthash]-[name]",
 			disable: false,
 			allChunks: true
 		}),
-		new webpack.optimize.CommonsChunkPlugin("c", "c.js")
+		new webpack.optimize.CommonsChunkPlugin({ name: "c", filename: "c.js" })
 	]
 };