Skip to content

Commit

Permalink
Update ember-resolver to NPM version.
Browse files Browse the repository at this point in the history
Fixes additional deprecation warnings for container-debug-adapter.
  • Loading branch information
rwjblue committed Nov 4, 2015
1 parent 979f639 commit 5d08533
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';

Expand Down
2 changes: 0 additions & 2 deletions app/services/ember-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ function contentForAppBoot (content, config) {
// doesn't recognize them properly...
var monkeyPatchModules = [
'ember',
'ember/resolver',
'ember/load-initializers'
];

Expand All @@ -392,4 +391,3 @@ function contentForAppBoot (content, config) {
function calculateAppConfig(config) {
return JSON.stringify(config.APP || {});
}

1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
"ember-qunit": "0.4.9",
"ember-qunit-notifications": "0.0.7",
"ember-resolver": "~0.1.18",
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"ember-lodash": "0.0.5",
"ember-moment": "4.0.1",
"ember-notify": "4.0.1",
"ember-resolver": "^2.0.3",
"ember-responsive": "1.1.1",
"ivy-codemirror": "~1.2.0",
"torii": "^0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/resolver.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Resolver from 'ember/resolver';
import Resolver from 'ember-resolver';
import config from '../../config/environment';

var resolver = Resolver.create();
Expand Down

0 comments on commit 5d08533

Please sign in to comment.