Skip to content

Commit

Permalink
Update dependencies and dev dependencies
Browse files Browse the repository at this point in the history
Closes #3606. Closes #3604.
  • Loading branch information
domenic committed Nov 26, 2023
1 parent 6626781 commit 1ee4d61
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 107 deletions.
8 changes: 3 additions & 5 deletions lib/jsdom/living/helpers/agent-factory.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"use strict";
const http = require("http");
const https = require("https");
const { parse: parseURLToNodeOptions } = require("url");
const HttpProxyAgent = require("http-proxy-agent");
const HttpsProxyAgent = require("https-proxy-agent");
const { HttpProxyAgent } = require("http-proxy-agent");
const { HttpsProxyAgent } = require("https-proxy-agent");

module.exports = function agentFactory(proxy, rejectUnauthorized) {
const agentOpts = { keepAlive: true, rejectUnauthorized };
if (proxy) {
const proxyOpts = { ...parseURLToNodeOptions(proxy), ...agentOpts };
return { https: new HttpsProxyAgent(proxyOpts), http: new HttpProxyAgent(proxyOpts) };
return { https: new HttpsProxyAgent(proxy, agentOpts), http: new HttpProxyAgent(proxy, agentOpts) };
}
return { http: new http.Agent(agentOpts), https: new https.Agent(agentOpts) };
};
156 changes: 70 additions & 86 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@
"repository": "jsdom/jsdom",
"dependencies": {
"cssstyle": "^3.0.0",
"data-urls": "^4.0.0",
"data-urls": "^5.0.0",
"decimal.js": "^10.4.3",
"form-data": "^4.0.0",
"html-encoding-sniffer": "^3.0.0",
"http-proxy-agent": "^5.0.0",
"https-proxy-agent": "^5.0.1",
"html-encoding-sniffer": "^4.0.0",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.2",
"is-potential-custom-element-name": "^1.0.1",
"nwsapi": "^2.2.4",
"nwsapi": "^2.2.7",
"parse5": "^7.1.2",
"rrweb-cssom": "^0.6.0",
"saxes": "^6.0.0",
"symbol-tree": "^3.2.4",
"tough-cookie": "^4.1.2",
"w3c-xmlserializer": "^4.0.0",
"tough-cookie": "^4.1.3",
"w3c-xmlserializer": "^5.0.0",
"webidl-conversions": "^7.0.0",
"whatwg-encoding": "^2.0.0",
"whatwg-mimetype": "^3.0.0",
"whatwg-url": "^12.0.1",
"ws": "^8.13.0",
"xml-name-validator": "^4.0.0"
"whatwg-encoding": "^3.1.1",
"whatwg-mimetype": "^4.0.0",
"whatwg-url": "^14.0.0",
"ws": "^8.14.2",
"xml-name-validator": "^5.0.0"
},
"peerDependencies": {
"canvas": "^2.5.0"
"canvas": "^3.0.0"

This comment has been minimized.

Copy link
@SamuelWei

SamuelWei Nov 27, 2023

@domenic: There is no node package for canvas yet (https://www.npmjs.com/package/canvas?activeTab=versions), so installing the latest jsdom version will fail.

This comment has been minimized.

Copy link
@domenic

domenic Nov 27, 2023

Author Member

Oh goodness, so sorry about that. Thank you for alerting me. I will try to fix this tonight, but it might take an additional 24 hours.

},
"peerDependenciesMeta": {
"canvas": {
Expand All @@ -53,12 +53,12 @@
"devDependencies": {
"@domenic/eslint-config": "^3.0.0",
"benchmark": "^2.1.4",
"chai": "^4.3.7",
"eslint": "^8.39.0",
"chai": "^4.3.10",
"eslint": "^8.54.0",
"eslint-plugin-html": "^7.1.0",
"eslint-plugin-jsdom-internal": "file:./scripts/eslint-plugin",
"js-yaml": "^4.1.0",
"minimatch": "^9.0.0",
"minimatch": "^9.0.3",
"mocha": "^10.2.0",
"mocha-sugar-free": "^1.4.0",
"pngjs": "^7.0.0",
Expand Down

0 comments on commit 1ee4d61

Please sign in to comment.