Modules refactor

app/adapters/application.js

@@ -1,12 +1,8 @@
+import { inject as service } from '@ember/service';
 import DS from 'ember-data';
-import Ember from 'ember';
 import fetch from 'fetch';
 import ENV from 'ember-api-docs/config/environment';
-
-const {
-  Inflector: { inflector },
-  inject: { service }
-} = Ember;
+import { pluralize } from 'ember-inflector';
 
 const { JSONAPIAdapter } = DS;
 
@@ -29,11 +25,11 @@ export default JSONAPIAdapter.extend({
     if (['namespace', 'class', 'module'].includes(modelName)) {
       let [version] = id.replace(`${projectName}-`, '').split('-');
       let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
-      url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
+      url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
     } else if (modelName === 'missing') {
       let version = this.get('projectService.version');
       let revId = this.get('metaStore').getRevId(projectName, version, modelName, id);
-      url = `json-docs/${projectName}/${version}/${inflector.pluralize(modelName)}/${revId}`;
+      url = `json-docs/${projectName}/${version}/${pluralize(modelName)}/${revId}`;
     } else if (modelName === 'project') {
       this.set('currentProject', id);
       url = `rev-index/${id}`;

app/app.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/components/api-index-filter.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 import uniq from 'npm:lodash.uniq';
 import sortBy from 'npm:lodash.sortby';
 
-const { computed, Component } = Ember;
 
 export default Component.extend({
   classNames: ['api-index-filter'],

app/components/api-index.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
 
-  sections: Ember.computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
+  sections: computed('itemData.methods', 'itemData.properties', 'itemData.events', function () {
     return [
       {
         title: 'Methods',

app/components/class-field-description.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
 

app/components/ember-anchor.js

@@ -1,9 +1,8 @@
+import $ from 'jquery';
+import { get } from '@ember/object';
 import AnchorComponent from 'ember-anchor/components/ember-anchor';
-import Ember from 'ember';
 import config from 'ember-api-docs/config/environment';
 
-const { $, get } = Ember;
-
 export default AnchorComponent.extend({
 
   // This overrides Ember Anchor to support scrolling within a fixed position element

app/components/loading-spinner.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ['loading-spinner']
 });

app/components/main-footer.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
 
   tagName: '',
 
-  currentYear: Ember.computed(function() {
+  currentYear: computed(function() {
     return new Date().getUTCFullYear();
   })
 

app/components/search-input.js

@@ -1,21 +1,26 @@
-import Ember from 'ember';
+import { later } from '@ember/runloop';
+import { denodeify } from 'rsvp';
+import { A } from '@ember/array';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 import get from 'ember-metal/get';
 import set from 'ember-metal/set';
-import {task, timeout} from 'ember-concurrency';
+import { task, timeout } from 'ember-concurrency';
 
 const SEARCH_DEBOUNCE_PERIOD = 300;
 
-export default Ember.Component.extend({
+export default Component.extend({
   // Public API
   value: '',
 
-  _searchClient: Ember.inject.service('algolia'),
+  _searchClient: service('algolia'),
 
   // Private API
   classNames: ['search-input'],
-  _projectService: Ember.inject.service('project'),
-  _projectVersion: Ember.computed.alias('_projectService.standardisedVersion'),
-  _results: Ember.A(),
+  _projectService: service('project'),
+  _projectVersion: alias('_projectService.standardisedVersion'),
+  _results: A(),
   _focused: false,
   _resultTetherConstraints: [
     {
@@ -47,7 +52,7 @@ export default Ember.Component.extend({
       query
     };
 
-    let searchFn = Ember.RSVP.denodeify(client.search.bind(client));
+    let searchFn = denodeify(client.search.bind(client));
     let res = yield searchFn(searchObj, params);
 
     const results = get(res, 'hits');
@@ -63,7 +68,7 @@ export default Ember.Component.extend({
     },
 
     onblur() {
-      Ember.run.later(this, function () {
+      later(this, function () {
         set(this, '_focused', false);
       }, 200);
     }

app/components/search-input/dropdown-header.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ['ds-suggestion']
 });

app/components/search-input/dropdown-result.js

@@ -1,6 +1,8 @@
-import Ember from 'ember';
+import { gt } from '@ember/object/computed';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   // Public API
   result: {},
   role: 'option',
@@ -12,9 +14,9 @@ export default Ember.Component.extend({
   attributeBindings: ['role'],
 
   // Left sidebar should only be displayed for the first result in the group
-  _primaryColumn: Ember.computed('groupPosition,groupName', function () {
+  _primaryColumn: computed('groupPosition,groupName', function () {
     const { groupName, groupPosition } = this.getProperties('groupName', 'groupPosition');
     return groupPosition === 0? groupName : '';
   }),
-  isSecondary: Ember.computed.gt('groupPosition', 0)
+  isSecondary: gt('groupPosition', 0)
 });

app/components/search-input/dropdown.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { capitalize } from '@ember/string';
+import Component from '@ember/component';
+import { get, computed } from '@ember/object';
+import { A } from '@ember/array';
 
-const { get, A } = Ember;
-
-export default Ember.Component.extend({
+export default Component.extend({
   // Public API
   role: 'listbox',
   results: A(),
@@ -23,17 +24,17 @@ export default Ember.Component.extend({
    *    }
    *  }
    */
-  _groupedResults: Ember.computed('results.[]', function () {
+  _groupedResults: computed('results.[]', function () {
     if (!get(this, 'results.length')) {
       return {};
     }
 
     const lvl0Group = get(this, 'results').reduce((previous, current) => {
       // Remap all lowercase usages of 'guides' to 'Guides'
-      let lvl0 = Ember.String.capitalize(get(current, 'hierarchy.lvl0'));
+      let lvl0 = capitalize(get(current, 'hierarchy.lvl0'));
       // If lvl0 doesn't exist in the resulting object, create the array
       if (!previous[lvl0]) {
-        previous[lvl0] = Ember.A();
+        previous[lvl0] = A();
       }
       // Insert the current item into the resulting object.
       previous[lvl0].addObject(current);
@@ -55,7 +56,7 @@ export default Ember.Component.extend({
         const lvl1Key = lvl1Value? lvl1Value : lvl0Key;
 
         if (!lvl1Result[lvl1Key]) {
-          lvl1Result[lvl1Key] = Ember.A();
+          lvl1Result[lvl1Key] = A();
         }
 
         lvl1Result[lvl1Key].addObject(lvl1Item);

app/components/table-of-contents.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   actions: {
     toggle(type) {
       this.$('ol.toc-level-1.' + type).slideToggle(200);

app/controllers/events.js

@@ -1,7 +1,8 @@
-import Ember from "ember";
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
 
-export default Ember.Controller.extend(AnchorControllerSupport, {
-  filterData: Ember.inject.service(),
+export default Controller.extend(AnchorControllerSupport, {
+  filterData: service(),
   queryParams: ['anchor']
 });

app/controllers/methods.js

@@ -1,7 +1,8 @@
-import Ember from "ember";
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
 
-export default Ember.Controller.extend(AnchorControllerSupport, {
-  filterData: Ember.inject.service(),
+export default Controller.extend(AnchorControllerSupport, {
+  filterData: service(),
   queryParams: ['anchor']
 });

app/controllers/project-version.js

@@ -1,11 +1,12 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { computed } from '@ember/object';
+import { A } from '@ember/array';
+import { inject as service } from '@ember/service';
 import values from 'npm:lodash.values';
 import groupBy from 'npm:lodash.groupby';
 import semverCompare from 'npm:semver-compare';
 import FilterParams from '../mixins/filter-params';
 
-const { Controller, computed, A, inject: {service} } = Ember;
-
 export default Controller.extend(FilterParams, {
 
   filterData: service(),

app/controllers/project-version/classes/class.js

@@ -1,10 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
 
-const { Controller } = Ember;
-
 export default Controller.extend(ParentNameMixin, {
-  filterData: Ember.inject.service(),
+  filterData: service(),
 
   actions: {
     updateFilter(filter) {

app/controllers/project-version/classes/class/index.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import ParentNameMixin from 'ember-api-docs/mixins/parent-name';
 
-const { Controller } = Ember;
-
 export default Controller.extend(ParentNameMixin, {
-  filterData: Ember.inject.service()
+  filterData: service()
 });

app/controllers/project-version/modules/module.js

@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
 import ClassController from '../classes/class';
 import uniq from 'npm:lodash.uniq';
 import union from 'npm:lodash.union';
 
-const { computed, inject } = Ember;
-
 export default ClassController.extend({
-  filterData: inject.service(),
+  filterData: service(),
   showPrivateClasses: computed.alias('filterData.sideNav.showPrivate'),
 
   submodules: computed('model', function() {

app/controllers/properties.js

@@ -1,7 +1,8 @@
-import Ember from "ember";
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import AnchorControllerSupport from "ember-anchor/mixins/controller-support";
 
-export default Ember.Controller.extend(AnchorControllerSupport, {
-  filterData: Ember.inject.service(),
+export default Controller.extend(AnchorControllerSupport, {
+  filterData: service(),
   queryParams: ['anchor']
 });

app/helpers/eq.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 
 export function eq(params) {
   return params[0] === params[1];
 }
 
-export default Ember.Helper.helper(eq);
+export default helper(eq);

app/helpers/github-link.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
 import githubMap from '../utils/github-map';
 
 export function githubLink([project, version, file, line]) {
   return `https://github.com/${githubMap[project]}/tree/v${version}/${file}#L${line}`;
 }
 
-export default Ember.Helper.helper(githubLink);
+export default helper(githubLink);

app/helpers/html-safe.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { htmlSafe as emberHtmlSafe } from '@ember/string';
 
 export function htmlSafe([content]) {
-  return Ember.String.htmlSafe(content);
+  return emberHtmlSafe(content);
 }
 
-export default Ember.Helper.helper(htmlSafe);
+export default helper(htmlSafe);