From 58cdb6571678b3f99d6e07962f30baaa9476dab4 Mon Sep 17 00:00:00 2001 From: Giles Thompson Date: Thu, 15 Apr 2021 17:13:32 +1200 Subject: [PATCH] Pinned a few packages so that floating dependency builds don't break ember-data: Too permissive. The latest version 3.26 was being installed. Incompatible with the existing setup whatwg-fetch: Incompatible version. Should be cleared up when we next upgrade addon-docs. (https://github.com/ember-cli/ember-fetch/issues/547) --- package.json | 4 +++- yarn.lock | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f4490f51..cfc45391 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,9 @@ "postversion": "git push && git push --tags" }, "resolutions": { - "ember-cli-template-lint/**/ember-template-lint": "^1.4.0" + "ember-cli-template-lint/**/ember-template-lint": "^1.4.0", + "ember-data": "3.5.2", + "whatwg-fetch": "3.3.1" }, "dependencies": { "@babel/core": "^7.4.4", diff --git a/yarn.lock b/yarn.lock index 7b24758d..d35c0454 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6228,7 +6228,7 @@ ember-composable-helpers@^2.4.0: ember-compatibility-helpers "^1.2.0" ember-maybe-import-regenerator "^0.1.6" -"ember-data@2.x - 3.x": +"ember-data@2.x - 3.x", ember-data@3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.5.2.tgz#6ec84ba85e28d7e1da6039202f65c38f8b1e43ad" integrity sha512-0aloRoOp9zgLCFJ0qfgNDD++Ai9d1xB5jHL1OI+uNjXhX8r4dG1PiCdvtwVW0OlrZOu9VBodv3kYoRG1SLZU7g== @@ -14788,10 +14788,10 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: dependencies: iconv-lite "0.4.24" -whatwg-fetch@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz#8e134f701f0a4ab5fda82626f113e2b647fd16dc" - integrity sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w== +whatwg-fetch@3.3.1, whatwg-fetch@^3.0.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz#6c1acf37dec176b0fd6bc9a74b616bec2f612935" + integrity sha512-faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA== whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: version "2.3.0"