Match service/controller import to ember-modules-codemod style for co…

…nsistency no issue Automated tools, code generators, and editor integrations are increasingly standardising on the import style used in `ember-modules-codemod`. Our import style differed a little with regards to service/controller injection imports which meant we were starting to see inconsistent naming.
TryGhost · Oct 30, 2017 · 238983a · 238983a
1 parent dcff959
commit 238983a
Show file tree

Hide file tree

Showing 107 changed files with 359 additions and 377 deletions.
diff --git a/app/adapters/base.js b/app/adapters/base.js
@@ -2,15 +2,15 @@ import AjaxServiceSupport from 'ember-ajax/mixins/ajax-support';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 import RESTAdapter from 'ember-data/adapters/rest';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default RESTAdapter.extend(DataAdapterMixin, AjaxServiceSupport, {
     authorizer: 'authorizer:oauth2',
 
     host: window.location.origin,
     namespace: ghostPaths().apiRoot.slice(1),
 
-    session: injectService(),
+    session: service(),
 
     shouldBackgroundReloadRecord() {
         return false;

diff --git a/app/authenticators/oauth2.js b/app/authenticators/oauth2.js
@@ -2,16 +2,16 @@ import Authenticator from 'ember-simple-auth/authenticators/oauth2-password-gran
 import RSVP from 'rsvp';
 import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isEmpty} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {makeArray as wrap} from '@ember/array';
 
 export default Authenticator.extend({
-    ajax: injectService(),
-    session: injectService(),
-    config: injectService(),
-    ghostPaths: injectService(),
+    ajax: service(),
+    session: service(),
+    config: service(),
+    ghostPaths: service(),
 
     init() {
         this._super(...arguments);

diff --git a/app/components/gh-alert.js b/app/components/gh-alert.js
@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'article',
     classNames: ['gh-alert'],
     classNameBindings: ['typeClass'],
 
-    notifications: injectService(),
+    notifications: service(),
 
     typeClass: computed('message.type', function () {
         let type = this.get('message.type');

diff --git a/app/components/gh-alerts.js b/app/components/gh-alerts.js
@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
 import {observer} from '@ember/object';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'aside',
     classNames: 'gh-alerts',
 
-    notifications: injectService(),
+    notifications: service(),
 
     messages: alias('notifications.alerts'),
 

diff --git a/app/components/gh-basic-dropdown.js b/app/components/gh-basic-dropdown.js
@@ -1,9 +1,9 @@
 import BasicDropdown from 'ember-basic-dropdown/components/basic-dropdown';
 import layout from 'ember-basic-dropdown/templates/components/basic-dropdown';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default BasicDropdown.extend({
-    dropdown: injectService(),
+    dropdown: service(),
 
     layout,
 

diff --git a/app/components/gh-blog-url.js b/app/components/gh-blog-url.js
@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: '',
 
-    config: injectService()
+    config: service()
 });
diff --git a/app/components/gh-cm-editor.js b/app/components/gh-cm-editor.js
@@ -5,7 +5,7 @@ import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import {InvokeActionMixin} from 'ember-invoke-action';
 import {assign} from '@ember/polyfills';
 import {bind, once, scheduleOnce} from '@ember/runloop';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const CmEditorComponent =  Component.extend(InvokeActionMixin, {
     classNameBindings: ['isFocused:focus'],
@@ -21,7 +21,7 @@ const CmEditorComponent =  Component.extend(InvokeActionMixin, {
 
     _editor: null, // reference to CodeMirror editor
 
-    lazyLoader: injectService(),
+    lazyLoader: service(),
 
     didReceiveAttrs() {
         if (this.get('value') === null || undefined) {

diff --git a/app/components/gh-content-cover.js b/app/components/gh-content-cover.js
@@ -11,10 +11,10 @@ Example:
 **/
 
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     classNames: ['content-cover'],
 

diff --git a/app/components/gh-date-time-picker.js b/app/components/gh-date-time-picker.js
@@ -1,12 +1,12 @@
 import Component from '@ember/component';
 import moment from 'moment';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isBlank, isEmpty} from '@ember/utils';
 import {or, reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    settings: injectService(),
+    settings: service(),
 
     tagName: '',
 

diff --git a/app/components/gh-datetime-input.js b/app/components/gh-datetime-input.js
@@ -3,7 +3,7 @@ import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import moment from 'moment';
 import {InvokeActionMixin} from 'ember-invoke-action';
 import {formatDate} from 'ghost-admin/utils/date-formatting';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(InvokeActionMixin, {
     tagName: 'span',
@@ -13,7 +13,7 @@ export default Component.extend(InvokeActionMixin, {
     inputClass: null,
     inputId: null,
     inputName: null,
-    settings: injectService(),
+    settings: service(),
 
     didReceiveAttrs() {
         let datetime = this.get('datetime') || moment.utc();

diff --git a/app/components/gh-download-count.js b/app/components/gh-download-count.js
@@ -1,14 +1,14 @@
 import Component from '@ember/component';
 import Ember from 'ember';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const {testing} = Ember;
 const INTERVAL = testing ? 20 : 2000;
 
 export default Component.extend({
-    ajax: injectService(),
-    ghostPaths: injectService(),
+    ajax: service(),
+    ghostPaths: service(),
 
     tagName: '',
     count: '',

diff --git a/app/components/gh-dropdown-button.js b/app/components/gh-dropdown-button.js
@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(DropdownMixin, {
     tagName: 'button',
@@ -10,7 +10,7 @@ export default Component.extend(DropdownMixin, {
     // matches with the dropdown this button toggles
     dropdownName: null,
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     // Notify dropdown service this dropdown should be toggled
     click(event) {

diff --git a/app/components/gh-dropdown.js b/app/components/gh-dropdown.js
@@ -1,8 +1,8 @@
 import Component from '@ember/component';
 import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(DropdownMixin, {
     classNames: 'dropdown',
@@ -22,7 +22,7 @@ export default Component.extend(DropdownMixin, {
         return this.get('isOpen') && !this.get('closing');
     }),
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     open() {
         this.set('isOpen', true);

diff --git a/app/components/gh-editor.js b/app/components/gh-editor.js
@@ -3,13 +3,13 @@ import {
     IMAGE_EXTENSIONS,
     IMAGE_MIME_TYPES
 } from 'ghost-admin/components/gh-image-uploader';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const {debounce} = run;
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     classNameBindings: [
         'isDraggedOver:-drag-over',

diff --git a/app/components/gh-feature-flag.js b/app/components/gh-feature-flag.js
@@ -1,14 +1,14 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const FeatureFlagComponent = Component.extend({
     tagName: 'label',
     classNames: 'checkbox',
     attributeBindings: ['for'],
     _flagValue: null,
 
-    feature: injectService(),
+    feature: service(),
 
     init() {
         this._super(...arguments);

diff --git a/app/components/gh-file-uploader.js b/app/components/gh-file-uploader.js
@@ -7,11 +7,11 @@ import {
 } from 'ghost-admin/services/ajax';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'section',
@@ -32,9 +32,9 @@ export default Component.extend({
     failureMessage: null,
     uploadPercentage: 0,
 
-    ajax: injectService(),
-    eventBus: injectService(),
-    notifications: injectService(),
+    ajax: service(),
+    eventBus: service(),
+    notifications: service(),
 
     formData: computed('file', function () {
         let paramName = this.get('paramName');

diff --git a/app/components/gh-fullscreen-modal.js b/app/components/gh-fullscreen-modal.js
@@ -2,17 +2,17 @@ import Component from '@ember/component';
 import RSVP from 'rsvp';
 import {computed} from '@ember/object';
 import {A as emberA} from '@ember/array';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const FullScreenModalComponent = Component.extend({
 
     model: null,
     modifier: null,
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     modalPath: computed('modal', function () {
         return `modal-${this.get('modal') || 'unknown'}`;

diff --git a/app/components/gh-image-uploader.js b/app/components/gh-image-uploader.js
@@ -8,20 +8,20 @@ import {
 } from 'ghost-admin/services/ajax';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export const IMAGE_MIME_TYPES = 'image/gif,image/jpg,image/jpeg,image/png,image/svg+xml';
 export const IMAGE_EXTENSIONS = ['gif', 'jpg', 'jpeg', 'png', 'svg'];
 
 export default Component.extend({
-    ajax: injectService(),
-    config: injectService(),
-    notifications: injectService(),
-    settings: injectService(),
+    ajax: service(),
+    config: service(),
+    notifications: service(),
+    settings: service(),
 
     tagName: 'section',
     classNames: ['gh-image-uploader'],

diff --git a/app/components/gh-markdown-editor.js b/app/components/gh-markdown-editor.js
@@ -6,9 +6,9 @@ import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
 import {copy} from '@ember/object/internals';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isEmpty, typeOf} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const MOBILEDOC_VERSION = '0.3.1';
 
@@ -27,9 +27,9 @@ export const BLANK_DOC = {
 
 export default Component.extend(ShortcutsMixin, {
 
-    config: injectService(),
-    notifications: injectService(),
-    settings: injectService(),
+    config: service(),
+    notifications: service(),
+    settings: service(),
 
     classNames: ['gh-markdown-editor'],
     classNameBindings: [

diff --git a/app/components/gh-menu-toggle.js b/app/components/gh-menu-toggle.js
@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 /*
     This cute little component has two jobs.
@@ -16,7 +16,7 @@ import {reads} from '@ember/object/computed';
 export default Component.extend({
     classNames: ['gh-menu-toggle'],
 
-    mediaQueries: injectService(),
+    mediaQueries: service(),
     isMobile: reads('mediaQueries.isMobile'),
     maximise: false,
 

diff --git a/app/components/gh-mobile-nav-bar.js b/app/components/gh-mobile-nav-bar.js
@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     tagName: 'nav',
     classNames: ['gh-mobile-nav-bar']

diff --git a/app/components/gh-nav-menu.js b/app/components/gh-nav-menu.js
@@ -2,15 +2,15 @@ import Component from '@ember/component';
 import calculatePosition from 'ember-basic-dropdown/utils/calculate-position';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    config: injectService(),
-    feature: injectService(),
-    ghostPaths: injectService(),
-    router: injectService('router'),
-    session: injectService(),
-    ui: injectService(),
+    config: service(),
+    feature: service(),
+    ghostPaths: service(),
+    router: service('router'),
+    session: service(),
+    ui: service(),
 
     tagName: 'nav',
     classNames: ['gh-nav'],