Remove coverage check and replace loader with use

Webpack loader is deprecated and replaced with use:{loader:...}
mkungla · May 14, 2017 · 909ee9b · 909ee9b
1 parent cc526ca
commit 909ee9b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ install:
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  
+
 # All commands executed should be present in your package.json
 # CI_JOB is job matrix which we define below
 script: npm run $CI_JOB
@@ -31,7 +31,7 @@ env:
     # Lint sass and js
     - CI_JOB="lint"
     # Run tests and generate coverage report
-    - CI_JOB="coverage"
+    - CI_JOB="coverage:run"
 
 # run that job only on master branch
 branches:

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ $theme: red;
 [license-image]: https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square
 [license-url]: https://raw.githubusercontent.com/mkungla/aframe-php/master/LICENSE
 <!-- A-Frame -->
-[aframe-image]: https://img.shields.io/badge/a--frame-0.4.0-FC3164.svg?style=flat-square
+[aframe-image]: https://img.shields.io/badge/a--frame-0.5.0-FC3164.svg?style=flat-square
 [aframe-url]: https://aframe.io/
 <!-- travis-ci -->
 [ci-image]: https://travis-ci.org/mkungla/aframe-webpack-boilerplate.svg?branch=master

diff --git a/config/webpack.config.babel.js b/config/webpack.config.babel.js
@@ -226,38 +226,48 @@ module.exports = {
       {
         test: /\.js[x]?$/,
         enforce: 'pre',
-        loader: 'eslint-loader',
-        options: {
-          configFile: './config/eslint.json',
+        use: {
+          loader: 'eslint-loader',
+          options: {
+            configFile: './config/eslint.json',
+          },
         },
         include: [src],
         exclude: [/node_modules/],
       },{
         test: /\.js[x]?$/,
         include: [src],
         exclude: [/node_modules/],
-        loader: 'babel-loader',
+        use: {
+          loader: 'babel-loader',
+        },
       },{
         test: /\.html$/,
-        loader: 'html-loader',
+        use: {
+          loader: 'html-loader',
+        },
       },{
         test: /\.hbs/,
-        loader: "handlebars-loader"
+        use: {
+          loader: "handlebars-loader",
+        },
       },{
         test: /\.json$/,
-        loader: 'json-loader',
+        use: {
+          loader: 'json-loader',
+        },
       },{
         test: /\.(jpg|jpeg)$/,
-        loader: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/jpg'
+        use: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/jpg'
       },{
         test: /\.gif$/,
-        loader: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/gif'
+        use: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/gif'
       },{
         test: /\.png$/,
         use: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/png'
       },{
         test: /\.svg$/,
-        loader: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/svg+xml'
+        use: 'url-loader?name=[name].[ext]&limit=8192&mimetype=image/svg+xml'
       },{
         test: /\.woff?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         use: ['url-loader?name=[name].[ext]&limit=100000&mimetype=application/font-woff']
@@ -269,7 +279,7 @@ module.exports = {
         use: ['file-loader?name=[name].[ext]&limit=100000&mimetype=application/octet-stream']
       },{
         test: /\.otf(\?.*)?$/,
-        loader: 'file-loader?name=[name].[ext]&limit=10000&mimetype=font/opentype'
+        use: 'file-loader?name=[name].[ext]&limit=10000&mimetype=font/opentype'
       },
     ].concat(cssRules)
   },