cleanup usage of Ember.inject

core/client/app/adapters/base.js

@@ -3,7 +3,9 @@ import DS from 'ember-data';
 import ghostPaths from 'ghost/utils/ghost-paths';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 
-const {inject} = Ember;
+const {
+    inject: {service}
+} = Ember;
 const {RESTAdapter} = DS;
 
 export default RESTAdapter.extend(DataAdapterMixin, {
@@ -12,7 +14,7 @@ export default RESTAdapter.extend(DataAdapterMixin, {
     host: window.location.origin,
     namespace: ghostPaths().apiRoot.slice(1),
 
-    session: inject.service('session'),
+    session: service(),
 
     shouldBackgroundReloadRecord() {
         return false;

core/client/app/authenticators/oauth2.js

@@ -1,11 +1,14 @@
 import Ember from 'ember';
 import Authenticator from 'ember-simple-auth/authenticators/oauth2-password-grant';
 
-const {computed, inject} = Ember;
+const {
+    computed,
+    inject: {service}
+} = Ember;
 
 export default Authenticator.extend({
-    config: inject.service(),
-    ghostPaths: inject.service('ghost-paths'),
+    config: service(),
+    ghostPaths: service(),
 
     serverTokenEndpoint: computed('ghostPaths.apiRoot', function () {
         return `${this.get('ghostPaths.apiRoot')}/authentication/token`;

core/client/app/components/gh-alert.js

@@ -1,13 +1,17 @@
 import Ember from 'ember';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 
 export default Component.extend({
     tagName: 'article',
     classNames: ['gh-alert'],
     classNameBindings: ['typeClass'],
 
-    notifications: inject.service(),
+    notifications: service(),
 
     typeClass: computed('message.type', function () {
         let type = this.get('message.type');

core/client/app/components/gh-alerts.js

@@ -1,13 +1,18 @@
 import Ember from 'ember';
 
-const {Component, computed, inject, observer} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service},
+    observer
+} = Ember;
 const {alias} = computed;
 
 export default Component.extend({
     tagName: 'aside',
     classNames: 'gh-alerts',
 
-    notifications: inject.service(),
+    notifications: service(),
 
     messages: alias('notifications.alerts'),
 

core/client/app/components/gh-blog-url.js

@@ -1,9 +1,12 @@
 import Ember from 'ember';
 
-const {Component, inject} = Ember;
+const {
+    Component,
+    inject: {service}
+} = Ember;
 
 export default Component.extend({
     tagName: '',
 
-    config: inject.service()
+    config: service()
 });

core/client/app/components/gh-content-view-container.js

@@ -1,11 +1,15 @@
 import Ember from 'ember';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 
 export default Component.extend({
     tagName: 'section',
     classNames: ['gh-view', 'content-view-container'],
 
-    mediaQueries: inject.service(),
+    mediaQueries: service(),
     previewIsHidden: computed.reads('mediaQueries.maxWidth900')
 });

core/client/app/components/gh-dropdown-button.js

@@ -1,7 +1,10 @@
 import Ember from 'ember';
 import DropdownMixin from 'ghost/mixins/dropdown-mixin';
 
-const {Component, inject} = Ember;
+const {
+    Component,
+    inject: {service}
+} = Ember;
 
 export default Component.extend(DropdownMixin, {
     tagName: 'button',
@@ -11,7 +14,7 @@ export default Component.extend(DropdownMixin, {
     // matches with the dropdown this button toggles
     dropdownName: null,
 
-    dropdown: inject.service(),
+    dropdown: service(),
 
     // Notify dropdown service this dropdown should be toggled
     click(event) {

core/client/app/components/gh-dropdown.js

@@ -1,7 +1,11 @@
 import Ember from 'ember';
 import DropdownMixin from 'ghost/mixins/dropdown-mixin';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 
 export default Component.extend(DropdownMixin, {
     classNames: 'dropdown',
@@ -21,7 +25,7 @@ export default Component.extend(DropdownMixin, {
         return this.get('isOpen') && !this.get('closing');
     }),
 
-    dropdown: inject.service(),
+    dropdown: service(),
 
     open() {
         this.set('isOpen', true);

core/client/app/components/gh-ed-preview.js

@@ -1,10 +1,15 @@
 import Ember from 'ember';
 import uploader from 'ghost/assets/lib/uploader';
 
-const {$, Component, inject, run} = Ember;
+const {
+    $,
+    Component,
+    inject: {service},
+    run
+} = Ember;
 
 export default Component.extend({
-    config: inject.service(),
+    config: service(),
 
     _scrollWrapper: null,
 

core/client/app/components/gh-fullscreen-modal.js

@@ -1,7 +1,13 @@
 import Ember from 'ember';
 import LiquidTether from 'liquid-tether/components/liquid-tether';
 
-const {RSVP, isBlank, on, run} = Ember;
+const {
+    RSVP: {Promise},
+    inject: {service},
+    isBlank,
+    on,
+    run
+} = Ember;
 const emberA = Ember.A;
 
 const FullScreenModalComponent = LiquidTether.extend({
@@ -14,7 +20,7 @@ const FullScreenModalComponent = LiquidTether.extend({
     overlayClass: 'fullscreen-modal-background',
     modalPath: 'unknown',
 
-    dropdown: Ember.inject.service(),
+    dropdown: service(),
 
     init() {
         this._super(...arguments);
@@ -48,7 +54,7 @@ const FullScreenModalComponent = LiquidTether.extend({
                 return this.attrs.close();
             }
 
-            return new RSVP.Promise((resolve) => {
+            return new Promise((resolve) => {
                 resolve();
             });
         },
@@ -58,7 +64,7 @@ const FullScreenModalComponent = LiquidTether.extend({
                 return this.attrs.confirm();
             }
 
-            return new RSVP.Promise((resolve) => {
+            return new Promise((resolve) => {
                 resolve();
             });
         },

core/client/app/components/gh-menu-toggle.js

@@ -1,6 +1,10 @@
 import Ember from 'ember';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 
 /*
     This cute little component has two jobs.
@@ -15,7 +19,7 @@ const {Component, computed, inject} = Ember;
 export default Component.extend({
     classNames: ['gh-menu-toggle'],
 
-    mediaQueries: inject.service(),
+    mediaQueries: service(),
     isMobile: computed.reads('mediaQueries.isMobile'),
     maximise: false,
 

core/client/app/components/gh-nav-menu.js

@@ -1,6 +1,9 @@
 import Ember from 'ember';
 
-const {Component, inject} = Ember;
+const {
+    Component,
+    inject: {service}
+} = Ember;
 
 export default Component.extend({
     tagName: 'nav',
@@ -9,8 +12,8 @@ export default Component.extend({
 
     open: false,
 
-    config: inject.service(),
-    session: inject.service(),
+    config: service(),
+    session: service(),
 
     mouseEnter() {
         this.sendAction('onMouseEnter');

core/client/app/components/gh-navitem.js

@@ -2,14 +2,15 @@ import Ember from 'ember';
 import ValidationStateMixin from 'ghost/mixins/validation-state';
 
 const {Component, computed} = Ember;
+const {readOnly} = computed;
 
 export default Component.extend(ValidationStateMixin, {
     classNames: 'gh-blognav-item',
     classNameBindings: ['errorClass'],
 
     attributeBindings: ['order:data-order'],
-    order: computed.readOnly('navItem.order'),
-    errors: computed.readOnly('navItem.errors'),
+    order: readOnly('navItem.order'),
+    errors: readOnly('navItem.errors'),
 
     errorClass: computed('hasError', function () {
         if (this.get('hasError')) {

core/client/app/components/gh-notification.js

@@ -1,6 +1,10 @@
 import Ember from 'ember';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 
 export default Component.extend({
     tagName: 'article',
@@ -9,7 +13,7 @@ export default Component.extend({
 
     message: null,
 
-    notifications: inject.service(),
+    notifications: service(),
 
     typeClass: computed('message.type', function () {
         let type = this.get('message.type');

core/client/app/components/gh-notifications.js

@@ -1,13 +1,17 @@
 import Ember from 'ember';
 
-const {Component, computed, inject} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 const {alias} = computed;
 
 export default Component.extend({
     tagName: 'aside',
     classNames: 'gh-notifications',
 
-    notifications: inject.service(),
+    notifications: service(),
 
     messages: alias('notifications.notifications')
 });

core/client/app/components/gh-popover-button.js

@@ -1,14 +1,16 @@
 import Ember from 'ember';
 import DropdownButton from 'ghost/components/gh-dropdown-button';
 
-const {inject} = Ember;
+const {
+    inject: {service}
+} = Ember;
 
 function K() {
     return this;
 }
 
 export default DropdownButton.extend({
-    dropdown: inject.service(),
+    dropdown: service(),
 
     click: K,
 

core/client/app/components/gh-popover.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 import GhostDropdown from 'ghost/components/gh-dropdown';
 
-const {inject} = Ember;
+const {
+    inject: {service}
+} = Ember;
 
 export default GhostDropdown.extend({
     classNames: 'ghost-popover',
-    dropdown: inject.service()
+    dropdown: service()
 });

core/client/app/components/gh-posts-list-item.js

@@ -1,7 +1,12 @@
 import Ember from 'ember';
 import ActiveLinkWrapper from 'ghost/mixins/active-link-wrapper';
 
-const {$, Component, computed, inject} = Ember;
+const {
+    $,
+    Component,
+    computed,
+    inject: {service}
+} = Ember;
 const {alias, equal} = computed;
 
 export default Component.extend(ActiveLinkWrapper, {
@@ -15,7 +20,7 @@ export default Component.extend(ActiveLinkWrapper, {
     isPage: alias('post.page'),
     isPublished: equal('post.status', 'published'),
 
-    ghostPaths: inject.service('ghost-paths'),
+    ghostPaths: service(),
 
     authorName: computed('post.author.name', 'post.author.email', function () {
         return this.get('post.author.name') || this.get('post.author.email');

core/client/app/components/gh-profile-image.js

@@ -1,6 +1,11 @@
 import Ember from 'ember';
 
-const {Component, computed, inject, run} = Ember;
+const {
+    Component,
+    computed,
+    inject: {service},
+    run
+} = Ember;
 const {notEmpty} = computed;
 
 /**
@@ -26,7 +31,7 @@ export default Component.extend({
     hasUploadedImage: false,
     fileStorage: true,
 
-    ghostPaths: inject.service('ghost-paths'),
+    ghostPaths: service(),
     displayGravatar: notEmpty('validEmail'),
 
     init() {