aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-06-25 13:51:19 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-06-25 13:51:19 +0200
commitba0f8806bce5379d7ba46b70f73d50631c570b8b (patch)
tree7f7d8e503beca2b9b68c5d11db0bfa371e05f98a
parent19452347a116e8907cf3d0523f438f2c22c4e0f3 (diff)
downloadPeerTube-ba0f8806bce5379d7ba46b70f73d50631c570b8b.tar.gz
PeerTube-ba0f8806bce5379d7ba46b70f73d50631c570b8b.tar.zst
PeerTube-ba0f8806bce5379d7ba46b70f73d50631c570b8b.zip
Return to sequelize@4.0.0-2 (makes tests fail)
-rw-r--r--package.json2
-rwxr-xr-xscripts/test.sh2
-rw-r--r--yarn.lock73
3 files changed, 37 insertions, 40 deletions
diff --git a/package.json b/package.json
index 67f3d115b..f795dff90 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
75 "rimraf": "^2.5.4", 75 "rimraf": "^2.5.4",
76 "safe-buffer": "^5.0.1", 76 "safe-buffer": "^5.0.1",
77 "scripty": "^1.5.0", 77 "scripty": "^1.5.0",
78 "sequelize": "4.2.0", 78 "sequelize": "4.0.0-2",
79 "ts-node": "^3.0.6", 79 "ts-node": "^3.0.6",
80 "typescript": "^2.3.4", 80 "typescript": "^2.3.4",
81 "validator": "^7.0.0", 81 "validator": "^7.0.0",
diff --git a/scripts/test.sh b/scripts/test.sh
index fc607133b..6e8e38659 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,5 +1,7 @@
1#!/usr/bin/env sh 1#!/usr/bin/env sh
2 2
3npm run build:server
4
3cd client || exit -1 5cd client || exit -1
4npm test || exit -1 6npm test || exit -1
5 7
diff --git a/yarn.lock b/yarn.lock
index 6c130fe4a..f62012e91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -88,10 +88,6 @@
88 version "7.0.32" 88 version "7.0.32"
89 resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba" 89 resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba"
90 90
91"@types/node@^6.0.48":
92 version "6.0.78"
93 resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
94
95"@types/request@^0.0.44": 91"@types/request@^0.0.44":
96 version "0.0.44" 92 version "0.0.44"
97 resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.44.tgz#77572176765376d2ba98654079311650cf4113af" 93 resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.44.tgz#77572176765376d2ba98654079311650cf4113af"
@@ -818,7 +814,7 @@ cross-env@^3.1.2:
818 cross-spawn "^5.1.0" 814 cross-spawn "^5.1.0"
819 is-windows "^1.0.0" 815 is-windows "^1.0.0"
820 816
821cross-spawn@^5.0.1, cross-spawn@^5.1.0: 817cross-spawn@^5.1.0:
822 version "5.1.0" 818 version "5.1.0"
823 resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" 819 resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
824 dependencies: 820 dependencies:
@@ -868,7 +864,7 @@ debug@2.6.7:
868 dependencies: 864 dependencies:
869 ms "2.0.0" 865 ms "2.0.0"
870 866
871debug@2.6.8, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.0, debug@^2.5.2, debug@^2.6.8: 867debug@2.6.8, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.5.2, debug@^2.6.8:
872 version "2.6.8" 868 version "2.6.8"
873 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" 869 resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
874 dependencies: 870 dependencies:
@@ -983,9 +979,9 @@ doctrine@^2.0.0:
983 esutils "^2.0.2" 979 esutils "^2.0.2"
984 isarray "^1.0.0" 980 isarray "^1.0.0"
985 981
986dottie@^2.0.0: 982dottie@^1.0.0:
987 version "2.0.0" 983 version "1.1.1"
988 resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.0.tgz#da191981c8b8d713ca0115d5898cf397c2f0ddd0" 984 resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a"
989 985
990duplexer@~0.1.1: 986duplexer@~0.1.1:
991 version "0.1.1" 987 version "0.1.1"
@@ -1026,12 +1022,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
1026 dependencies: 1022 dependencies:
1027 once "^1.4.0" 1023 once "^1.4.0"
1028 1024
1029env-cmd@^5.0.0:
1030 version "5.1.0"
1031 resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-5.1.0.tgz#0236db393c3f033005204fcd0a92ee40723a9c9e"
1032 dependencies:
1033 cross-spawn "^5.0.1"
1034
1035error-ex@^1.2.0: 1025error-ex@^1.2.0:
1036 version "1.3.1" 1026 version "1.3.1"
1037 resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" 1027 resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -1581,14 +1571,14 @@ generate-object-property@^1.1.0:
1581 dependencies: 1571 dependencies:
1582 is-property "^1.0.0" 1572 is-property "^1.0.0"
1583 1573
1574generic-pool@2.4.2:
1575 version "2.4.2"
1576 resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683"
1577
1584generic-pool@2.4.3: 1578generic-pool@2.4.3:
1585 version "2.4.3" 1579 version "2.4.3"
1586 resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" 1580 resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
1587 1581
1588generic-pool@^3.1.6:
1589 version "3.1.7"
1590 resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.1.7.tgz#dac22b2c7a7a04e41732f7d8d2d25a303c88f662"
1591
1592get-browser-rtc@^1.0.0: 1582get-browser-rtc@^1.0.0:
1593 version "1.0.2" 1583 version "1.0.2"
1594 resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9" 1584 resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"
@@ -2238,11 +2228,15 @@ lodash.restparam@^3.0.0:
2238 version "3.6.1" 2228 version "3.6.1"
2239 resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" 2229 resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
2240 2230
2231lodash@4.15.0:
2232 version "4.15.0"
2233 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.15.0.tgz#3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"
2234
2241lodash@^3.3.1: 2235lodash@^3.3.1:
2242 version "3.10.1" 2236 version "3.10.1"
2243 resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" 2237 resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
2244 2238
2245lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.16.0, lodash@^4.17.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.2: 2239lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.16.0, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.8.2:
2246 version "4.17.4" 2240 version "4.17.4"
2247 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" 2241 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
2248 2242
@@ -2513,6 +2507,10 @@ node-pre-gyp@^0.6.36:
2513 tar "^2.2.1" 2507 tar "^2.2.1"
2514 tar-pack "^3.4.0" 2508 tar-pack "^3.4.0"
2515 2509
2510node-uuid@~1.4.4:
2511 version "1.4.8"
2512 resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
2513
2516nodemon@^1.11.0: 2514nodemon@^1.11.0:
2517 version "1.11.0" 2515 version "1.11.0"
2518 resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c" 2516 resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c"
@@ -3304,28 +3302,27 @@ sentence-case@^1.1.1:
3304 dependencies: 3302 dependencies:
3305 lower-case "^1.1.1" 3303 lower-case "^1.1.1"
3306 3304
3307sequelize@4.2.0: 3305sequelize@4.0.0-2:
3308 version "4.2.0" 3306 version "4.0.0-2"
3309 resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.2.0.tgz#5b58f565d22455808a8a51f443684f851503e32c" 3307 resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.0.0-2.tgz#8143f50fa00ac62ba95394f4c81bd97e7c3600d5"
3310 dependencies: 3308 dependencies:
3311 bluebird "^3.4.6" 3309 bluebird "^3.4.6"
3312 cls-bluebird "^2.0.1" 3310 cls-bluebird "^2.0.1"
3313 debug "^2.3.0" 3311 debug "^2.2.0"
3314 depd "^1.1.0" 3312 depd "^1.1.0"
3315 dottie "^2.0.0" 3313 dottie "^1.0.0"
3316 env-cmd "^5.0.0" 3314 generic-pool "2.4.2"
3317 generic-pool "^3.1.6"
3318 inflection "1.10.0" 3315 inflection "1.10.0"
3319 lodash "^4.17.1" 3316 lodash "4.15.0"
3320 moment "^2.13.0" 3317 moment "^2.13.0"
3321 moment-timezone "^0.5.4" 3318 moment-timezone "^0.5.4"
3319 node-uuid "~1.4.4"
3322 retry-as-promised "^2.0.0" 3320 retry-as-promised "^2.0.0"
3323 semver "^5.0.1" 3321 semver "^5.0.1"
3324 terraformer-wkt-parser "^1.1.2" 3322 terraformer-wkt-parser "^1.1.2"
3325 toposort-class "^1.0.1" 3323 toposort-class "^1.0.1"
3326 uuid "^3.0.0" 3324 validator "^5.6.0"
3327 validator "^6.3.0" 3325 wkx "0.3.0"
3328 wkx "^0.4.1"
3329 3326
3330serve-static@1.12.3: 3327serve-static@1.12.3:
3331 version "1.12.3" 3328 version "1.12.3"
@@ -4028,9 +4025,9 @@ validator.js@^1.1.1:
4028 version "1.2.3" 4025 version "1.2.3"
4029 resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1" 4026 resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1"
4030 4027
4031validator@^6.3.0: 4028validator@^5.6.0:
4032 version "6.3.0" 4029 version "5.7.0"
4033 resolved "https://registry.yarnpkg.com/validator/-/validator-6.3.0.tgz#47ce23ed8d4eaddfa9d4b8ef0071b6cf1078d7c8" 4030 resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c"
4034 4031
4035validator@^7.0.0: 4032validator@^7.0.0:
4036 version "7.1.0" 4033 version "7.1.0"
@@ -4133,11 +4130,9 @@ winston@^2.1.1:
4133 isstream "0.1.x" 4130 isstream "0.1.x"
4134 stack-trace "0.0.x" 4131 stack-trace "0.0.x"
4135 4132
4136wkx@^0.4.1: 4133wkx@0.3.0:
4137 version "0.4.1" 4134 version "0.3.0"
4138 resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.1.tgz#2fc171b5e9cb55c6256fef4bde1f21be413befee" 4135 resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.3.0.tgz#4f24948d879aca65e501674469855e04c2ad78dd"
4139 dependencies:
4140 "@types/node" "^6.0.48"
4141 4136
4142wordwrap@~0.0.2: 4137wordwrap@~0.0.2:
4143 version "0.0.3" 4138 version "0.0.3"