Skip to content
This repository has been archived by the owner on Jul 18, 2019. It is now read-only.

Commit

Permalink
fix(getOptions): deprecation warn in loaderUtils (#37)
Browse files Browse the repository at this point in the history
* fix(getOptions): deprecation warn in loaderUtils

* ci(Travis): update to contrib standard build

* chore(yarn): add lock file and treat as binary

* ci(Travis): add note about defaults upgrade
  • Loading branch information
joshwiens authored Feb 25, 2017
1 parent f88beb1 commit 30550a9
Show file tree
Hide file tree
Showing 5 changed files with 1,670 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn.lock -diff
42 changes: 34 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
# Tasks are commented out purposfully. Will be uncommented for webpack-defaults application
sudo: false
language: node_js
os:
- linux
- osx
node_js:
- node
- "6"
- "5"
- "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:
- 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
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function jsHint(input, options) {
}

// copy query into options
var query = loaderUtils.parseQuery(this.query);
var query = loaderUtils.getOptions(this) || {};
for(var name in query) {
options[name] = query[name];
}
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Tobias Koppers @sokra",
"description": "jshint loader module for webpack",
"dependencies": {
"loader-utils": "0.2.x",
"loader-utils": "^1.0.2",
"rcloader": "=0.1.2",
"strip-json-comments": "0.1.x"
},
Expand All @@ -29,6 +29,7 @@
"webpack": "^1.13.1"
},
"scripts": {
"test": "mocha --harmony --full-trace --check-leaks"
"test": "npm run travis:test",
"travis:test": "mocha --harmony --full-trace --check-leaks"
}
}
Loading

0 comments on commit 30550a9

Please sign in to comment.