Skip to content

Commit

Permalink
Update dependencies and regenerate package-lock.json (#467)
Browse files Browse the repository at this point in the history
* Update dependencies and regenerate package-lock.json

* debug       ^4.1.1  →   ^4.2.0
* got        ^11.6.0  →  ^11.7.0
* penthouse   ^2.3.1  →   ^2.3.2
* postcss    ^7.0.32  →   ^7.0.35
* prettier    ^2.1.1  →   ^2.1.2
* vinyl       ^2.2.0  →   ^2.2.1
* jest       ^26.4.2  →  ^26.5.0

* Increase timeout

* Changes tests to match supported versions: '^10 || ^12 || >=14'

* Lock node versions & bump dependencies

* Use self hosted status urls

Co-authored-by: Ben Zörb <[email protected]>
  • Loading branch information
XhmikosR and Ben Zörb authored Oct 6, 2020
1 parent a02ef99 commit 9730b24
Show file tree
Hide file tree
Showing 8 changed files with 1,253 additions and 1,295 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [10.x, 12.x, 13.x]
node: [10.x, 12.x, 14.x]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
2,490 changes: 1,226 additions & 1,264 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
"optimization"
],
"engines": {
"node": ">=10"
"node": "^10 || ^12 || >=14"
},
"dependencies": {
"@hapi/joi": "^17.1.1",
"chalk": "^4.1.0",
"clean-css": "^4.2.3",
"common-tags": "^1.8.0",
"css-url-parser": "^1.1.3",
"debug": "^4.1.1",
"debug": "^4.2.0",
"find-up": "^5.0.0",
"get-stdin": "^8.0.0",
"globby": "^11.0.1",
"got": "^11.6.0",
"got": "^11.7.0",
"group-args": "^0.1.0",
"indent-string": "^4.0.0",
"inline-critical": "^6.0.1",
Expand All @@ -45,24 +45,24 @@
"meow": "^7.1.1",
"oust": "^1.0.2",
"p-all": "^3.0.0",
"penthouse": "^2.3.1",
"penthouse": "^2.3.2",
"plugin-error": "^1.0.1",
"postcss": "^7.0.32",
"postcss": "^8.1.1",
"postcss-discard": "^1.0.1",
"postcss-image-inliner": "^4.0.3",
"postcss-url": "^8.0.0",
"prettier": "^2.1.1",
"prettier": "^2.1.2",
"replace-ext": "^2.0.0",
"slash": "^3.0.0",
"tempy": "^0.6.0",
"tempy": "^0.7.1",
"through2": "^4.0.2",
"vinyl": "^2.2.0"
"vinyl": "^2.2.1"
},
"devDependencies": {
"async": "^3.2.0",
"finalhandler": "^1.1.2",
"get-port": "^5.1.1",
"jest": "^26.4.2",
"jest": "^26.5.2",
"nock": "^13.0.4",
"normalize-newline": "^3.0.0",
"serve-static": "^1.14.1",
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const nn = require('normalize-newline');
const {read, readAndRemove} = require('./helper');
const {generate} = require('..');

jest.setTimeout(60000);
jest.setTimeout(100000);

const FIXTURES_DIR = path.join(__dirname, '/fixtures/');

Expand Down
2 changes: 1 addition & 1 deletion test/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const criticalBin = path.join(__dirname, '..', bin);
process.chdir(path.resolve(__dirname));
process.setMaxListeners(0);

jest.setTimeout(60000);
jest.setTimeout(100000);

const pExec = promisify(exec);
const pExecFile = promisify(execFile);
Expand Down
14 changes: 6 additions & 8 deletions test/fixtures/403-css.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<head>
<meta charset="utf-8" />
<title>Title</title>
<link href="http://httpstat.us/403" rel="stylesheet">
</head>
<body>

</body>
<link href="https://status.sommerlaune.com/403" rel="stylesheet" />
</head>
<body></body>
</html>
14 changes: 6 additions & 8 deletions test/fixtures/404-css.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<head>
<meta charset="utf-8" />
<title>Title</title>
<link href="http://httpstat.us/404" rel="stylesheet">
</head>
<body>

</body>
<link href="https://status.sommerlaune.com/404" rel="stylesheet" />
</head>
<body></body>
</html>
6 changes: 3 additions & 3 deletions test/fixtures/issue-314.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<title>https://httpstat.us/418</title>
<link rel="canonical" href="https://httpstat.us/418" />
<title>https://status.sommerlaune.com/418</title>
<link rel="canonical" href="https://status.sommerlaune.com/418" />
<meta name="robots" content="noindex" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!--
The next meta makes critical (or puppeteer) throw:
Protocol error (Runtime.callFunctionOn): Cannot find context with specified id undefined
-->
<meta http-equiv="refresh" content="0; url=https://httpstat.us/418" />
<meta http-equiv="refresh" content="0; url=https://status.sommerlaune.com/418" />
</head>
</html>

0 comments on commit 9730b24

Please sign in to comment.