From ee04e557ebec7909c40e1d4d15328d5d30d2f5e2 Mon Sep 17 00:00:00 2001 From: Mykyta Lyzhov Date: Mon, 10 Sep 2018 16:33:32 +0300 Subject: [PATCH] Resolve version conflicts in yarn.lock for shelljs lib Fixes: #846 --- package.json | 3 +- packages/server/package.json | 1 - yarn.lock | 64 ++++++++++++++++++++++++++++++++++-- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0b243f2fde..a35c445803 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,8 @@ "webpack-merge": "^4.1.4", "webpack-node-externals": "^1.7.2", "webpack-sources": "^1.1.0", - "webpack-virtual-modules": "^0.1.10" + "webpack-virtual-modules": "^0.1.10", + "shelljs": "^0.8.1" }, "optionalDependencies": { "dotenv": "^6.0.0", diff --git a/packages/server/package.json b/packages/server/package.json index c0ea3df294..077bdeb16c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -115,7 +115,6 @@ "react-stripe-elements": "^1.2.1", "redux": "^4.0.0", "serialize-javascript": "^1.4.0", - "shelljs": "^0.8.1", "shortid": "^2.2.8", "source-map-support": "^0.5.0", "sourcemapped-stacktrace": "^1.1.8", diff --git a/yarn.lock b/yarn.lock index 4a8d3c3e86..ac4c2cbe1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -619,6 +619,25 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" +"@domain-schema/core@^0.0.34": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@domain-schema/core/-/core-0.0.34.tgz#5900ae4f0844cb8e7ffa91f5be32bd0417d96429" + dependencies: + debug "^3.1.0" + +"@domain-schema/graphql@^0.0.33": + version "0.0.33" + resolved "https://registry.yarnpkg.com/@domain-schema/graphql/-/graphql-0.0.33.tgz#201d8cc5d21a9eba69f2eb8cb1fe44f012381cec" + dependencies: + debug "^3.1.0" + +"@domain-schema/knex@^0.0.35": + version "0.0.35" + resolved "https://registry.yarnpkg.com/@domain-schema/knex/-/knex-0.0.35.tgz#3ea8fb1fdf57e9c9334843ed8bfa3b4e9e1f03c4" + dependencies: + debug "^3.1.0" + humps "^2.0.1" + "@expo/bunyan@^1.8.10": version "1.8.10" resolved "https://registry.yarnpkg.com/@expo/bunyan/-/bunyan-1.8.10.tgz#7d19354a6bce85aae5fea0e973569d3f0142533e" @@ -3759,6 +3778,12 @@ caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" +cast-array@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cast-array/-/cast-array-1.0.1.tgz#264ef1129e5888bc48cac40fe914e9f69b8d189d" + dependencies: + isarray "0.0.1" + center-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" @@ -6658,6 +6683,12 @@ graphql-iso-date@^3.3.0: version "3.5.0" resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.5.0.tgz#55a1be0efa8d28c1453afd2eb5ce1d052189a513" +graphql-parse-fields@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/graphql-parse-fields/-/graphql-parse-fields-1.2.0.tgz#c97119a91951b98dcbe656c46a203e966a720f28" + dependencies: + cast-array "^1.0.1" + graphql-resolve-batch@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/graphql-resolve-batch/-/graphql-resolve-batch-1.0.2.tgz#ab069df8ab3410a0188701ed9fa8e382bbb8d6a5" @@ -8510,7 +8541,7 @@ kleur@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300" -knex@^0.14.2: +knex@^0.14.2, knex@^0.14.6: version "0.14.6" resolved "https://registry.yarnpkg.com/knex/-/knex-0.14.6.tgz#ad57c4ef8fa1b51ebc8c37c2c9b483f6fb34e41e" dependencies: @@ -8533,6 +8564,13 @@ knex@^0.14.2: uuid "^3.2.1" v8flags "^3.0.2" +knexnest@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/knexnest/-/knexnest-1.0.0.tgz#b8840d13c2692bdd5fa3d5de67a456283d538fce" + dependencies: + knex "^0.14.6" + nesthydrationjs "^1.0.5" + lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" @@ -8870,6 +8908,10 @@ lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" +lodash.isarray@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-4.0.0.tgz#2aca496b28c4ca6d726715313590c02e6ea34403" + lodash.isboolean@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" @@ -8910,6 +8952,10 @@ lodash.keys@^3.0.0, lodash.keys@^3.1.2: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash.keys@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205" + lodash.map@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -8999,6 +9045,10 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" +lodash.values@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" + lodash.zipobject@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz#b399f5aba8ff62a746f6979bf20b214f964dbef8" @@ -9632,7 +9682,7 @@ modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" -moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.6.0: +moment@2.x, moment@2.x.x, moment@^2.10.6, moment@^2.19.3, moment@^2.22.2, moment@^2.6.0: version "2.22.2" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" @@ -9803,6 +9853,16 @@ neo-async@^2.5.0: version "2.5.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc" +nesthydrationjs@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nesthydrationjs/-/nesthydrationjs-1.0.5.tgz#89fe5be87055184461de5a550475ac515491f921" + dependencies: + lodash.isarray "^4.0.0" + lodash.isfunction "^3.0.9" + lodash.isplainobject "^4.0.6" + lodash.keys "^4.2.0" + lodash.values "^4.3.0" + next-tick@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"