Skip to content

Commit

Permalink
Merge branch 'AndrewMax-amaks/fix/axios-1.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbski committed Nov 14, 2023
2 parents aefc49e + a71be27 commit fc27d1b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
3 changes: 1 addition & 2 deletions lib/wait-on.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ const https = require('https');
const net = require('net');
const util = require('util');
const axiosPkg = require('axios').default;
const axiosHttpAdapter = require('axios/lib/adapters/http');
const { isBoolean, isEmpty, negate, noop, once, partial, pick, zip } = require('lodash/fp');
const { NEVER, combineLatest, from, merge, throwError, timer } = require('rxjs');
const { distinctUntilChanged, map, mergeMap, scan, startWith, take, takeWhile } = require('rxjs/operators');

// force http adapter for axios, otherwise if using jest/jsdom xhr might
// be used and it logs all errors polluting the logs
const axios = axiosPkg.create({ adapter: axiosHttpAdapter });
const axios = axiosPkg.create({ adapter: 'http' });
const isNotABoolean = negate(isBoolean);
const isNotEmpty = negate(isEmpty);
const fstat = promisify(fs.stat);
Expand Down
31 changes: 21 additions & 10 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"temp": "^0.9.4"
},
"dependencies": {
"axios": "^0.27.2",
"axios": "^1.6.1",
"joi": "^17.11.0",
"lodash": "^4.17.21",
"minimist": "^1.2.8",
Expand Down

0 comments on commit fc27d1b

Please sign in to comment.