Upgrade loaders to new rules syntax for CP config #261

Thanks @gajus for pointing it out!
react-cosmos · Jan 22, 2017 · ce29a48 · ce29a48
1 parent c2e6e9c
commit ce29a48
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/react-component-playground/webpack.config.js b/packages/react-component-playground/webpack.config.js
@@ -38,19 +38,25 @@ module.exports = {
     extensions: ['.js', '.jsx'],
   },
   module: {
-    loaders: [{
+    rules: [{
       test: /\.jsx?$/,
-      loader: 'babel-loader',
       include: src,
+      use: 'babel-loader',
     }, {
       test: /\.(css|less)$/,
       include: src,
-      loader: 'style-loader!css-loader?modules&importLoaders=1' +
-              '&localIdentName=[name]__[local]___[hash:base64:5]!less-loader',
+      use: [
+        'style-loader',
+        'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
+        'less-loader',
+      ],
     }, {
       test: /\.css$/,
       include: nodeModules,
-      loader: 'style-loader!css-loader',
+      use: [
+        'style-loader',
+        'css-loader',
+      ],
     }],
   },
   plugins: [

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -29,22 +29,30 @@ module.exports = function setKarmaConfig(config) {
         },
       },
       module: {
-        loaders: [{
+        rules: [{
           test: /\.jsx?$/,
           exclude: /node_modules/,
-          loader: 'babel-loader',
-          query: {
-            plugins: [
-              ['istanbul', { include: ['packages/*/src/**/*.js{,x}'] }],
-            ],
+          use: {
+            loader: 'babel-loader',
+            options: {
+              plugins: [
+                ['istanbul', { include: ['packages/*/src/**/*.js{,x}'] }],
+              ],
+            },
           },
         }, {
           test: /\.less$/,
-          loader: 'style-loader!css-loader?modules&importLoaders=1' +
-              '&localIdentName=[name]__[local]___[hash:base64:5]!less-loader',
+          use: [
+            'style-loader',
+            'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
+            'less-loader',
+          ],
         }, {
           test: /\.css$/,
-          loader: 'style-loader!css-loader',
+          use: [
+            'style-loader',
+            'css-loader',
+          ],
         }],
       },
     },