Merge pull request #147 from webpack-contrib/d3viant0ne-TravisUpdates

fix(getOptions): deprecation warn in loaderUtils

Author: jhnns

.gitattributes

@@ -0,0 +1 @@
+yarn.lock -diff

.gitignore

@@ -1,2 +1,3 @@
 /node_modules
-test/output/*
+test/node_modules/*
+test/output/*

.travis.yml

@@ -1,13 +1,36 @@
+# Tasks are commented out purposfully. Will be uncommented for webpack-defaults application
 sudo: false
 language: node_js
-node_js:
-  - "0.10"
-  - "0.11"
-  - "0.12"
-  - "4"
+branches:
+  only:
+    - master
+matrix:
+  fast_finish: true
+  include:
+    - os: linux
+      node_js: '6'
+      env: JOB_PART=test
+    - os: linux
+      node_js: '4.3'
+      env: JOB_PART=test
+    - os: linux
+      node_js: '7'
+      env: JOB_PART=test
+    # - os: linux
+    #   node_js: '7'
+    #   env: WEBPACK_VERSION="2.2.0" BITHOUND_CHECK=true JOB_PART=lint
+    # - os: linux
+    #   node_js: '7'
+    #   env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
+before_install:
+  - nvm --version
+  - node --version
+before_script:
+  # - if [ "$WEBPACK_VERSION" ]; then yarn add webpack@^$WEBPACK_VERSION; fi
+  # - if [ "$BITHOUND_CHECK" ]; then npm install -g bithound; bithound check [email protected]:$TRAVIS_REPO_SLUG.git; fi
 script:
-  - "npm test"
-  # test with npm@3
-  - "rm -rf node_modules && npm install npm@3"
-  - "node_modules/.bin/npm install"
-  - "node_modules/.bin/npm test"
+  - yarn run travis:$JOB_PART
+# after_success:
+#   - bash <(curl -s https://codecov.io/bash)
+
+# TODO: This test suite will throw schema errors with webpack 2.2.x installed. Address this on defaults upgrade to Jest

index.js

@@ -15,7 +15,7 @@ var trailingSlash = /[\\\/]$/;
 
 module.exports = function(source) {
 	var loaderContext = this;
-	var query = loaderUtils.parseQuery(this.query);
+	var query = loaderUtils.getOptions(this) || {};
 	var cb = this.async();
 	var isSync = typeof cb !== "function";
 	var finalCb = cb || this.callback;

package.json

@@ -4,7 +4,8 @@
   "author": "Tobias Koppers @sokra",
   "description": "less loader module for webpack",
   "scripts": {
-    "test": "node --no-deprecation node_modules/.bin/_mocha -R spec",
+    "test": "npm run travis:test",
+    "travis:test": "node --no-deprecation node_modules/.bin/_mocha -R spec",
     "test-source-map": "webpack --config test/sourceMap/webpack.config.js && open ./test/sourceMap/index.html"
   },
   "peerDependencies": {
@@ -31,6 +32,6 @@
     }
   ],
   "dependencies": {
-    "loader-utils": "^0.2.5"
+    "loader-utils": "^1.0.2"
   }
 }