Skip to content

Commit 260f07d

Browse files
authored
Merge branch 'master' into renovate/npm-sentry-browser-vulnerability
2 parents 01a9241 + 25870eb commit 260f07d

File tree

17 files changed

+582
-130
lines changed

17 files changed

+582
-130
lines changed

export/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"dependencies": {
2020
"@sentry/node": "5.30.0",
2121
"@sparticuz/chromium": "^123.0.0",
22-
"axios": "0.28.0",
22+
"axios": "0.30.0",
2323
"bunyan": "1.8.15",
2424
"fs-extra": "9.1.0",
2525
"http-graceful-shutdown": "2.4.0",
2626
"joi": "^17.12.3",
27-
"koa": "2.15.4",
27+
"koa": "2.16.2",
2828
"koa-router": "10.1.1",
2929
"koa-views": "6.3.1",
3030
"lodash": "4.17.21",

export/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,12 @@ at-least-node@^1.0.0:
443443
resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
444444
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
445445

446-
axios@0.28.0:
447-
version "0.28.0"
448-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.28.0.tgz#801a4d991d0404961bccef46800e1170f8278c89"
449-
integrity sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==
446+
axios@0.30.0:
447+
version "0.30.0"
448+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.30.0.tgz#026ae2c0ae6ac35d564056690683fb77c991d0d3"
449+
integrity sha512-Z4F3LjCgfjZz8BMYalWdMgAQUnEtKDmpwNHjh/C8pQZWde32TF64cqnSeyL3xD/aTIASRU30RHTNzRiV/NpGMg==
450450
dependencies:
451-
follow-redirects "^1.15.0"
451+
follow-redirects "^1.15.4"
452452
form-data "^4.0.0"
453453
proxy-from-env "^1.1.0"
454454

@@ -1002,10 +1002,10 @@ fill-range@^7.0.1:
10021002
dependencies:
10031003
to-regex-range "^5.0.1"
10041004

1005-
follow-redirects@^1.15.0:
1006-
version "1.15.9"
1007-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
1008-
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
1005+
follow-redirects@^1.15.4:
1006+
version "1.15.11"
1007+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
1008+
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
10091009

10101010
follow-redirects@^1.15.6:
10111011
version "1.15.6"
@@ -1475,10 +1475,10 @@ [email protected]:
14751475
mz "^2.4.0"
14761476
pretty "^2.0.0"
14771477

1478-
koa@2.15.4:
1479-
version "2.15.4"
1480-
resolved "https://registry.yarnpkg.com/koa/-/koa-2.15.4.tgz#7000b3d8354558671adb1ba1b1c09bedb5f8da75"
1481-
integrity sha512-7fNBIdrU2PEgLljXoPWoyY4r1e+ToWCmzS/wwMPbUNs7X+5MMET1ObhJBlUkF5uZG9B6QhM2zS1TsH6adegkiQ==
1478+
koa@2.16.2:
1479+
version "2.16.2"
1480+
resolved "https://registry.yarnpkg.com/koa/-/koa-2.16.2.tgz#1292a3b415a9b9f3dd6872c1835229630a4ecae3"
1481+
integrity sha512-+CCssgnrWKx9aI3OeZwroa/ckG4JICxvIFnSiOUyl2Uv+UTI+xIw0FfFrWS7cQFpoePpr9o8csss7KzsTzNL8Q==
14821482
dependencies:
14831483
accepts "^1.3.5"
14841484
cache-content-type "^1.0.0"

packages/browserslist-config-nusmods/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"start": "node scripts/generate.js"
1111
},
1212
"devDependencies": {
13-
"axios": "0.28.0",
13+
"axios": "0.30.0",
1414
"browserslist": "4.24.3",
1515
"fs-extra": "9.1.0",
1616
"lodash": "4.17.21",

packages/browserslist-config-nusmods/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ at-least-node@^1.0.0:
1212
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
1313
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
1414

15-
axios@0.28.0:
16-
version "0.28.0"
17-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.28.0.tgz#801a4d991d0404961bccef46800e1170f8278c89"
18-
integrity sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==
15+
axios@0.30.0:
16+
version "0.30.0"
17+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.30.0.tgz#026ae2c0ae6ac35d564056690683fb77c991d0d3"
18+
integrity sha512-Z4F3LjCgfjZz8BMYalWdMgAQUnEtKDmpwNHjh/C8pQZWde32TF64cqnSeyL3xD/aTIASRU30RHTNzRiV/NpGMg==
1919
dependencies:
20-
follow-redirects "^1.15.0"
20+
follow-redirects "^1.15.4"
2121
form-data "^4.0.0"
2222
proxy-from-env "^1.1.0"
2323

@@ -58,10 +58,10 @@ escalade@^3.2.0:
5858
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
5959
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
6060

61-
follow-redirects@^1.15.0:
62-
version "1.15.9"
63-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
64-
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
61+
follow-redirects@^1.15.4:
62+
version "1.15.11"
63+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
64+
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
6565

6666
form-data@^4.0.0:
6767
version "4.0.0"

scrapers/cpex-scraper/yarn.lock

Lines changed: 115 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ asynckit@^0.4.0:
233233
integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
234234

235235
axios@^1.3.4:
236-
version "1.7.9"
237-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a"
238-
integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==
236+
version "1.11.0"
237+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
238+
integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
239239
dependencies:
240240
follow-redirects "^1.15.6"
241-
form-data "^4.0.0"
241+
form-data "^4.0.4"
242242
proxy-from-env "^1.1.0"
243243

244244
balanced-match@^1.0.0:
@@ -261,6 +261,14 @@ braces@^3.0.3:
261261
dependencies:
262262
fill-range "^7.1.1"
263263

264+
call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
265+
version "1.0.2"
266+
resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
267+
integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
268+
dependencies:
269+
es-errors "^1.3.0"
270+
function-bind "^1.1.2"
271+
264272
callsites@^3.0.0:
265273
version "3.1.0"
266274
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -338,6 +346,42 @@ doctrine@^3.0.0:
338346
dependencies:
339347
esutils "^2.0.2"
340348

349+
dunder-proto@^1.0.1:
350+
version "1.0.1"
351+
resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
352+
integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
353+
dependencies:
354+
call-bind-apply-helpers "^1.0.1"
355+
es-errors "^1.3.0"
356+
gopd "^1.2.0"
357+
358+
es-define-property@^1.0.1:
359+
version "1.0.1"
360+
resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
361+
integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
362+
363+
es-errors@^1.3.0:
364+
version "1.3.0"
365+
resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
366+
integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
367+
368+
es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
369+
version "1.1.1"
370+
resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
371+
integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
372+
dependencies:
373+
es-errors "^1.3.0"
374+
375+
es-set-tostringtag@^2.1.0:
376+
version "2.1.0"
377+
resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
378+
integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
379+
dependencies:
380+
es-errors "^1.3.0"
381+
get-intrinsic "^1.2.6"
382+
has-tostringtag "^1.0.2"
383+
hasown "^2.0.2"
384+
341385
escape-string-regexp@^4.0.0:
342386
version "4.0.0"
343387
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -516,24 +560,55 @@ flatted@^3.2.9:
516560
integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
517561

518562
follow-redirects@^1.15.6:
519-
version "1.15.9"
520-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
521-
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
563+
version "1.15.11"
564+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
565+
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
522566

523-
form-data@^4.0.0:
524-
version "4.0.1"
525-
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
526-
integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
567+
form-data@^4.0.4:
568+
version "4.0.4"
569+
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
570+
integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
527571
dependencies:
528572
asynckit "^0.4.0"
529573
combined-stream "^1.0.8"
574+
es-set-tostringtag "^2.1.0"
575+
hasown "^2.0.2"
530576
mime-types "^2.1.12"
531577

532578
fs.realpath@^1.0.0:
533579
version "1.0.0"
534580
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
535581
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
536582

583+
function-bind@^1.1.2:
584+
version "1.1.2"
585+
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
586+
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
587+
588+
get-intrinsic@^1.2.6:
589+
version "1.3.0"
590+
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
591+
integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
592+
dependencies:
593+
call-bind-apply-helpers "^1.0.2"
594+
es-define-property "^1.0.1"
595+
es-errors "^1.3.0"
596+
es-object-atoms "^1.1.1"
597+
function-bind "^1.1.2"
598+
get-proto "^1.0.1"
599+
gopd "^1.2.0"
600+
has-symbols "^1.1.0"
601+
hasown "^2.0.2"
602+
math-intrinsics "^1.1.0"
603+
604+
get-proto@^1.0.1:
605+
version "1.0.1"
606+
resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
607+
integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
608+
dependencies:
609+
dunder-proto "^1.0.1"
610+
es-object-atoms "^1.0.0"
611+
537612
glob-parent@^5.1.2:
538613
version "5.1.2"
539614
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -579,6 +654,11 @@ globby@^11.1.0:
579654
merge2 "^1.4.1"
580655
slash "^3.0.0"
581656

657+
gopd@^1.2.0:
658+
version "1.2.0"
659+
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
660+
integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
661+
582662
graphemer@^1.4.0:
583663
version "1.4.0"
584664
resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -589,6 +669,25 @@ has-flag@^4.0.0:
589669
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
590670
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
591671

672+
has-symbols@^1.0.3, has-symbols@^1.1.0:
673+
version "1.1.0"
674+
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
675+
integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
676+
677+
has-tostringtag@^1.0.2:
678+
version "1.0.2"
679+
resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
680+
integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
681+
dependencies:
682+
has-symbols "^1.0.3"
683+
684+
hasown@^2.0.2:
685+
version "2.0.2"
686+
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
687+
integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
688+
dependencies:
689+
function-bind "^1.1.2"
690+
592691
ignore@^5.2.0:
593692
version "5.3.2"
594693
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
@@ -696,6 +795,11 @@ lodash.merge@^4.6.2:
696795
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
697796
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
698797

798+
math-intrinsics@^1.1.0:
799+
version "1.1.0"
800+
resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
801+
integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
802+
699803
merge2@^1.3.0, merge2@^1.4.1:
700804
version "1.4.1"
701805
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"

scrapers/nus-v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@elastic/elasticsearch": "7.17.14",
5353
"@sentry/node": "5.30.0",
5454
"antlr4ts": "^0.5.0-alpha.4",
55-
"axios": "0.28.0",
55+
"axios": "0.30.0",
5656
"bunyan": "1.8.15",
5757
"date-fns": "2.30.0",
5858
"deep-diff": "1.0.2",

scrapers/nus-v2/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,12 +1494,12 @@ available-typed-arrays@^1.0.7:
14941494
dependencies:
14951495
possible-typed-array-names "^1.0.0"
14961496

1497-
axios@0.28.0:
1498-
version "0.28.0"
1499-
resolved "https://registry.yarnpkg.com/axios/-/axios-0.28.0.tgz#801a4d991d0404961bccef46800e1170f8278c89"
1500-
integrity sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==
1497+
axios@0.30.0:
1498+
version "0.30.0"
1499+
resolved "https://registry.yarnpkg.com/axios/-/axios-0.30.0.tgz#026ae2c0ae6ac35d564056690683fb77c991d0d3"
1500+
integrity sha512-Z4F3LjCgfjZz8BMYalWdMgAQUnEtKDmpwNHjh/C8pQZWde32TF64cqnSeyL3xD/aTIASRU30RHTNzRiV/NpGMg==
15011501
dependencies:
1502-
follow-redirects "^1.15.0"
1502+
follow-redirects "^1.15.4"
15031503
form-data "^4.0.0"
15041504
proxy-from-env "^1.1.0"
15051505

@@ -2500,10 +2500,10 @@ flatted@^3.1.0:
25002500
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
25012501
integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
25022502

2503-
follow-redirects@^1.15.0:
2504-
version "1.15.9"
2505-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
2506-
integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
2503+
follow-redirects@^1.15.4:
2504+
version "1.15.11"
2505+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
2506+
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
25072507

25082508
for-each@^0.3.3:
25092509
version "0.3.3"

website/api/optimiser/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_constants/venues.json

website/api/optimiser/_client/client.go

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,18 @@ import (
44
"encoding/json"
55
"fmt"
66
"io"
7+
"log"
78
"net/http"
89

9-
"github.com/nusmodifications/nusmods/website/api/optimiser/_constants"
10-
"github.com/nusmodifications/nusmods/website/api/optimiser/_models"
10+
constants "github.com/nusmodifications/nusmods/website/api/optimiser/_constants"
11+
models "github.com/nusmodifications/nusmods/website/api/optimiser/_models"
1112
)
1213

1314
func GetVenues() (map[string]models.Location, error) {
1415
venues := make(map[string]models.Location)
15-
url := constants.VenuesURL
16-
res, err := http.Get(url)
17-
if err != nil {
18-
return nil, err
19-
}
20-
defer res.Body.Close()
21-
22-
body, err := io.ReadAll(res.Body)
23-
if err != nil {
24-
return nil, err
25-
}
26-
err = json.Unmarshal(body, &venues)
16+
err := json.Unmarshal(constants.VenuesJson, &venues)
2717
if err != nil {
18+
log.Printf("unable to load venues.json: %v", err)
2819
return nil, err
2920
}
3021

website/api/optimiser/_constants/constants.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package constants
22

3+
import (
4+
_ "embed"
5+
)
6+
37
// Ensure in sync with all E-Venues in NUSMods
48
var E_Venues = map[string]bool{
59
"E-Learn_A": true,
@@ -28,7 +32,8 @@ var LessonTypeAbbrev = map[string]string{
2832
"WORKSHOP": "WS",
2933
}
3034

31-
var VenuesURL = "https://github.nusmods.com/venues"
35+
//go:embed venues.json
36+
var VenuesJson []byte
3237

3338
var ModulesURL = "https://api.nusmods.com/v2/%s/modules/%s.json"
3439

0 commit comments

Comments
 (0)