Skip to content

Commit dbc1c9a

Browse files
Replace ic-ajax & other ajax calls with ember-fetch
1 parent 2e28584 commit dbc1c9a

File tree

10 files changed

+100
-33
lines changed

10 files changed

+100
-33
lines changed

app/adapters/application.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import DS from 'ember-data';
2+
import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
23

3-
export default DS.RESTAdapter.extend({
4+
const { RESTAdapter } = DS;
5+
6+
export default RESTAdapter.extend(AdapterFetch, {
47
namespace: 'api/v1',
58
});

app/controllers/dashboard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
const TO_SHOW = 5;
55
const { computed } = Ember;

app/controllers/me/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
export default Ember.Controller.extend({
55
isResetting: false,

app/routes/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
export default Ember.Route.extend({
55
beforeModel() {

app/routes/crate/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
export default Ember.Route.extend({
55
refreshAfterLogin: Ember.observer('session.isLoggedIn', function() {

app/routes/github-authorize.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
/**
55
* This route will be called from the GitHub OAuth flow once the user has

app/routes/github-login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
/**
55
* Calling this route will query the `/authorize_url` API endpoint

app/routes/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Ember from 'ember';
2-
import ajax from 'ic-ajax';
2+
import ajax from 'ember-fetch/ajax';
33

44
export default Ember.Route.extend({
55
headTags: [{

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@
2828
"babel-plugin-transform-object-rest-spread": "^6.23.0",
2929
"bower": "1.8.0",
3030
"broccoli-asset-rev": "2.5.0",
31-
"ember-ajax": "^3.0.0",
3231
"ember-cli": "^2.13.3",
3332
"ember-cli-app-version": "^3.0.0",
3433
"ember-cli-babel": "^6.4.1",
3534
"ember-cli-dependency-checker": "^2.0.1",
3635
"ember-cli-eslint": "^4.0.0",
3736
"ember-cli-htmlbars": "^2.0.2",
3837
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
39-
"ember-cli-ic-ajax": "1.0.0",
4038
"ember-cli-inject-live-reload": "1.6.1",
4139
"ember-cli-meta-tags": "^4.0.0",
4240
"ember-cli-mirage": "0.2.9",
@@ -48,6 +46,7 @@
4846
"ember-cli-uglify": "1.2.0",
4947
"ember-data": "2.12.1",
5048
"ember-export-application-global": "^2.0.0",
49+
"ember-fetch": "^3.1.2",
5150
"ember-load-initializers": "^1.0.0",
5251
"ember-maybe-import-regenerator": "^0.1.6",
5352
"ember-moment": "^7.3.1",

yarn.lock

Lines changed: 88 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,6 +1225,19 @@ broccoli-file-creator@^1.0.0:
12251225
rsvp "~3.0.6"
12261226
symlink-or-copy "^1.0.1"
12271227

1228+
broccoli-filter@^0.1.11:
1229+
version "0.1.14"
1230+
resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad"
1231+
dependencies:
1232+
broccoli-kitchen-sink-helpers "^0.2.6"
1233+
broccoli-writer "^0.1.1"
1234+
mkdirp "^0.3.5"
1235+
promise-map-series "^0.2.1"
1236+
quick-temp "^0.1.2"
1237+
rsvp "^3.0.16"
1238+
symlink-or-copy "^1.0.1"
1239+
walk-sync "^0.1.3"
1240+
12281241
broccoli-filter@^1.2.2, broccoli-filter@^1.2.3:
12291242
version "1.2.4"
12301243
resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.2.4.tgz#409afb94b9a3a6da9fac8134e91e205f40cc7330"
@@ -1260,7 +1273,7 @@ broccoli-funnel@^0.2.3:
12601273
symlink-or-copy "^1.0.0"
12611274
walk-sync "^0.2.6"
12621275

1263-
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0:
1276+
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
12641277
version "1.2.0"
12651278
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
12661279
dependencies:
@@ -1279,7 +1292,7 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli
12791292
symlink-or-copy "^1.0.0"
12801293
walk-sync "^0.3.1"
12811294

1282-
broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@~0.2.0:
1295+
broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@^0.2.6, broccoli-kitchen-sink-helpers@~0.2.0:
12831296
version "0.2.9"
12841297
resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
12851298
dependencies:
@@ -1399,7 +1412,7 @@ broccoli-sri-hash@^2.1.0:
13991412
sri-toolbox "^0.2.0"
14001413
symlink-or-copy "^1.0.1"
14011414

1402-
broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0:
1415+
broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.0, broccoli-stew@^1.4.2:
14031416
version "1.5.0"
14041417
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c"
14051418
dependencies:
@@ -1425,6 +1438,14 @@ broccoli-string-replace@^0.1.1:
14251438
broccoli-persistent-filter "^1.1.5"
14261439
minimatch "^3.0.3"
14271440

1441+
broccoli-templater@^1.0.0:
1442+
version "1.0.0"
1443+
resolved "https://registry.yarnpkg.com/broccoli-templater/-/broccoli-templater-1.0.0.tgz#7c054aacf596d1868d1a44291f9ec7b907d30ecf"
1444+
dependencies:
1445+
broccoli-filter "^0.1.11"
1446+
broccoli-stew "^1.2.0"
1447+
lodash.template "^3.3.2"
1448+
14281449
broccoli-uglify-sourcemap@^1.0.0:
14291450
version "1.5.2"
14301451
resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb"
@@ -1443,7 +1464,7 @@ broccoli-unwatched-tree@^0.1.1:
14431464
version "0.1.1"
14441465
resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.1.tgz#4312fde04bdafe67a05a967d72cc50b184a9f514"
14451466

1446-
broccoli-writer@~0.1.1:
1467+
broccoli-writer@^0.1.1, broccoli-writer@~0.1.1:
14471468
version "0.1.1"
14481469
resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d"
14491470
dependencies:
@@ -2040,12 +2061,6 @@ electron-to-chromium@^1.3.14:
20402061
version "1.3.14"
20412062
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
20422063

2043-
ember-ajax@^3.0.0:
2044-
version "3.0.0"
2045-
resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-3.0.0.tgz#8f21e9da0c1d433cf879aa855fce464d517e9ab5"
2046-
dependencies:
2047-
ember-cli-babel "^6.0.0"
2048-
20492064
ember-cli-app-version@^3.0.0:
20502065
version "3.0.0"
20512066
resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.0.0.tgz#d67a33aeec7bd03187fbe72c5663dadec4c3368a"
@@ -2175,12 +2190,6 @@ ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.2:
21752190
json-stable-stringify "^1.0.0"
21762191
strip-bom "^3.0.0"
21772192

2178-
2179-
version "1.0.0"
2180-
resolved "https://registry.yarnpkg.com/ember-cli-ic-ajax/-/ember-cli-ic-ajax-1.0.0.tgz#359e885316924e3db8bedf07d77803dd39b26491"
2181-
dependencies:
2182-
ic-ajax "~2.0.1"
2183-
21842193
ember-cli-import-polyfill@^0.2.0:
21852194
version "0.2.0"
21862195
resolved "https://registry.yarnpkg.com/ember-cli-import-polyfill/-/ember-cli-import-polyfill-0.2.0.tgz#c1a08a8affb45c97b675926272fe78cf4ca166f2"
@@ -2506,6 +2515,17 @@ ember-factory-for-polyfill@^1.1.0:
25062515
ember-cli-babel "^5.1.7"
25072516
ember-cli-version-checker "^1.2.0"
25082517

2518+
ember-fetch@^3.1.2:
2519+
version "3.2.3"
2520+
resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-3.2.3.tgz#f89b2b7c0e48255932ea68018f4304a6e42267d3"
2521+
dependencies:
2522+
broccoli-funnel "^1.2.0"
2523+
broccoli-stew "^1.4.2"
2524+
broccoli-templater "^1.0.0"
2525+
ember-cli-babel "^6.0.0"
2526+
node-fetch "^2.0.0-alpha.3"
2527+
whatwg-fetch "^2.0.3"
2528+
25092529
ember-getowner-polyfill@^1.2.2:
25102530
version "1.2.3"
25112531
resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.2.3.tgz#ea70f4a48b1c05b91056371d1878bbafe018222e"
@@ -3342,7 +3362,7 @@ glob-parent@^2.0.0:
33423362
dependencies:
33433363
is-glob "^2.0.0"
33443364

3345-
[email protected], glob@^7.0.4, glob@^7.0.5:
3365+
[email protected], glob@^7.0.4:
33463366
version "7.1.1"
33473367
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
33483368
dependencies:
@@ -3363,7 +3383,7 @@ glob@^5.0.10, glob@^5.0.15:
33633383
once "^1.3.0"
33643384
path-is-absolute "^1.0.0"
33653385

3366-
glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1:
3386+
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
33673387
version "7.1.2"
33683388
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
33693389
dependencies:
@@ -3582,10 +3602,6 @@ http-signature@~1.1.0:
35823602
jsprim "^1.2.2"
35833603
sshpk "^1.7.0"
35843604

3585-
ic-ajax@~2.0.1:
3586-
version "2.0.2"
3587-
resolved "https://registry.yarnpkg.com/ic-ajax/-/ic-ajax-2.0.2.tgz#50c8ab1c494320fac66830ce1ee3990ab827f596"
3588-
35893605
iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
35903606
version "0.4.18"
35913607
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
@@ -4104,6 +4120,14 @@ lodash._basefor@^3.0.0:
41044120
version "3.0.3"
41054121
resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
41064122

4123+
lodash._basetostring@^3.0.0:
4124+
version "3.0.1"
4125+
resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
4126+
4127+
lodash._basevalues@^3.0.0:
4128+
version "3.0.0"
4129+
resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
4130+
41074131
lodash._bindcallback@^3.0.0:
41084132
version "3.0.1"
41094133
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
@@ -4124,10 +4148,14 @@ lodash._isiterateecall@^3.0.0:
41244148
version "3.0.9"
41254149
resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
41264150

4127-
lodash._reinterpolate@~3.0.0:
4151+
lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
41284152
version "3.0.0"
41294153
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
41304154

4155+
lodash._root@^3.0.0:
4156+
version "3.0.1"
4157+
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
4158+
41314159
lodash.assign@^3.2.0:
41324160
version "3.2.0"
41334161
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
@@ -4162,6 +4190,12 @@ lodash.defaultsdeep@^4.6.0:
41624190
version "4.6.0"
41634191
resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz#bec1024f85b1bd96cbea405b23c14ad6443a6f81"
41644192

4193+
lodash.escape@^3.0.0:
4194+
version "3.2.0"
4195+
resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
4196+
dependencies:
4197+
lodash._root "^3.0.0"
4198+
41654199
lodash.find@^4.5.1:
41664200
version "4.6.0"
41674201
resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
@@ -4240,13 +4274,34 @@ lodash.restparam@^3.0.0:
42404274
version "3.6.1"
42414275
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
42424276

4277+
lodash.template@^3.3.2:
4278+
version "3.6.2"
4279+
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
4280+
dependencies:
4281+
lodash._basecopy "^3.0.0"
4282+
lodash._basetostring "^3.0.0"
4283+
lodash._basevalues "^3.0.0"
4284+
lodash._isiterateecall "^3.0.0"
4285+
lodash._reinterpolate "^3.0.0"
4286+
lodash.escape "^3.0.0"
4287+
lodash.keys "^3.0.0"
4288+
lodash.restparam "^3.0.0"
4289+
lodash.templatesettings "^3.0.0"
4290+
42434291
lodash.template@^4.2.5:
42444292
version "4.4.0"
42454293
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
42464294
dependencies:
42474295
lodash._reinterpolate "~3.0.0"
42484296
lodash.templatesettings "^4.0.0"
42494297

4298+
lodash.templatesettings@^3.0.0:
4299+
version "3.1.1"
4300+
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
4301+
dependencies:
4302+
lodash._reinterpolate "^3.0.0"
4303+
lodash.escape "^3.0.0"
4304+
42504305
lodash.templatesettings@^4.0.0:
42514306
version "4.1.0"
42524307
resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
@@ -4565,6 +4620,12 @@ node-fetch@^1.3.3:
45654620
encoding "^0.1.11"
45664621
is-stream "^1.0.1"
45674622

4623+
node-fetch@^2.0.0-alpha.3:
4624+
version "2.0.0-alpha.5"
4625+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0-alpha.5.tgz#efe2816af7107bafd3d3cabd0f24deca4b408b64"
4626+
dependencies:
4627+
encoding "^0.1.11"
4628+
45684629
node-gyp@^3.3.1:
45694630
version "3.6.2"
45704631
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
@@ -6091,6 +6152,10 @@ websocket-extensions@>=0.1.1:
60916152
version "0.1.1"
60926153
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
60936154

6155+
whatwg-fetch@^2.0.3:
6156+
version "2.0.3"
6157+
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
6158+
60946159
which-module@^1.0.0:
60956160
version "1.0.0"
60966161
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"

0 commit comments

Comments
 (0)