Skip to content

Commit db92b11

Browse files
authoredDec 24, 2018
chore(deps): update dev dependencies
2 parents 3b6b8ff + ad3a6b2 commit db92b11

8 files changed

+1455
-914
lines changed
 

‎.eslintrc.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
"no-var": "error",
5252
"prefer-const": "error",
5353
"prefer-arrow-callback": "error",
54-
"object-shorthand": "error"
54+
"object-shorthand": "error",
55+
// Allow to use `assert` module
56+
"node/no-deprecated-api": "off"
5557
}
5658
}

‎.travis.yml

+25-13
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,31 @@ branches:
99

1010
language: node_js
1111

12-
# cache node modules
13-
cache:
14-
directories:
15-
- $HOME/.npm
16-
- node_modules
12+
cache: yarn
1713

18-
node_js:
19-
- "4"
20-
- "6"
21-
- "8"
22-
- "10"
23-
- "11"
14+
matrix:
15+
include:
16+
- node_js: '11'
17+
script: yarn pretest
18+
env: CI=pretest
19+
- node_js: '4'
20+
script: yarn travis
21+
env: CI=tests 4
22+
- node_js: '6'
23+
script: yarn travis
24+
env: CI=tests 6
25+
- node_js: '8'
26+
script: yarn travis
27+
env: CI=tests 8
28+
- node_js: '10'
29+
script: yarn travis
30+
env: CI=tests 10
31+
- node_js: '11'
32+
script: yarn travis
33+
env: CI=tests 11
2434

25-
script: npm run travis
35+
before_install:
36+
- yarn install --ignore-engines
2637

27-
after_success: cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose && rm -rf ./coverage
38+
after_success:
39+
- if [ "$CI" = "coverage" ]; then cat ./.coverage/lcov.info | ./node_modules/.bin/coveralls --verbose && rm -rf ./coverage; fi

‎appveyor.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ branches:
2020

2121
install:
2222
- ps: Install-Product node $env:nodejs_version
23-
- npm install
23+
- yarn install --ignore-engines
2424

2525
cache:
26-
- node_modules
26+
- node_modules -> appveyor.yml,package.json,yarn.lock
27+
- '%LOCALAPPDATA%\Yarn -> appveyor.yml,package.json,yarn.lock'
2728

2829
test_script:
2930
- node --version
3031
- npm --version
31-
- cmd: "npm run travis"
32+
- cmd: "yarn travis"

‎lib/isUrlRequest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function isUrlRequest(url, root) {
55
// 1. it's a Data Url
66
// 2. it's an absolute url or and protocol-relative
77
// 3. it's some kind of url for a template
8-
if(/^data:|^.+-extension:\/|^about:blank$|^(https?:)?\/\/|^[\{\}\[\]#*;,'§\$%&\(=?`´\^°<>]/.test(url)) {
8+
if(/^data:|^.+-extension:\/|^about:blank$|^(https?:)?\/\/|^[{}[]#*;,'§\$%&\(=?`´\^°<>]/.test(url)) {
99
return false;
1010
}
1111

‎lib/urlToRequest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function urlToRequest(url, root) {
2222
case "string":
2323
// special case: `~` roots convert to module request
2424
if(moduleRequestRegex.test(root)) {
25-
request = root.replace(/([^~\/])$/, "$1/") + url.slice(1);
25+
request = root.replace(/([^~/])$/, "$1/") + url.slice(1);
2626
} else {
2727
request = root + url;
2828
}

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
"node": ">=4.0.0"
2626
},
2727
"devDependencies": {
28-
"coveralls": "^2.11.2",
29-
"eslint": "^3.15.0",
30-
"eslint-plugin-node": "^4.0.1",
31-
"istanbul": "^0.3.14",
32-
"mocha": "^1.21.4",
28+
"coveralls": "^3.0.2",
29+
"eslint": "^5.11.0",
30+
"eslint-plugin-node": "^8.0.0",
31+
"istanbul": "^0.4.5",
32+
"mocha": "^5.2.0",
3333
"standard-version": "^4.0.0"
3434
},
3535
"main": "lib/index.js",

‎test/parseString.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe("parseString()", () => {
99
[JSON.stringify("!\"§$%&/()=?'*#+,.-;öäü:_test"), "!\"§$%&/()=?'*#+,.-;öäü:_test"],
1010
["'escaped with single \"'", "escaped with single \""],
1111
["invalid \"' string", "invalid \"' string"],
12-
["\'inconsistent start and end\"", "\'inconsistent start and end\""]
12+
["'inconsistent start and end\"", "'inconsistent start and end\""]
1313
].forEach(test => {
1414
it("should parse " + test[0], () => {
1515
const parsed = loaderUtils.parseString(test[0]);

‎yarn.lock

+1,415-889
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.