Merge branch 'master' into middleware-options

Author: jamescdavis

.eslintrc.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
@@ -11,7 +12,7 @@ module.exports = {
     browser: true,
   },
   rules: {
-    "prettier/prettier": "error"
+    'prettier/prettier': 'error',
   },
   settings: {
     node: {
@@ -43,14 +44,10 @@ module.exports = {
         node: true,
       },
       plugins: ['node'],
-      rules: Object.assign(
-        {},
-        require('eslint-plugin-node').configs.recommended.rules,
-        {
-          // add your custom rules and overrides for node files here
-          'ember/avoid-leaking-state-in-ember-objects': 'off',
-        }
-      ),
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+        'ember/avoid-leaking-state-in-ember-objects': 'off',
+      }),
     },
 
     // test files

blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts

@@ -2,15 +2,13 @@ export default config;
 
 /**
  * Type declarations for
- *    import config from './config/environment'
- *
- * For now these need to be managed by the developer
- * since different ember addons can materialize new entries.
+ *    import config from 'my-app/config/environment'
  */
 declare const config: {
-  environment: any;
+  environment: string;
   modulePrefix: string;
   podModulePrefix: string;
   locationType: string;
   rootURL: string;
+  APP: Record<string, unknown>;
 };

config/deploy.js

@@ -1,7 +1,7 @@
 /* eslint-env node */
 'use strict';
 
-module.exports = function(deployTarget) {
+module.exports = function (deployTarget) {
   let ENV = {
     build: {},
     // include other plugin configuration that applies to all deploy targets here

config/environment.js

@@ -1,5 +1,5 @@
 'use strict';
 
-module.exports = function(/* environment, appConfig */) {
+module.exports = function (/* environment, appConfig */) {
   return {};
 };

ember-cli-build.js

@@ -2,7 +2,7 @@
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
-module.exports = function(defaults) {
+module.exports = function (defaults) {
   let app = new EmberAddon(defaults, {
     'ember-cli-babel': {
       throwUnlessParallelizable: true,

package.json

@@ -41,102 +41,100 @@
   "dependencies": {
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
     "@babel/plugin-proposal-optional-chaining": "^7.6.0",
-    "@babel/plugin-transform-typescript": "~7.8.0",
+    "@babel/plugin-transform-typescript": "~7.10.4",
     "ansi-to-html": "^0.6.6",
     "broccoli-stew": "^3.0.0",
     "debug": "^4.0.0",
     "ember-cli-babel-plugin-helpers": "^1.0.0",
     "execa": "^3.0.0",
-    "fs-extra": "^8.0.0",
+    "fs-extra": "^9.0.1",
     "resolve": "^1.5.0",
     "rsvp": "^4.8.1",
-    "semver": "^6.3.0",
+    "semver": "^7.3.2",
     "stagehand": "^1.0.0",
-    "walk-sync": "^2.0.0"
+    "walk-sync": "^2.2.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "8.3.5",
-    "@commitlint/config-conventional": "8.3.4",
+    "@commitlint/cli": "9.0.1",
+    "@commitlint/config-conventional": "9.0.1",
     "@ember/optional-features": "1.3.0",
     "@typed-ember/renovate-config": "1.2.1",
     "@types/capture-console": "1.0.0",
-    "@types/chai": "4.2.10",
+    "@types/chai": "4.2.11",
     "@types/chai-as-promised": "7.1.2",
     "@types/console-ui": "2.2.3",
     "@types/core-object": "3.0.1",
     "@types/debug": "4.1.5",
-    "@types/ember": "3.1.1",
-    "@types/ember-qunit": "3.4.7",
+    "@types/ember": "3.16.0",
+    "@types/ember-qunit": "3.4.9",
     "@types/esprima": "4.0.2",
-    "@types/express": "4.17.3",
-    "@types/fs-extra": "8.1.0",
-    "@types/got": "8.3.5",
+    "@types/express": "4.17.6",
+    "@types/fs-extra": "9.0.1",
+    "@types/got": "9.6.11",
     "@types/mocha": "7.0.2",
-    "@types/node": "9.6.55",
-    "@types/qunit": "2.9.0",
-    "@types/resolve": "1.14.0",
-    "@types/semver": "6.2.1",
-    "@types/tmp": "0.1.0",
-    "@typescript-eslint/eslint-plugin": "2.22.0",
-    "@typescript-eslint/parser": "2.22.0",
+    "@types/node": "14.0.14",
+    "@types/qunit": "2.9.1",
+    "@types/resolve": "1.17.1",
+    "@types/semver": "7.3.1",
+    "@typescript-eslint/eslint-plugin": "3.5.0",
+    "@typescript-eslint/parser": "3.5.0",
     "broccoli-asset-rev": "3.0.0",
     "broccoli-node-api": "1.7.0",
-    "broccoli-plugin": "4.0.1",
+    "broccoli-plugin": "4.0.3",
     "capture-console": "1.0.1",
     "co": "4.6.0",
     "commitlint-azure-pipelines-cli": "1.0.3",
-    "conventional-changelog-cli": "2.0.31",
-    "ember-cli": "3.16.0",
+    "conventional-changelog-cli": "2.0.34",
+    "ember-cli": "3.19.0",
     "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.18.0",
+    "ember-cli-babel": "7.21.0",
     "ember-cli-blueprint-test-helpers": "0.19.2",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-deploy": "1.0.2",
     "ember-cli-deploy-build": "2.0.0",
     "ember-cli-deploy-git": "1.3.4",
     "ember-cli-deploy-git-ci": "1.0.1",
-    "ember-cli-htmlbars": "4.2.3",
+    "ember-cli-htmlbars": "5.2.0",
     "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.52.1",
+    "ember-cli-update": "0.54.6",
     "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": "7.0.0",
-    "ember-source": "3.17.0",
+    "ember-resolver": "8.0.0",
+    "ember-source": "3.19.0",
     "ember-try": "1.4.0",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "6.10.0",
-    "eslint-plugin-ember": "7.10.1",
-    "eslint-plugin-node": "11.0.0",
-    "eslint-plugin-prettier": "3.1.2",
+    "eslint": "7.3.1",
+    "eslint-config-prettier": "6.11.0",
+    "eslint-plugin-ember": "8.9.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-prettier": "3.1.4",
     "esprima": "4.0.1",
-    "fixturify": "1.3.0",
-    "got": "10.6.0",
-    "handlebars": "4.7.3",
-    "husky": "4.2.3",
+    "fixturify": "2.1.0",
+    "got": "11.3.0",
+    "handlebars": "4.7.6",
+    "husky": "4.2.5",
     "in-repo-a": "link:tests/dummy/lib/in-repo-a",
     "in-repo-b": "link:tests/dummy/lib/in-repo-b",
     "loader.js": "4.7.0",
-    "mocha": "7.1.0",
-    "prettier": "1.18.2",
-    "prettier-eslint": "9.0.1",
-    "qunit-dom": "1.1.0",
-    "testdouble": "3.13.0",
-    "tmp": "0.1.0",
-    "ts-node": "8.6.2",
+    "mocha": "8.0.1",
+    "prettier": "2.0.5",
+    "prettier-eslint": "11.0.0",
+    "qunit-dom": "1.2.0",
+    "rimraf": "3.0.2",
+    "testdouble": "3.16.0",
+    "ts-node": "8.10.2",
     "typescript": "3.7.5"
   },
   "resolutions": {
-    "@types/ember": "3.1.1",
-    "@types/ember__string": "3.0.6",
+    "@types/ember": "3.1.2",
+    "@types/ember__string": "3.0.8",
     "hawk": "7"
   },
   "engines": {
@@ -164,6 +162,6 @@
   },
   "volta": {
     "node": "10.19.0",
-    "yarn": "1.22.1"
+    "yarn": "1.22.4"
   }
 }

tests/dummy/app/router.js

@@ -6,19 +6,19 @@ const Router = AddonDocsRouter.extend({
   rootURL: config.rootURL,
 });
 
-Router.map(function() {
-  docsRoute(this, function() {
+Router.map(function () {
+  docsRoute(this, function () {
     this.route('upgrade-notes');
     this.route('configuration');
-    this.route('ts-guide', function() {
+    this.route('ts-guide', function () {
       this.route('with-addons');
       this.route('using-ts-effectively');
       this.route('current-limitations');
     });
-    this.route('troubleshooting', function() {
+    this.route('troubleshooting', function () {
       this.route('conflicting-types');
     });
-    this.route('type-defs', function() {
+    this.route('type-defs', function () {
       this.route('package-names');
     });
   });

tests/dummy/config/environment.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(environment) {
+module.exports = function (environment) {
   let ENV = {
     modulePrefix: 'dummy',
     environment,

tests/integration/components/js-importing-ts-test.js

@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Component | js importing ts', function(hooks) {
+module('Integration | Component | js importing ts', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
 

tests/integration/components/ts-component-test.js

@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Component | ts component', function(hooks) {
+module('Integration | Component | ts component', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });