Skip to content

Commit 5fc2687

Browse files
committed
[tests] Fix undefined fetch error for 'floating dependencies'
Pin whatwg-fetch dependence to '3.3.1'. This fixes an error "fetch is not defined - maybe your browser targets are not covering everything you need?" that shows up when running the tests for the floating dependencies stage. That error comes from ember-fetch, see ember-cli/ember-fetch#547 Also remove unused ember-ajax and ember-fetch devDependencies
1 parent 930440e commit 5fc2687

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"babel-eslint": "^10.0.1",
5555
"broccoli-asset-rev": "^3.0.0",
5656
"ember-a11y-testing": "^0.5.0",
57-
"ember-ajax": "^4.0.2",
5857
"ember-angle-bracket-invocation-polyfill": "^1.3.1",
5958
"ember-cli": "~3.1.4",
6059
"ember-cli-addon-docs": "0.6.13",
@@ -73,7 +72,6 @@
7372
"ember-disable-prototype-extensions": "^1.1.2",
7473
"ember-export-application-global": "^2.0.0",
7574
"ember-faker": "^1.5.0",
76-
"ember-fetch": "^6.4.0",
7775
"ember-load-initializers": "^2.0.0",
7876
"ember-math-helpers": "^2.10.0",
7977
"ember-maybe-import-regenerator": "^0.1.6",
@@ -100,6 +98,7 @@
10098
},
10199
"homepage": "https://Addepar.github.io/ember-table",
102100
"resolutions": {
101+
"ember-cli-addon-docs/ember-fetch/whatwg-fetch": "3.3.1",
103102
"ember-cli-page-object": "1.15.1",
104103
"prettier": "1.18.2"
105104
}

yarn.lock

+6-28
Original file line numberDiff line numberDiff line change
@@ -5182,14 +5182,6 @@ ember-a11y-testing@^0.5.0:
51825182
ember-cli-version-checker "^2.1.0"
51835183
ember-get-config "^0.2.4"
51845184

5185-
ember-ajax@^4.0.2:
5186-
version "4.0.2"
5187-
resolved "https://registry.npmjs.org/ember-ajax/-/ember-ajax-4.0.2.tgz#ce86d52c24289657e0a230140b06a52fe453d655"
5188-
integrity sha512-YeeeAQizQc5ioCeraxFo30y3W6mmUxmndF0ShI/Wvwfe8IhVw40jL42itaUHbo2CxKsNRZzQ8x3re65dGM0CrA==
5189-
dependencies:
5190-
ember-cli-babel "^6.16.0"
5191-
najax "^1.0.3"
5192-
51935185
ember-angle-bracket-invocation-polyfill@^1.3.1:
51945186
version "1.3.1"
51955187
resolved "https://registry.npmjs.org/ember-angle-bracket-invocation-polyfill/-/ember-angle-bracket-invocation-polyfill-1.3.1.tgz#3dd0b91b3776a8048a943889c031fa7f9ea44ec4"
@@ -6004,7 +5996,7 @@ ember-fetch-adapter@^0.4.3:
60045996
dependencies:
60055997
ember-cli-babel "^6.12.0"
60065998

6007-
ember-fetch@^6.2.0, ember-fetch@^6.4.0:
5999+
ember-fetch@^6.2.0:
60086000
version "6.7.1"
60096001
resolved "https://registry.npmjs.org/ember-fetch/-/ember-fetch-6.7.1.tgz#778390bc9993d31cc32d429ae69a591e431e85ac"
60106002
integrity sha512-B/s0HZWcIrDDz3wOxvAsWM2SyT4nND274aH3Othzxzax/lOJnGHKbNa+IGLrXKSja+ANeD5P8sVwDaAUw8pzpQ==
@@ -9204,11 +9196,6 @@ joi@^12.0.0:
92049196
isemail "3.x.x"
92059197
topo "2.x.x"
92069198

9207-
jquery-deferred@^0.3.0:
9208-
version "0.3.1"
9209-
resolved "https://registry.npmjs.org/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355"
9210-
integrity sha1-WW7KHKr/VPYbEQlisjyv6nTDU1U=
9211-
92129199
jquery@^3.2.1, jquery@^3.4.1:
92139200
version "3.4.1"
92149201
resolved "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -10530,15 +10517,6 @@ [email protected]:
1053010517
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
1053110518
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
1053210519

10533-
najax@^1.0.3:
10534-
version "1.0.4"
10535-
resolved "https://registry.npmjs.org/najax/-/najax-1.0.4.tgz#63fd8dbf15d18f24dc895b3a16fec66c136b8084"
10536-
integrity sha512-wsSacA+RkgY1wxRxXCT3tdqzmamEv9PLeoV/ub9SlLf2RngbPMSqc3A7H35XJDfURC0twMmZsnPdsYPkuuFSVg==
10537-
dependencies:
10538-
jquery-deferred "^0.3.0"
10539-
lodash.defaultsdeep "^4.6.0"
10540-
qs "^6.2.0"
10541-
1054210520
nan@^2.12.1, nan@^2.13.2:
1054310521
version "2.14.0"
1054410522
resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -11834,7 +11812,7 @@ [email protected]:
1183411812
resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
1183511813
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
1183611814

11837-
qs@^6.2.0, qs@^6.4.0:
11815+
qs@^6.4.0:
1183811816
version "6.8.0"
1183911817
resolved "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz#87b763f0d37ca54200334cd57bb2ef8f68a1d081"
1184011818
integrity sha512-tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==
@@ -14485,10 +14463,10 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
1448514463
dependencies:
1448614464
iconv-lite "0.4.24"
1448714465

14488-
whatwg-fetch@^3.0.0:
14489-
version "3.0.0"
14490-
resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
14491-
integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
14466+
whatwg-fetch@3.3.1, whatwg-fetch@^3.0.0:
14467+
version "3.3.1"
14468+
resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz#6c1acf37dec176b0fd6bc9a74b616bec2f612935"
14469+
integrity sha512-faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA==
1449214470

1449314471
whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
1449414472
version "2.3.0"

0 commit comments

Comments
 (0)