Upgrade

.eslintignore

@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
@@ -15,30 +16,39 @@ module.exports = {
     browser: true
   },
   rules: {
-    'ember/no-jquery': 'off',
+    // 'ember/no-jquery': 'off',
     'no-console': 'off',
-    'ember/avoid-leaking-state-in-ember-objects': 1
+    // 'ember/avoid-leaking-state-in-ember-objects': 1
   },
   overrides: [
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
         'lib/**/*.js',
         'bin/*',
+        'server/**/*.js',
+        'run-tests.js'
       ],
+      excludedFiles: ['app/**'],
       parserOptions: {
         sourceType: 'script',
         ecmaVersion: 2017
       },
       env: {
         browser: false,
         node: true
-      }
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+        "node/no-unpublished-require": "off"
+      })
     }
   ]
 };

.gitignore

@@ -18,6 +18,8 @@ terraform.tfstate.backup
 
 # misc
 /.projectile
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/

.template-lintrc.js

@@ -8,5 +8,6 @@ module.exports = {
     'no-unnecessary-concat': false,
     'no-inline-styles': false,
     quotes: false
+    // 'no-implicit-this': true,
   }
 };

.travis.yml

@@ -1,10 +1,10 @@
+---
 language: node_js
 node_js:
-- '10'
+  - "10"
 
+sudo: false
 dist: trusty
-sudo: required
-group: deprecated-2017Q4
 
 addons:
   chrome: stable
@@ -18,13 +18,15 @@ env:
     - JOBS=1
 
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
   - yarn global add bower
 
 install:
-  - yarn install
-  - bower install
+  - yarn install --non-interactive
+  -- bower install
 
 script:
+  - yarn lint:hbs
+  - yarn lint:js
   - yarn test

app.json

@@ -1,7 +1,6 @@
 {
   "name": "ember-api-docs",
-  "scripts": {
-  },
+  "scripts": {},
   "env": {
     "FASTLY_API_KEY": {
       "required": false
@@ -14,12 +13,13 @@
     },
     "WORKER_COUNT": {
       "required": false
+    },
+    "ENVIRONMENT": {
+      "required": false
     }
   },
-  "formation": {
-  },
-  "addons": [
-  ],
+  "formation": {},
+  "addons": [],
   "buildpacks": [
     {
       "url": "https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz"

app/components/table-of-contents.js

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

app/mixins/parent-name.js

@@ -4,9 +4,10 @@ import Mixin from '@ember/object/mixin';
 import { inject as service } from '@ember/service';
 
 export default Mixin.create({
-  router: service('-routing'),
+  router: service(),
 
   routeName: readOnly('router.currentRouteName'),
+
   parentName: computed('routeName', function() {
     const routeName = this.routeName;
     const routes = routeName.split('.');

app/router.js

@@ -3,18 +3,23 @@ import { scheduleOnce } from '@ember/runloop';
 import config from './config/environment';
 import { inject as service } from '@ember/service';
 
+// this is constant for this app and is only used to identify page views in the GA dashboard
+const hostname = config.APP.domain.replace(/(http|https)?:?\/\//g, '');
+
 const AppRouter = Router.extend({
   location: config.locationType,
   rootURL: config.routerRootURL,
 
   metrics: service(),
   fastboot: service(),
 
-  didTransition() {
+  init() {
     this._super(...arguments);
-    this._trackPage();
+
+    this.on('routeDidChange', () => this._trackPage());
   },
 
+
   _trackPage() {
     if (this.get('fastboot.isFastBoot')) {
       return;
@@ -24,9 +29,6 @@ const AppRouter = Router.extend({
       const page = this.url;
       const title = this.getWithDefault('currentRouteName', 'unknown');
 
-      // this is constant for this app and is only used to identify page views in the GA dashboard
-      const hostname = config.APP.domain.replace(/(http|https)?:?\/\//g, '');
-
       this.metrics.trackPage({ page, title, hostname });
     });
   }

app/routes/project-version.js

@@ -1,5 +1,5 @@
-import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 import semverCompare from 'semver-compare';
 import getCompactVersion from 'ember-api-docs/utils/get-compact-version';
 import getFullVersion from 'ember-api-docs/utils/get-full-version';
@@ -12,6 +12,8 @@ export default Route.extend({
   metaStore: service(),
   projectService: service('project'),
 
+  router: service(),
+
   titleToken: function(model) {
     return model.get('version');
   },
@@ -32,11 +34,19 @@ export default Route.extend({
 
   // Using redirect instead of afterModel so transition succeeds and returns 30
   redirect(model, transition) {
-    this._gatherHeadDataFromVersion(model, transition.params['project-version'].project_version);
-    let classParams = transition.params['project-version.classes.class'];
-    let moduleParams = transition.params['project-version.modules.module'];
-    let namespaceParams = transition.params['project-version.namespaces.namespace'];
-    let functionParams = transition.params['project-version.functions.function'];
+
+    const lookupParams = (routeName) => {
+      let route = transition.routeInfos.find(({name}) => name === routeName);
+      return route ? route.params : {}
+    };
+
+    this._gatherHeadDataFromVersion(model, lookupParams('project-version').project_version);
+
+    let classParams = lookupParams('project-version.classes.class');
+    let moduleParams = lookupParams('project-version.modules.module');
+    let namespaceParams = lookupParams('project-version.namespaces.namespace');
+    let functionParams = lookupParams('project-version.functions.function');
+
     let transitionVersion = this.projectService.getUrlVersion();
     if (!classParams && !moduleParams && !namespaceParams && !functionParams) {
       // if there is no class, module, or namespace specified...
@@ -66,6 +76,7 @@ export default Route.extend({
     this.set('headData.isRelease', projectVersion === 'release');
     this.set('headData.compactVersion', model.get('compactVersion'));
     this.set('headData.urlVersion', projectVersion);
+
     if (!this.get('headData.isRelease')) {
       let request = this.get('fastboot.request');
       let href = this.get('fastboot.isFastBoot')

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

@@ -1,14 +1,11 @@
-import { resolve, all } from 'rsvp';
 import Route from '@ember/routing/route';
-import { set, get } from '@ember/object';
-import ScrollTracker from 'ember-api-docs/mixins/scroll-tracker';
+import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { pluralize } from 'ember-inflector';
-import Ember from 'ember';
-import getFullVersion from 'ember-api-docs/utils/get-full-version';
+import ScrollTracker from 'ember-api-docs/mixins/scroll-tracker';
 import createExcerpt from 'ember-api-docs/utils/create-excerpt';
-
-const { Logger } = Ember;
+import getFullVersion from 'ember-api-docs/utils/get-full-version';
+import { pluralize } from 'ember-inflector';
+import { all, resolve } from 'rsvp';
 
 export default Route.extend(ScrollTracker, {
   headData: service(),
@@ -19,9 +16,17 @@ export default Route.extend(ScrollTracker, {
   },
 
   async model(params, transition) {
-    let projectID = transition.params['project-version'].project;
+    const lookupParams = (routeName) => {
+      let route = transition.routeInfos.find(({name}) => name === routeName);
+      return route ? route.params : {}
+    };
+
+    let {
+      project: projectID,
+      project_version: compactVersion
+    } = lookupParams('project-version');
+
     let projectObj = await this.store.findRecord('project', projectID);
-    let compactVersion = transition.params['project-version'].project_version;
     let projectVersion = getFullVersion(compactVersion, projectID, projectObj, this.metaStore);
     const klass = params['class'];
     return this.find('class', `${projectID}-${projectVersion}-${klass}`);
@@ -30,16 +35,16 @@ export default Route.extend(ScrollTracker, {
   find(typeName, param) {
     return this.store.find(typeName, param).catch((e1) => {
       if (typeName != 'namespace') {
-        Logger.warn(e1, 'fetching by class or module failed, retrying as namespace');
+        console.warn(e1, 'fetching by class or module failed, retrying as namespace');
         return this.store.find('namespace', param).catch((e2) => {
-          Logger.error(e2);
+          console.error(e2);
           return resolve({
             isError: true,
             status: 404
           });
         });
       }
-      Logger.error(e1);
+      console.error(e1);
       return resolve({
         isError: true,
         status: 404
@@ -48,13 +53,22 @@ export default Route.extend(ScrollTracker, {
   },
 
   redirect(model, transition) {
-    if (transition.queryParams.anchor && transition.queryParams.type) {
-      let type = transition.queryParams.type;
-      this.transitionTo(`project-version.classes.class.${pluralize(type)}.${type}`,
-        transition.params['project-version'].project,
-        transition.params['project-version'].project_version,
-        transition.params['project-version.classes.class'].class,
-        transition.queryParams.anchor);
+    const lookupParams = (routeName) => {
+      let route = transition.routeInfos.find(({name}) => name === routeName);
+      return route ? route.params : {}
+    }
+
+    let { to: { queryParams } } = transition;
+
+    if (queryParams.anchor && queryParams.type) {
+      let type = queryParams.type;
+      this.transitionTo(
+        `project-version.classes.class.${pluralize(type)}.${type}`,
+        lookupParams('project-version').project,
+        lookupParams('project-version').project_version,
+        lookupParams('project-version.classes.class').class,
+        queryParams.anchor
+      );
     }
     if (model.isError) {
       this.transitionTo('404');
@@ -63,14 +77,14 @@ export default Route.extend(ScrollTracker, {
 
   afterModel(klass) {
     if (!klass.isError) {
-      let description = klass.get('ogDescription') || klass.get('description')
+      let description = klass.get('ogDescription') || klass.get('description');
       if (description) {
         set(this, 'headData.description', createExcerpt(description));
       }
 
       const relationships = get(klass.constructor, 'relationshipNames');
       const promises = Object.keys(relationships).reduce((memo, relationshipType) => {
-        const relationshipPromises = relationships[relationshipType].map(name => klass.get(name));
+        const relationshipPromises = relationships[relationshipType].map((name) => klass.get(name));
         return memo.concat(relationshipPromises);
       }, []);
       return all(promises);
@@ -82,5 +96,4 @@ export default Route.extend(ScrollTracker, {
       class: get(model, 'name')
     };
   }
-
 });

app/routes/project-version/functions/function.js

@@ -15,9 +15,18 @@ export default Route.extend({
   },
 
   async model(params, transition) {
-    let projectID = transition.params['project-version'].project;
+    const lookupParams = (routeName) => {
+      let route = transition.routeInfos.find(({name}) => name === routeName);
+      return route ? route.params : {}
+    };
+
+    let {
+      project: projectID,
+      project_version: compactVersion
+    } = lookupParams('project-version');
+
     let projectObj = await this.store.findRecord('project', projectID);
-    let compactVersion = transition.params['project-version'].project_version;
+
     let projectVersion = getFullVersion(compactVersion, projectID, projectObj, this.metaStore);
     let className = params['module'];
     let functionName = params['fn'];