Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

Commit

Permalink
Deps (#290)
Browse files Browse the repository at this point in the history
* bump defaults

* update deps
  • Loading branch information
evantahler authored Aug 1, 2021
1 parent c9c8d50 commit e91d4e2
Show file tree
Hide file tree
Showing 7 changed files with 9,132 additions and 13,474 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v16
22,537 changes: 9,089 additions & 13,448 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@
"node": ">=12.0.0"
},
"peerDependencies": {
"actionhero": ">=24.0.4"
"actionhero": ">=26.1.2"
},
"devDependencies": {
"@babel/core": "^7.13.14",
"@babel/preset-env": "^7.13.12",
"@babel/preset-react": "^7.13.13",
"@babel/core": "^7.14.8",
"@babel/preset-env": "^7.14.9",
"@babel/preset-react": "^7.14.5",
"@nivo/axes": "^0.69.1",
"@nivo/bump": "^0.69.1",
"@nivo/core": "^0.69.0",
"@types/jest": "^26.0.22",
"@types/react": "^17.0.3",
"@types/jest": "^26.0.24",
"@types/react": "^17.0.15",
"actionhero": "^26.0.5",
"babel-loader": "^8.2.2",
"babel-polyfill": "^6.26.0",
"jest": "^26.6.3",
"prettier": "^2.2.1",
"jest": "^27.0.6",
"prettier": "^2.3.2",
"react": "^17.0.2",
"react-bootstrap": "^1.5.2",
"react-bootstrap": "^1.6.1",
"react-dom": "^17.0.2",
"react-router-bootstrap": "^0.25.0",
"react-router-dom": "^5.2.0",
"ts-jest": "^26.5.4",
"ts-node-dev": "^1.1.6",
"typescript": "^4.2.3",
"webpack": "^5.28.0",
"webpack-cli": "^4.6.0"
"ts-jest": "^27.0.4",
"ts-node-dev": "^1.1.8",
"typescript": "^4.3.5",
"webpack": "^5.47.1",
"webpack-cli": "^4.7.2"
},
"scripts": {
"dev": "ts-node-dev --no-deps --transpile-only ./src/server.ts",
Expand Down
33 changes: 25 additions & 8 deletions public/javascript/ActionheroWebsocketClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -1854,8 +1854,8 @@ exports.clearImmediate = typeof clearImmediate === "function" ? clearImmediate :

var required = _dereq_('requires-port')
, qs = _dereq_('querystringify')
, slashes = /^[A-Za-z][A-Za-z0-9+-.]*:\/\//
, protocolre = /^([a-z][a-z0-9.+-]*:)?(\/\/)?([\S\s]*)/i
, slashes = /^[A-Za-z][A-Za-z0-9+-.]*:[\\/]+/
, protocolre = /^([a-z][a-z0-9.+-]*:)?([\\/]{1,})?([\S\s]*)/i
, whitespace = '[\\x09\\x0A\\x0B\\x0C\\x0D\\x20\\xA0\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000\\u2028\\u2029\\uFEFF]'
, left = new RegExp('^'+ whitespace +'+');

Expand Down Expand Up @@ -1967,12 +1967,16 @@ function lolcation(loc) {
*/
function extractProtocol(address) {
address = trimLeft(address);
var match = protocolre.exec(address);

var match = protocolre.exec(address)
, protocol = match[1] ? match[1].toLowerCase() : ''
, slashes = !!(match[2] && match[2].length >= 2)
, rest = match[2] && match[2].length === 1 ? '/' + match[3] : match[3];

return {
protocol: match[1] ? match[1].toLowerCase() : '',
slashes: !!match[2],
rest: match[3]
protocol: protocol,
slashes: slashes,
rest: rest
};
}

Expand Down Expand Up @@ -2132,6 +2136,14 @@ function Url(address, location, parser) {
url.pathname = resolve(url.pathname, location.pathname);
}

//
// Default to a / for pathname if none exists. This normalizes the URL
// to always have a /
//
if (url.pathname.charAt(0) !== '/' && url.hostname) {
url.pathname = '/' + url.pathname;
}

//
// We should not add port numbers if they are already the default port number
// for a given protocol. As the host also contains the port number we're going
Expand Down Expand Up @@ -3565,7 +3577,12 @@ Primus.prototype.client = function client() {
//
if (Factory.length === 3) {
if ('ws+unix:' === options.protocol) {
options.pathname = primus.url.pathname +':'+ primus.pathname;
options.pathname =
'/' +
primus.url.hostname +
primus.url.pathname +
':' +
primus.pathname;
}
primus.socket = socket = new Factory(
primus.uri(options), // URL
Expand Down Expand Up @@ -3637,7 +3654,7 @@ Primus.prototype.decoder = function decoder(data, fn) {

fn(err, data);
};
Primus.prototype.version = "8.0.1";
Primus.prototype.version = "8.0.3";

if (
'undefined' !== typeof document
Expand Down
2 changes: 1 addition & 1 deletion public/javascript/ActionheroWebsocketClient.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/resque/js/app.bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/resque/js/app.bundle.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object-assign
*/

/*!
Copyright (c) 2017 Jed Watson.
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
Expand Down

0 comments on commit e91d4e2

Please sign in to comment.