Skip to content

Commit dc42e58

Browse files
authored
Merge pull request #26 from TandaHQ/hotfix/bump-sqlite3
Bump SQLite3 | node-pre-gyp http 403
2 parents 5f0e4b1 + 10c50b9 commit dc42e58

File tree

3 files changed

+121
-17
lines changed

3 files changed

+121
-17
lines changed

adnat (react)/backend/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
const express = require("express");
2+
const cors = require('cors')
23
const bodyParser = require("body-parser");
34
const authRouter = require("./router/auth");
45
const organisationsRouter = require("./router/organisations");
56
const shiftsRouter = require("./router/shifts");
67
const usersRouter = require("./router/users");
78
const app = express();
89

10+
app.use(cors())
911
app.use(bodyParser.json());
1012
app.use("/auth", authRouter);
1113
app.use("/organisations", organisationsRouter);

adnat (react)/backend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
"dependencies": {
66
"bcrypt": "^5.0.0",
77
"body-parser": "^1.18.3",
8+
"cors": "^2.8.5",
89
"express": "^4.16.4",
9-
"sqlite3": "^4.1.0",
10+
"sqlite3": "^5.0.0",
1011
"uuid": "^3.3.2"
1112
},
1213
"scripts": {

adnat (react)/backend/yarn.lock

Lines changed: 117 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,13 @@ bcrypt@^5.0.0:
100100
node-addon-api "^3.0.0"
101101
node-pre-gyp "0.15.0"
102102

103+
block-stream@*:
104+
version "0.0.9"
105+
resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
106+
integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
107+
dependencies:
108+
inherits "~2.0.0"
109+
103110
[email protected], body-parser@^1.18.3:
104111
version "1.18.3"
105112
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
@@ -186,6 +193,14 @@ [email protected], core-util-is@~1.0.0:
186193
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
187194
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
188195

196+
cors@^2.8.5:
197+
version "2.8.5"
198+
resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
199+
integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
200+
dependencies:
201+
object-assign "^4"
202+
vary "^1"
203+
189204
dashdash@^1.12.0:
190205
version "1.14.1"
191206
resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -375,6 +390,16 @@ fs.realpath@^1.0.0:
375390
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
376391
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
377392

393+
fstream@^1.0.0, fstream@^1.0.12:
394+
version "1.0.12"
395+
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
396+
integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
397+
dependencies:
398+
graceful-fs "^4.1.2"
399+
inherits "~2.0.0"
400+
mkdirp ">=0.5 0"
401+
rimraf "2"
402+
378403
gauge@~2.7.3:
379404
version "2.7.4"
380405
resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -396,6 +421,18 @@ getpass@^0.1.1:
396421
dependencies:
397422
assert-plus "^1.0.0"
398423

424+
glob@^7.0.3:
425+
version "7.2.0"
426+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
427+
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
428+
dependencies:
429+
fs.realpath "^1.0.0"
430+
inflight "^1.0.4"
431+
inherits "2"
432+
minimatch "^3.0.4"
433+
once "^1.3.0"
434+
path-is-absolute "^1.0.0"
435+
399436
glob@^7.1.3:
400437
version "7.1.3"
401438
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -408,6 +445,11 @@ glob@^7.1.3:
408445
once "^1.3.0"
409446
path-is-absolute "^1.0.0"
410447

448+
graceful-fs@^4.1.2:
449+
version "4.2.8"
450+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
451+
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
452+
411453
har-schema@^2.0.0:
412454
version "2.0.0"
413455
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -479,6 +521,11 @@ inherits@2, [email protected], inherits@~2.0.3:
479521
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
480522
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
481523

524+
inherits@~2.0.0:
525+
version "2.0.4"
526+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
527+
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
528+
482529
ini@~1.3.0:
483530
version "1.3.7"
484531
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
@@ -511,6 +558,11 @@ isarray@~1.0.0:
511558
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
512559
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
513560

561+
isexe@^2.0.0:
562+
version "2.0.0"
563+
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
564+
integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
565+
514566
isstream@~0.1.2:
515567
version "0.1.2"
516568
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -605,7 +657,7 @@ minizlib@^1.3.3:
605657
dependencies:
606658
minipass "^2.9.0"
607659

608-
mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
660+
"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
609661
version "0.5.5"
610662
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
611663
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -622,11 +674,6 @@ ms@^2.1.1:
622674
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
623675
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
624676

625-
nan@^2.12.1:
626-
version "2.14.0"
627-
resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
628-
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
629-
630677
needle@^2.2.1:
631678
version "2.2.4"
632679
resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
@@ -655,6 +702,24 @@ node-addon-api@^3.0.0:
655702
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.0.tgz#812446a1001a54f71663bed188314bba07e09247"
656703
integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==
657704

705+
706+
version "3.8.0"
707+
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
708+
integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
709+
dependencies:
710+
fstream "^1.0.0"
711+
glob "^7.0.3"
712+
graceful-fs "^4.1.2"
713+
mkdirp "^0.5.0"
714+
nopt "2 || 3"
715+
npmlog "0 || 1 || 2 || 3 || 4"
716+
osenv "0"
717+
request "^2.87.0"
718+
rimraf "2"
719+
semver "~5.3.0"
720+
tar "^2.0.0"
721+
which "1"
722+
658723
659724
version "0.15.0"
660725
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087"
@@ -687,6 +752,13 @@ node-pre-gyp@^0.11.0:
687752
semver "^5.3.0"
688753
tar "^4"
689754

755+
"nopt@2 || 3":
756+
version "3.0.6"
757+
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
758+
integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
759+
dependencies:
760+
abbrev "1"
761+
690762
nopt@^4.0.1:
691763
version "4.0.1"
692764
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -708,7 +780,7 @@ npm-packlist@^1.1.6:
708780
ignore-walk "^3.0.1"
709781
npm-bundled "^1.0.1"
710782

711-
npmlog@^4.0.2:
783+
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2:
712784
version "4.1.2"
713785
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
714786
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -728,7 +800,7 @@ oauth-sign@~0.9.0:
728800
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
729801
integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
730802

731-
object-assign@^4.1.0:
803+
object-assign@^4, object-assign@^4.1.0:
732804
version "4.1.1"
733805
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
734806
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -757,7 +829,7 @@ os-tmpdir@^1.0.0:
757829
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
758830
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
759831

760-
osenv@^0.1.4:
832+
osenv@0, osenv@^0.1.4:
761833
version "0.1.5"
762834
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
763835
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -887,6 +959,13 @@ request@^2.87.0:
887959
tunnel-agent "^0.6.0"
888960
uuid "^3.3.2"
889961

962+
rimraf@2:
963+
version "2.7.1"
964+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
965+
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
966+
dependencies:
967+
glob "^7.1.3"
968+
890969
rimraf@^2.6.1:
891970
version "2.6.3"
892971
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -919,6 +998,11 @@ semver@^5.3.0:
919998
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
920999
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
9211000

1001+
semver@~5.3.0:
1002+
version "5.3.0"
1003+
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
1004+
integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
1005+
9221006
9231007
version "0.16.2"
9241008
resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -963,14 +1047,15 @@ signal-exit@^3.0.0:
9631047
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
9641048
integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
9651049

966-
sqlite3@^4.1.0:
967-
version "4.1.0"
968-
resolved "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.0.tgz#e051fb9c133be15726322a69e2e37ec560368380"
969-
integrity sha512-RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw==
1050+
sqlite3@^5.0.0:
1051+
version "5.0.2"
1052+
resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.2.tgz#00924adcc001c17686e0a6643b6cbbc2d3965083"
1053+
integrity sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==
9701054
dependencies:
971-
nan "^2.12.1"
1055+
node-addon-api "^3.0.0"
9721056
node-pre-gyp "^0.11.0"
973-
request "^2.87.0"
1057+
optionalDependencies:
1058+
node-gyp "3.x"
9741059

9751060
sshpk@^1.7.0:
9761061
version "1.16.1"
@@ -1040,6 +1125,15 @@ strip-json-comments@~2.0.1:
10401125
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
10411126
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
10421127

1128+
tar@^2.0.0:
1129+
version "2.2.2"
1130+
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
1131+
integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
1132+
dependencies:
1133+
block-stream "*"
1134+
fstream "^1.0.12"
1135+
inherits "2"
1136+
10431137
tar@^4, tar@^4.4.2:
10441138
version "4.4.19"
10451139
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
@@ -1108,7 +1202,7 @@ uuid@^3.3.2:
11081202
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
11091203
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
11101204

1111-
vary@~1.1.2:
1205+
vary@^1, vary@~1.1.2:
11121206
version "1.1.2"
11131207
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
11141208
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
@@ -1122,6 +1216,13 @@ [email protected]:
11221216
core-util-is "1.0.2"
11231217
extsprintf "^1.2.0"
11241218

1219+
which@1:
1220+
version "1.3.1"
1221+
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
1222+
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
1223+
dependencies:
1224+
isexe "^2.0.0"
1225+
11251226
wide-align@^1.1.0:
11261227
version "1.1.3"
11271228
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"

0 commit comments

Comments
 (0)