Merge branch 'master' into blueprint-style

Author: dfreeman

config/addon-docs.js

@@ -6,4 +6,7 @@ const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');
 module.exports = class extends AddonDocsConfig {
   // See https://ember-learn.github.io/ember-cli-addon-docs/docs/deploying
   // for details on configuration you can override here.
+  getRootURL() {
+    return '';
+  }
 };

package.json

@@ -76,15 +76,15 @@
     "@types/resolve": "0.0.8",
     "@types/semver": "6.2.0",
     "@types/tmp": "0.1.0",
-    "@typescript-eslint/eslint-plugin": "2.10.0",
-    "@typescript-eslint/parser": "2.10.0",
+    "@typescript-eslint/eslint-plugin": "2.11.0",
+    "@typescript-eslint/parser": "2.11.0",
     "broccoli-asset-rev": "3.0.0",
     "capture-console": "1.0.1",
     "co": "4.6.0",
     "commitlint-azure-pipelines-cli": "1.0.2",
     "conventional-changelog-cli": "2.0.28",
     "ember-cli": "3.14.0",
-    "ember-cli-addon-docs": "0.6.15",
+    "ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
     "ember-cli-addon-docs-esdoc": "0.2.3",
     "ember-cli-app-version": "3.2.0",
     "ember-cli-babel": "7.13.0",
@@ -95,20 +95,19 @@
     "ember-cli-deploy-git": "1.3.4",
     "ember-cli-deploy-git-ci": "1.0.1",
     "ember-cli-htmlbars": "4.0.9",
-    "ember-cli-htmlbars-inline-precompile": "3.0.1",
     "ember-cli-inject-live-reload": "2.0.2",
     "ember-cli-release": "0.2.9",
     "ember-cli-sri": "2.1.1",
     "ember-cli-typescript-blueprints": "3.0.0",
     "ember-cli-uglify": "3.0.0",
-    "ember-cli-update": "0.46.6",
+    "ember-cli-update": "0.47.1",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.1",
     "ember-maybe-import-regenerator": "0.1.6",
     "ember-qunit": "4.6.0",
     "ember-resolver": "6.0.0",
-    "ember-source": "3.14.3",
+    "ember-source": "3.15.0",
     "ember-try": "1.3.0",
     "eslint": "6.7.2",
     "eslint-plugin-ember": "7.7.1",