Upgrade ember to 3.16

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'
@@ -17,7 +23,7 @@ module.exports = {
   rules: {
     'ember/no-jquery': 'off',
     'no-console': 'off',
-    'ember/avoid-leaking-state-in-ember-objects': 1
+    'ember/no-new-mixins': 'off'
   },
   overrides: [
     // node files

.template-lintrc.js

@@ -2,11 +2,14 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  extends: 'octane',
   rules: {
     'attribute-indentation': false,
     'no-unnecessary-concat': false,
     'no-inline-styles': false,
+    'no-implicit-this': false,
+    'no-curly-component-invocation': false,
+    'no-action': false,
     quotes: false
   }
 };

.travis.yml

@@ -16,6 +16,10 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
+branches:
+  only:
+    - master
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
   - export PATH=$HOME/.yarn/bin:$PATH

app/app.js

@@ -1,14 +1,12 @@
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;

app/router.js

@@ -3,33 +3,35 @@ import { scheduleOnce } from '@ember/runloop';
 import config from './config/environment';
 import { inject as service } from '@ember/service';
 
-const AppRouter = Router.extend({
-  location: config.locationType,
-  rootURL: config.routerRootURL,
+class AppRouter extends Router {
+  location = config.locationType;
+  rootURL = config.routerRootURL;
 
-  metrics: service(),
-  fastboot: service(),
+  @service metrics;
+  @service fastboot;
 
-  init() {
-    this._super(...arguments);
+  constructor() {
+    super(...arguments);
 
     if (!this.get('fastboot.isFastBoot')) {
-      this.on('routeDidChange', () => this._trackPage());
+      this.on('routeDidChange', this, this._trackPage);
     }
-  },
+  }
 
   _trackPage() {
-    scheduleOnce('afterRender', this, () => {
+    scheduleOnce('afterRender', this, this.__trackPage);
+  }
 
-      // 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, '');
+  __trackPage() {
 
-      const page = this.url;
-      const title = this.getWithDefault('currentRouteName', 'unknown');
-      this.metrics.trackPage({ page, title, hostname });
-    });
+    // 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 page = this.url;
+    const title = this.getWithDefault('currentRouteName', 'unknown');
+    this.metrics.trackPage({ page, title, hostname });
   }
-});
+}
 
 AppRouter.map(function() {
   this.route('404');

app/templates/404.hbs

@@ -4,7 +4,7 @@
   <div class="whoops__message">
     <p>
       This page wasn't found. Please try the {{#link-to 'index'}}API docs page{{/link-to}}.
-      If you expected something else to be here, please file a <a href="https://github.com/ember-learn/ember-api-docs/issues/new" target="_blank" rel="noopener">ticket</a>.
+      If you expected something else to be here, please file a <a href="https://github.com/ember-learn/ember-api-docs/issues/new" target="_blank" rel="noopener noreferrer">ticket</a>.
     </p>
   </div>
 </article>

app/templates/components/class-field-description.hbs

@@ -1,6 +1,7 @@
 <section class="{{type}}">
+  {{!-- TODO: Fix this link for a11y --}}
   <h3 class="class-field-description--link" data-anchor="{{field.name}}" role="link" onclick={{action updateAnchor field.name}}>
-    <a class="anchor">
+    <a class="anchor" {{!-- template-lint-disable link-href-attributes --}}>
       {{svg-jar 'fa-link' class="class-field-description--link-hover" width="20px" height="20px"}}
     </a>
     <span class="{{type}}-name">{{field.name}}</span>
@@ -30,12 +31,12 @@
   <p class="github-link" data-test-file={{field.file}}>
     {{#if field.inherited}}
       Inherited from
-      <a href="{{github-link model.project.id model.projectVersion.version field.file field.line}}" target="_blank" rel="noopener">
+      <a href="{{github-link model.project.id model.projectVersion.version field.file field.line}}" target="_blank" rel="noopener noreferrer">
         {{field.inheritedFrom}} {{field.file}}:{{field.line}}
       </a>
     {{else}}
       Defined in
-      <a href="{{github-link model.project.id model.projectVersion.version field.file field.line}}" target="_blank" rel="noopener">
+      <a href="{{github-link model.project.id model.projectVersion.version field.file field.line}}" target="_blank" rel="noopener noreferrer">
         {{field.file}}:{{field.line}}
       </a>
     {{/if}}

app/templates/ember-cli.hbs

@@ -7,9 +7,9 @@
     <li class="toc-level-0">
       Projects
       <ol class="toc-level-1 selected" style="display: block;">
-        <li class="toc-level-1">{{#link-to 'project' 'ember' active=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
-        <li class="toc-level-1">{{#link-to 'project' 'ember-data' active=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
-        <li class="toc-level-1">{{#link-to 'project' 'ember-cli' active=(eq activeProject 'ember-cli') class="spec-ember"}}Ember CLI{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember' current-when=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember-data' current-when=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember-cli' current-when=(eq activeProject 'ember-cli') class="spec-ember"}}Ember CLI{{/link-to}}</li>
       </ol>
     </li>
   </ol>

app/templates/error.hbs

@@ -4,7 +4,7 @@
     <div class="whoops__message">
       <p>
         This page wasn't found. Please try the {{#link-to 'index'}}API docs page{{/link-to}}.
-        If you expected something else to be here, please file a <a href="https://github.com/fivetanley/ember-api-docs/issues/new" target="_blank" rel="noopener">ticket</a>.
+        If you expected something else to be here, please file a <a href="https://github.com/fivetanley/ember-api-docs/issues/new" target="_blank" rel="noopener noreferrer">ticket</a>.
       </p>
     </div>
   {{else}}

app/templates/project-version.hbs

@@ -6,9 +6,9 @@
     <li class="toc-level-0">
       Projects
       <ol class="toc-level-1 selected" style="display: block;">
-        <li class="toc-level-1">{{#link-to 'project' 'ember' active=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
-        <li class="toc-level-1">{{#link-to 'project' 'ember-data' active=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
-        <li class="toc-level-1">{{#link-to 'project' 'ember-cli' active=(eq activeProject 'ember-cli') class="spec-ember"}}Ember CLI{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember' current-when=(eq activeProject 'ember') class="spec-ember"}}Ember{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember-data' current-when=(eq activeProject 'ember-data') class="spec-ember-data"}}Ember Data{{/link-to}}</li>
+        <li class="toc-level-1">{{#link-to 'project' 'ember-cli' current-when=(eq activeProject 'ember-cli') class="spec-ember"}}Ember CLI{{/link-to}}</li>
       </ol>
     </li>
   </ol>

app/templates/project-version/classes/class.hbs

@@ -1,6 +1,6 @@
 <article class="chapter">
   {{#if (is-latest version=model.projectVersion.version allVersions=allVersions)}}
-    <a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link model.project.id model.projectVersion.version model.file model.line isEdit=true}}" target="_blank" rel="noopener">{{svg-jar "fa-pencil"}}</a>
+    <a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link model.project.id model.projectVersion.version model.file model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "fa-pencil"}}</a>
   {{/if}}
   <h1 class="module-name">Class {{model.name}}</h1>
   {{#if model.access}}<span class="access">{{model.access}}</span>{{/if}}
@@ -27,7 +27,7 @@
       <div class="attribute">
         <span class="attribute-label">Defined in:</span>
         <span class="attribute-value">
-          <a href="{{github-link model.project.id model.projectVersion.version model.file model.line}}" target="_blank" rel="noopener">{{model.file}}:{{model.line}}</a>
+          <a href="{{github-link model.project.id model.projectVersion.version model.file model.line}}" target="_blank" rel="noopener noreferrer">{{model.file}}:{{model.line}}</a>
         </span>
       </div>
     {{/if}}

config/deprecation-workflow.js

@@ -1,6 +1,7 @@
 self.deprecationWorkflow = self.deprecationWorkflow || {};
 self.deprecationWorkflow.config = {
   workflow: [
-    { handler: "silence", matchId: "computed-property.override" }
+    { handler: "silence", matchId: "ember.globals-resolver" },
+    { handler: "silence", matchId: "ember-component.is-visible" }
   ]
 };

config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.12.1",
+      "version": "3.16.1",
       "blueprints": [
         {
           "name": "app",

config/optional-features.json

@@ -1,3 +1,6 @@
 {
-  "jquery-integration": true
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": true,
+  "template-only-glimmer-components": true
 }

package.json

@@ -13,17 +13,19 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "ember build",
+    "build": "ember build --environment=production",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "start:local": "API_HOST=http://localhost:5050 ember serve",
     "start": "ember serve",
     "test": "node run-tests.js"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.6.0",
-    "@ember/optional-features": "^0.7.0",
+    "@ember/optional-features": "^1.3.0",
+    "@glimmer/component": "^1.0.0",
+    "@glimmer/tracking": "^1.0.0",
     "algoliasearch": "^3.32.1",
+    "babel-eslint": "^10.0.3",
     "bourbon": "5.1.0",
     "bourbon-neat": "^1.9.1",
     "broccoli-asset-rev": "^3.0.0",
@@ -32,57 +34,56 @@
     "ember-a11y-testing": "^0.5.4",
     "ember-anchor": "^1.0.3",
     "ember-auto-import": "1.2.21",
-    "ember-cli": "~3.12.1",
+    "ember-cli": "~3.16.1",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-autoprefixer": "^1.0.0",
-    "ember-cli-babel": "^7.7.3",
+    "ember-cli-babel": "^7.17.2",
     "ember-cli-bourbon": "^2.0.1",
     "ember-cli-browserstack": "^1.0.1",
     "ember-cli-clipboard": "^0.8.1",
     "ember-cli-content-security-policy": "^0.6.1",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.1",
     "ember-cli-deploy-build": "^1.1.0",
     "ember-cli-deploy-gzip": "^1.0.0",
     "ember-cli-deprecation-workflow": "^1.0.1",
     "ember-cli-document-title-northm": "^1.0.3",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-fastboot": "^2.0.0",
-    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^1.8.2",
+    "ember-cli-htmlbars": "^4.2.2",
+    "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-meta-tags": "^5.1.0",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-shims": "^1.2.0",
-    "ember-cli-template-lint": "^1.0.0-beta.2",
-    "ember-cli-uglify": "^2.1.0",
+    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-uglify": "^3.0.0",
     "ember-composable-helpers": "^3.1.1",
     "ember-concurrency": "^1.1.6",
-    "ember-data": "~3.12.0",
+    "ember-data": "~3.16.0",
     "ember-data-fastboot": "^0.1.2",
     "ember-exam": "^1.0.0",
-    "ember-export-application-global": "^2.0.0",
+    "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^7.0.1",
     "ember-inflector": "^3.0.0",
-    "ember-load-initializers": "^2.0.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^0.14.0",
     "ember-percy": "^1.5.0",
     "ember-power-select": "^2.3.5",
-    "ember-qunit": "^4.4.1",
-    "ember-resolver": "^5.0.1",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^7.0.0",
     "ember-rfc176-data": "^0.3.5",
     "ember-route-action-helper": "^2.0.5",
     "ember-sinon": "^4.1.1",
-    "ember-source": "~3.12.0",
+    "ember-source": "~3.16.0",
     "ember-styleguide": "^2.3.1",
     "ember-svg-jar": "^1.2.2",
     "ember-test-selectors": "^2.0.0",
     "ember-tether": "1.0.0",
     "ember-truth-helpers": "^2.1.0",
     "ember-web-app": "^2.0.0",
-    "eslint-plugin-ember": "^6.2.0",
-    "eslint-plugin-node": "^9.0.1",
+    "eslint-plugin-ember": "^7.7.2",
+    "eslint-plugin-node": "^11.0.0",
     "express-sslify": "^1.2.0",
     "fastboot-app-server": "^2.0.0",
     "loader.js": "^4.7.0",
@@ -94,7 +95,7 @@
     "lodash.values": "^4.3.0",
     "minimist": "^1.2.0",
     "normalize.css": "^8.0.1",
-    "qunit-dom": "^0.8.4",
+    "qunit-dom": "^1.0.0",
     "sanitize-html": "^1.19.3",
     "sass": "^1.25.0",
     "semver-compare": "^1.0.0",
@@ -105,9 +106,12 @@
     "browserslist": "2.11.3"
   },
   "engines": {
-    "node": "10.* || 12.*",
+    "node": "10.* || >= 12",
     "npm": "5"
   },
+  "ember": {
+    "edition": "octane"
+  },
   "cacheDirectories": [
     "node_modules"
   ],
@@ -118,7 +122,7 @@
     "abortcontroller-polyfill/dist/cjs-ponyfill"
   ],
   "volta": {
-    "node": "11.15.0",
+    "node": "12.16.1",
     "yarn": "1.22.4"
   }
 }

tests/acceptance/analytics-page-tracking-test.js

@@ -18,7 +18,7 @@ module('Acceptance | analytics page tracking', function(hooks) {
     const applicationRouter = this.owner.lookup('router:main');
     const metricsService = this.owner.lookup('service:metrics');
 
-    const routerTrackPageSpy = sinon.spy(applicationRouter, '_trackPage');
+    const routerTrackPageSpy = sinon.spy(applicationRouter, '__trackPage');
     const serviceTrackPageSpy = sinon.spy(metricsService, 'trackPage');
 
     await visit(pages[0]);
@@ -29,7 +29,7 @@ module('Acceptance | analytics page tracking', function(hooks) {
 
     assert.ok(
       routerTrackPageSpy.calledThrice,
-      `_trackPage() was not called 3 times it was called ${routerTrackPageSpy.callCount} times`
+      `__trackPage() was not called 3 times it was called ${routerTrackPageSpy.callCount} times`
     );
     assert.ok(
       serviceTrackPageSpy.calledThrice,