From ba0f8806bce5379d7ba46b70f73d50631c570b8b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sun, 25 Jun 2017 13:51:19 +0200 Subject: [PATCH] Return to sequelize@4.0.0-2 (makes tests fail) --- package.json | 2 +- scripts/test.sh | 2 ++ yarn.lock | 73 +++++++++++++++++++++++-------------------------- 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 @@ "rimraf": "^2.5.4", "safe-buffer": "^5.0.1", "scripty": "^1.5.0", - "sequelize": "4.2.0", + "sequelize": "4.0.0-2", "ts-node": "^3.0.6", "typescript": "^2.3.4", "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 @@ #!/usr/bin/env sh +npm run build:server + cd client || exit -1 npm test || exit -1 diff --git a/yarn.lock b/yarn.lock index 6c130fe4a..f62012e91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -88,10 +88,6 @@ version "7.0.32" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.32.tgz#6afe6c66520a4c316623a14aef123908d01b4bba" -"@types/node@^6.0.48": - version "6.0.78" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470" - "@types/request@^0.0.44": version "0.0.44" resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.44.tgz#77572176765376d2ba98654079311650cf4113af" @@ -818,7 +814,7 @@ cross-env@^3.1.2: cross-spawn "^5.1.0" is-windows "^1.0.0" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -868,7 +864,7 @@ debug@2.6.7: dependencies: ms "2.0.0" -debug@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: +debug@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: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" dependencies: @@ -983,9 +979,9 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" -dottie@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.0.tgz#da191981c8b8d713ca0115d5898cf397c2f0ddd0" +dottie@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a" duplexer@~0.1.1: version "0.1.1" @@ -1026,12 +1022,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -env-cmd@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-5.1.0.tgz#0236db393c3f033005204fcd0a92ee40723a9c9e" - dependencies: - cross-spawn "^5.0.1" - error-ex@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" @@ -1581,14 +1571,14 @@ generate-object-property@^1.1.0: dependencies: is-property "^1.0.0" +generic-pool@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683" + generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" -generic-pool@^3.1.6: - version "3.1.7" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.1.7.tgz#dac22b2c7a7a04e41732f7d8d2d25a303c88f662" - get-browser-rtc@^1.0.0: version "1.0.2" 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: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" +lodash@4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.15.0.tgz#3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9" + lodash@^3.3.1: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^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: +lodash@^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: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -2513,6 +2507,10 @@ node-pre-gyp@^0.6.36: tar "^2.2.1" tar-pack "^3.4.0" +node-uuid@~1.4.4: + version "1.4.8" + resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" + nodemon@^1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c" @@ -3304,28 +3302,27 @@ sentence-case@^1.1.1: dependencies: lower-case "^1.1.1" -sequelize@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.2.0.tgz#5b58f565d22455808a8a51f443684f851503e32c" +sequelize@4.0.0-2: + version "4.0.0-2" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-4.0.0-2.tgz#8143f50fa00ac62ba95394f4c81bd97e7c3600d5" dependencies: bluebird "^3.4.6" cls-bluebird "^2.0.1" - debug "^2.3.0" + debug "^2.2.0" depd "^1.1.0" - dottie "^2.0.0" - env-cmd "^5.0.0" - generic-pool "^3.1.6" + dottie "^1.0.0" + generic-pool "2.4.2" inflection "1.10.0" - lodash "^4.17.1" + lodash "4.15.0" moment "^2.13.0" moment-timezone "^0.5.4" + node-uuid "~1.4.4" retry-as-promised "^2.0.0" semver "^5.0.1" terraformer-wkt-parser "^1.1.2" toposort-class "^1.0.1" - uuid "^3.0.0" - validator "^6.3.0" - wkx "^0.4.1" + validator "^5.6.0" + wkx "0.3.0" serve-static@1.12.3: version "1.12.3" @@ -4028,9 +4025,9 @@ validator.js@^1.1.1: version "1.2.3" resolved "https://registry.yarnpkg.com/validator.js/-/validator.js-1.2.3.tgz#f8e623f60e53bada54880333649970996a3446e1" -validator@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-6.3.0.tgz#47ce23ed8d4eaddfa9d4b8ef0071b6cf1078d7c8" +validator@^5.6.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c" validator@^7.0.0: version "7.1.0" @@ -4133,11 +4130,9 @@ winston@^2.1.1: isstream "0.1.x" stack-trace "0.0.x" -wkx@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.1.tgz#2fc171b5e9cb55c6256fef4bde1f21be413befee" - dependencies: - "@types/node" "^6.0.48" +wkx@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.3.0.tgz#4f24948d879aca65e501674469855e04c2ad78dd" wordwrap@~0.0.2: version "0.0.3" -- 2.25.1