Merge pull request webpack#4273 from webpack/test/dep-and-etp

updated api for extract-text-webpack-plugin
ceniymei · Feb 16, 2017 · 3edf645 · 3edf645
2 parents 86f7df1 + 8f9b472
commit 3edf645
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 200 deletions.
diff --git a/examples/code-splitted-css-bundle/webpack.config.js b/examples/code-splitted-css-bundle/webpack.config.js
@@ -4,9 +4,9 @@ module.exports = {
 		loaders: [
 			{
 				test: /\.css$/,
-				loader: ExtractTextPlugin.extract({
-					notExtractLoader: "style-loader",
-					loader: "css-loader"
+				use: ExtractTextPlugin.extract({
+					fallback: "style-loader",
+					use: "css-loader"
 				})
 			},
 			{ test: /\.png$/, loader: "file-loader" }

diff --git a/examples/css-bundle/webpack.config.js b/examples/css-bundle/webpack.config.js
@@ -4,8 +4,8 @@ module.exports = {
 		loaders: [
 			{
 				test: /\.css$/,
-				loader: ExtractTextPlugin.extract({
-					loader: "css-loader"
+				use: ExtractTextPlugin.extract({
+					use: "css-loader"
 				})
 			},
 			{ test: /\.png$/, loader: "file-loader" }

diff --git a/examples/multiple-entry-points-commons-chunk-css-bundle/webpack.config.js b/examples/multiple-entry-points-commons-chunk-css-bundle/webpack.config.js
@@ -15,9 +15,9 @@ module.exports = {
 		loaders: [
 			{
 				test: /\.css$/,
-				loader: ExtractTextPlugin.extract({
-					notExtractLoader: "style-loader",
-					loader: "css-loader"
+				use: ExtractTextPlugin.extract({
+					fallback: "style-loader",
+					use: "css-loader"
 				})
 			},
 			{ test: /\.png$/, loader: "file-loader" }

diff --git a/test/HotTestCases.test.js b/test/HotTestCases.test.js
@@ -52,8 +52,8 @@ describe("HotTestCases", function() {
 								enforce: "pre"
 							}, {
 								test: /\.css$/,
-								loader: ExtractTextPlugin.extract({
-									fallbackLoader: "style-loader",
+								use: ExtractTextPlugin.extract({
+									fallback: "style-loader",
 									loader: "css-loader"
 								})
 							}]

diff --git a/test/statsCases/separate-css-bundle/webpack.config.js b/test/statsCases/separate-css-bundle/webpack.config.js
@@ -5,8 +5,8 @@ var moduleConfig = {
 	loaders: [
 		{
 			test: /\.css$/,
-			loader: ExtractTextPlugin.extract({
-				fallbackLoader: "style-loader",
+			use: ExtractTextPlugin.extract({
+				fallback: "style-loader",
 				loader: "css-loader"
 			})
 		}