Merge pull request #116 from Turbo87/insane

Pin subdependencies to versions using sane@2
ember-cli · Oct 12, 2018 · cede1a4 · cede1a4
2 parents c13c10b + 53fc443
commit cede1a4
Show file tree

Hide file tree

Showing 2 changed files with 2,985 additions and 2,039 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "broccoli-asset-rev": "^2.4.5",
     "chai": "^4.1.0",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.11.1",
+    "ember-cli": "~2.12.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-babel": "^6.7.1",
     "ember-cli-coffeescript": "github:rwjblue/ember-cli-coffeescript#update-version-checker-api",
@@ -62,6 +62,10 @@
   "peerDependencies": {
     "ember-cli-babel": "^6.7.1"
   },
+  "resolutions": {
+    "ember-cli-qunit/qunit": "~2.6.0",
+    "ember-cli-broccoli-sane-watcher": "~2.1.0"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "after": "ember-cli-htmlbars"