deliberately create conflicting ember-fetch dependencies

mike-north · Sep 9, 2018 · 31c4261 · 31c4261
1 parent 9e81766
commit 31c4261
Show file tree

Hide file tree

Showing 3 changed files with 415 additions and 47 deletions.
diff --git a/config/environment.js b/config/environment.js
@@ -6,6 +6,11 @@ module.exports = function(environment) {
     environment,
     rootURL: '/',
     locationType: 'auto',
+    fastboot: {
+      hostWhitelist: [
+        /^localhost:\d+$/
+      ]
+    },
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

diff --git a/package.json b/package.json
@@ -35,10 +35,11 @@
     "ember-cli-uglify": "^2.0.0",
     "ember-data": "~3.1.0",
     "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^5.0.0",
+    "ember-fetch": "^3.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
+    "ember-simple-auth": "^1.7.0",
     "ember-source": "~3.1.0",
     "ember-welcome-page": "^3.0.0",
     "eslint-plugin-ember": "^5.0.0",
@@ -48,6 +49,5 @@
     "node": "^4.5 || 6.* || >= 7.*"
   },
   "dependencies": {
-    "node-fetch": "^2.1.2"
   }
 }