Skip to content

Commit

Permalink
chore(deps): update dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
evilebottnawi authored Dec 24, 2018
2 parents 3b6b8ff + ad3a6b2 commit db92b11
Show file tree
Hide file tree
Showing 8 changed files with 1,455 additions and 914 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
"no-var": "error",
"prefer-const": "error",
"prefer-arrow-callback": "error",
"object-shorthand": "error"
"object-shorthand": "error",
// Allow to use `assert` module
"node/no-deprecated-api": "off"
}
}
38 changes: 25 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,31 @@ branches:

language: node_js

# cache node modules
cache:
directories:
- $HOME/.npm
- node_modules
cache: yarn

node_js:
- "4"
- "6"
- "8"
- "10"
- "11"
matrix:
include:
- node_js: '11'
script: yarn pretest
env: CI=pretest
- node_js: '4'
script: yarn travis
env: CI=tests 4
- node_js: '6'
script: yarn travis
env: CI=tests 6
- node_js: '8'
script: yarn travis
env: CI=tests 8
- node_js: '10'
script: yarn travis
env: CI=tests 10
- node_js: '11'
script: yarn travis
env: CI=tests 11

script: npm run travis
before_install:
- yarn install --ignore-engines

after_success: cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose && rm -rf ./coverage
after_success:
- if [ "$CI" = "coverage" ]; then cat ./.coverage/lcov.info | ./node_modules/.bin/coveralls --verbose && rm -rf ./coverage; fi
7 changes: 4 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ branches:

install:
- ps: Install-Product node $env:nodejs_version
- npm install
- yarn install --ignore-engines

cache:
- node_modules
- node_modules -> appveyor.yml,package.json,yarn.lock
- '%LOCALAPPDATA%\Yarn -> appveyor.yml,package.json,yarn.lock'

test_script:
- node --version
- npm --version
- cmd: "npm run travis"
- cmd: "yarn travis"
2 changes: 1 addition & 1 deletion lib/isUrlRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function isUrlRequest(url, root) {
// 1. it's a Data Url
// 2. it's an absolute url or and protocol-relative
// 3. it's some kind of url for a template
if(/^data:|^.+-extension:\/|^about:blank$|^(https?:)?\/\/|^[\{\}\[\]#*;,'§\$%&\(=?`´\^°<>]/.test(url)) {
if(/^data:|^.+-extension:\/|^about:blank$|^(https?:)?\/\/|^[{}[]#*;,'§\$%&\(=?`´\^°<>]/.test(url)) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/urlToRequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function urlToRequest(url, root) {
case "string":
// special case: `~` roots convert to module request
if(moduleRequestRegex.test(root)) {
request = root.replace(/([^~\/])$/, "$1/") + url.slice(1);
request = root.replace(/([^~/])$/, "$1/") + url.slice(1);
} else {
request = root + url;
}
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"node": ">=4.0.0"
},
"devDependencies": {
"coveralls": "^2.11.2",
"eslint": "^3.15.0",
"eslint-plugin-node": "^4.0.1",
"istanbul": "^0.3.14",
"mocha": "^1.21.4",
"coveralls": "^3.0.2",
"eslint": "^5.11.0",
"eslint-plugin-node": "^8.0.0",
"istanbul": "^0.4.5",
"mocha": "^5.2.0",
"standard-version": "^4.0.0"
},
"main": "lib/index.js",
Expand Down
2 changes: 1 addition & 1 deletion test/parseString.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe("parseString()", () => {
[JSON.stringify("!\"§$%&/()=?'*#+,.-;öäü:_test"), "!\"§$%&/()=?'*#+,.-;öäü:_test"],
["'escaped with single \"'", "escaped with single \""],
["invalid \"' string", "invalid \"' string"],
["\'inconsistent start and end\"", "\'inconsistent start and end\""]
["'inconsistent start and end\"", "'inconsistent start and end\""]
].forEach(test => {
it("should parse " + test[0], () => {
const parsed = loaderUtils.parseString(test[0]);
Expand Down
Loading

0 comments on commit db92b11

Please sign in to comment.