Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jeffbski/wait-on
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.1.0
Choose a base ref
...
head repository: jeffbski/wait-on
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v7.2.0
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 7, 2023

  1. fix: update axios to 1.6.0 to fix CVE-2023-45857

    amaksimenko committed Nov 7, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    junderw Jonathan Underwood
    Copy the full SHA
    69092f4 View commit details

Commits on Nov 13, 2023

  1. chore: bump Axios to 1.6.1

    amaksimenko committed Nov 13, 2023
    Copy the full SHA
    a71be27 View commit details

Commits on Nov 14, 2023

  1. Copy the full SHA
    fc27d1b View commit details
  2. 7.2.0

    jeffbski committed Nov 14, 2023
    Copy the full SHA
    a10322f View commit details
Showing with 25 additions and 15 deletions.
  1. +1 −2 lib/wait-on.js
  2. +22 −11 package-lock.json
  3. +2 −2 package.json
3 changes: 1 addition & 2 deletions lib/wait-on.js
Original file line number Diff line number Diff line change
@@ -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);
33 changes: 22 additions & 11 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "wait-on",
"description": "wait-on is a cross platform command line utility and Node.js API which will wait for files, ports, sockets, and http(s) resources to become available",
"version": "7.1.0",
"version": "7.2.0",
"main": "lib/wait-on",
"bin": {
"wait-on": "bin/wait-on"
@@ -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",