Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Qlever-LLC/fl-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
sanoel committed Jan 22, 2024
2 parents 76047b7 + ca8a78b commit bd8fb83
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@oada/types": "^3.4.6",
"@overleaf/o-error": "^3.4.0",
"@types/json-pointer": "^1.0.31",
"axios": "^0.27.2",
"axios": "^1.6.0",
"bluebird": "^3.7.2",
"convict": "^6.2.4",
"convict-format-with-moment": "^6.2.0",
Expand Down
93 changes: 68 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ __metadata:
"@typescript-eslint/parser": ^5.38.1
"@yarnpkg/sdks": ^3.0.0-rc.21
ava: ^4.3.3
axios: ^0.27.2
axios: ^1.6.0
bluebird: ^3.7.2
c8: ^7.12.0
chai: ^4.3.6
Expand Down Expand Up @@ -1716,13 +1716,14 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^0.27.2":
version: 0.27.2
resolution: "axios@npm:0.27.2"
"axios@npm:^1.6.0":
version: 1.6.1
resolution: "axios@npm:1.6.1"
dependencies:
follow-redirects: ^1.14.9
follow-redirects: ^1.15.0
form-data: ^4.0.0
checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854
proxy-from-env: ^1.1.0
checksum: 573f03f59b7487d54551b16f5e155d1d130ad4864ed32d1da93d522b78a57123b34e3bde37f822a65ee297e79f1db840f9ad6514addff50d3cbf5caeed39e8dc
languageName: node
linkType: hard

Expand Down Expand Up @@ -3747,7 +3748,7 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9":
"follow-redirects@npm:^1.14.0":
version: 1.15.1
resolution: "follow-redirects@npm:1.15.1"
peerDependenciesMeta:
Expand All @@ -3757,6 +3758,16 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.15.0":
version: 1.15.3
resolution: "follow-redirects@npm:1.15.3"
peerDependenciesMeta:
debug:
optional: true
checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
languageName: node
linkType: hard

"foreach@npm:^2.0.4":
version: 2.0.5
resolution: "foreach@npm:2.0.5"
Expand Down Expand Up @@ -3895,9 +3906,9 @@ __metadata:
linkType: hard

"get-func-name@npm:^2.0.0":
version: 2.0.0
resolution: "get-func-name@npm:2.0.0"
checksum: 8d82e69f3e7fab9e27c547945dfe5cc0c57fc0adf08ce135dddb01081d75684a03e7a0487466f478872b341d52ac763ae49e660d01ab83741f74932085f693c3
version: 2.0.2
resolution: "get-func-name@npm:2.0.2"
checksum: 3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b
languageName: node
linkType: hard

Expand Down Expand Up @@ -6145,6 +6156,13 @@ __metadata:
languageName: node
linkType: hard

"proxy-from-env@npm:^1.1.0":
version: 1.1.0
resolution: "proxy-from-env@npm:1.1.0"
checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
languageName: node
linkType: hard

"psl@npm:^1.1.33":
version: 1.8.0
resolution: "psl@npm:1.8.0"
Expand All @@ -6169,6 +6187,13 @@ __metadata:
languageName: node
linkType: hard

"querystringify@npm:^2.1.1":
version: 2.2.0
resolution: "querystringify@npm:2.2.0"
checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
languageName: node
linkType: hard

"queue-microtask@npm:^1.2.2":
version: 1.2.3
resolution: "queue-microtask@npm:1.2.3"
Expand Down Expand Up @@ -6365,6 +6390,13 @@ __metadata:
languageName: node
linkType: hard

"requires-port@npm:^1.0.0":
version: 1.0.0
resolution: "requires-port@npm:1.0.0"
checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
languageName: node
linkType: hard

"resolve-alpn@npm:^1.0.0, resolve-alpn@npm:^1.2.1":
version: 1.2.1
resolution: "resolve-alpn@npm:1.2.1"
Expand Down Expand Up @@ -6536,11 +6568,11 @@ __metadata:
linkType: hard

"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.6.0":
version: 5.7.1
resolution: "semver@npm:5.7.1"
version: 5.7.2
resolution: "semver@npm:5.7.2"
bin:
semver: ./bin/semver
checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
semver: bin/semver
checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
languageName: node
linkType: hard

Expand Down Expand Up @@ -7151,13 +7183,14 @@ __metadata:
linkType: hard

"tough-cookie@npm:^4.0.0":
version: 4.0.0
resolution: "tough-cookie@npm:4.0.0"
version: 4.1.3
resolution: "tough-cookie@npm:4.1.3"
dependencies:
psl: ^1.1.33
punycode: ^2.1.1
universalify: ^0.1.2
checksum: 0891b37eb7d17faa3479d47f0dce2e3007f2583094ad272f2670d120fbcc3df3b0b0a631ba96ecad49f9e2297d93ff8995ce0d3292d08dd7eabe162f5b224d69
universalify: ^0.2.0
url-parse: ^1.5.3
checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
languageName: node
linkType: hard

Expand Down Expand Up @@ -7355,10 +7388,10 @@ __metadata:
languageName: node
linkType: hard

"universalify@npm:^0.1.2":
version: 0.1.2
resolution: "universalify@npm:0.1.2"
checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff
"universalify@npm:^0.2.0":
version: 0.2.0
resolution: "universalify@npm:0.2.0"
checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
languageName: node
linkType: hard

Expand All @@ -7371,6 +7404,16 @@ __metadata:
languageName: node
linkType: hard

"url-parse@npm:^1.5.3":
version: 1.5.10
resolution: "url-parse@npm:1.5.10"
dependencies:
querystringify: ^2.1.1
requires-port: ^1.0.0
checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
languageName: node
linkType: hard

"utf-8-validate@npm:^6.0.3":
version: 6.0.3
resolution: "utf-8-validate@npm:6.0.3"
Expand Down Expand Up @@ -7490,9 +7533,9 @@ __metadata:
linkType: hard

"word-wrap@npm:^1.2.3":
version: 1.2.3
resolution: "word-wrap@npm:1.2.3"
checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
version: 1.2.5
resolution: "word-wrap@npm:1.2.5"
checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb
languageName: node
linkType: hard

Expand Down

0 comments on commit bd8fb83

Please sign in to comment.