Update manual tests for webpack 2

webpack-contrib · Dec 27, 2016 · 9dcb4a8 · 9dcb4a8
1 parent 74d007b
commit 9dcb4a8
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "should": "^11.1.0",
     "style-loader": "^0.13.1",
     "webpack": "^2.2.0-rc.2",
-    "webpack-dev-server": "^1.7.0",
+    "webpack-dev-server": "^2.2.0-rc.0",
     "webpack-merge": "^2.0.0"
   }
 }
diff --git a/test/bootstrapSass/webpack.config.js b/test/bootstrapSass/webpack.config.js
@@ -1,8 +1,7 @@
 "use strict";
 
 const path = require("path");
-
-const pathToSassLoader = path.resolve(__dirname, "../../index.js");
+const sassLoader = require.resolve("../../lib/loader");
 
 module.exports = {
     entry: path.resolve(__dirname, "../scss/bootstrap-sass.scss"),
@@ -12,15 +11,25 @@ module.exports = {
     },
     devtool: "inline-source-map",
     module: {
-        loaders: [
-            {
-                test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
-                loader: "file"
-            },
-            {
-                test: /\.scss$/,
-                loader: "style-loader!css-loader!" + pathToSassLoader
-            }
-        ]
+        rules: [{
+            test: /\.scss$/,
+            use: [{
+                loader: "style-loader"
+            }, {
+                loader: "css-loader"
+            }, {
+                loader: sassLoader,
+                options: {
+                    includePaths: [
+                        path.resolve(__dirname, "../scss/from-include-path")
+                    ]
+                }
+            }]
+        }, {
+            test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
+            use: [{
+                loader: "file-loader"
+            }]
+        }]
     }
 };
diff --git a/test/hmr/entry.js b/test/hmr/entry.js
@@ -2,8 +2,7 @@
 
 /* global document */
 
-require("../scss/language.scss");
-require("./simple.css");
+require("./simple.scss");
 
 setInterval(() => {
     document.body.innerHTML += "<br>Now we just change the DOM, so that we can ensure that webpack is not just reloading the page";

diff --git a/test/hmr/simple.css b/test/hmr/simple.css
diff --git a/test/hmr/simple.scss b/test/hmr/simple.scss
@@ -0,0 +1,7 @@
+$color: black;
+$background: hotpink;
+
+body {
+    color: $color;
+    background: $background;
+}
diff --git a/test/hmr/webpack.config.js b/test/hmr/webpack.config.js
@@ -1,9 +1,7 @@
 "use strict";
 
 const path = require("path");
-const webpack = require("webpack");
-
-const pathToSassLoader = path.resolve(__dirname, "../../index.js");
+const sassLoader = require.resolve("../../lib/loader");
 
 module.exports = {
     entry: path.resolve(__dirname, "./entry.js"),
@@ -12,20 +10,13 @@ module.exports = {
         filename: "bundle.hmr.js"
     },
     module: {
-        loaders: [
-            {
-                test: /\.scss$/,
-                loader: "style!css!" + pathToSassLoader
-            },
-            {
-                test: /\.css$/,
-                loader: "style!css"
-            }
-        ]
-    },
-    debug: true,
-    watch: true,
-    plugins: [
-        new webpack.HotModuleReplacementPlugin()
-    ]
+        rules: [{
+            test: /\.scss$/,
+            use: [
+                { loader: "style-loader" },
+                { loader: "css-loader" },
+                { loader: sassLoader }
+            ]
+        }]
+    }
 };
diff --git a/test/sourceMap/webpack.config.js b/test/sourceMap/webpack.config.js
@@ -1,8 +1,7 @@
 "use strict";
 
 const path = require("path");
-
-const pathToSassLoader = path.resolve(__dirname, "../../index.js");
+const sassLoader = require.resolve("../../lib/loader");
 
 module.exports = {
     entry: path.resolve(__dirname, "./entry.js"),
@@ -12,10 +11,18 @@ module.exports = {
     },
     devtool: "inline-source-map",
     module: {
-        loaders: [
+        rules: [
             {
                 test: /\.scss$/,
-                loaders: ["style", "css-loader?sourceMap", pathToSassLoader + "?sourceMap"]
+                use: [
+                    { loader: "style-loader" },
+                    { loader: "css-loader", options: {
+                        sourceMap: true
+                    } },
+                    { loader: sassLoader, options: {
+                        sourceMap: true
+                    } }
+                ]
             }
         ]
     }

diff --git a/test/watch/webpack.config.js b/test/watch/webpack.config.js
@@ -1,8 +1,7 @@
 "use strict";
 
 const path = require("path");
-
-const pathToSassLoader = path.resolve(__dirname, "../../index.js");
+const sassLoader = require.resolve("../../lib/loader");
 
 module.exports = {
     entry: [
@@ -15,11 +14,20 @@ module.exports = {
     },
     watch: true,
     module: {
-        loaders: [
-            {
-                test: /\.scss$/,
-                loader: "css-loader!" + pathToSassLoader + "?includePaths[]=" + encodeURIComponent(path.resolve(__dirname, "../scss/from-include-path"))
-            }
-        ]
+        rules: [{
+            test: /\.scss$/,
+            use: [{
+                loader: "style-loader"
+            }, {
+                loader: "css-loader"
+            }, {
+                loader: sassLoader,
+                options: {
+                    includePaths: [
+                        path.resolve(__dirname, "../scss/from-include-path")
+                    ]
+                }
+            }]
+        }]
     }
 };