Merge branch 'master' into ed-types

# Conflicts:
#	tests/dummy/app/controllers/features.ts
#	tests/dummy/app/routes/create-record.ts

Author: charlesfries

addon/instance-initializers/firebase-settings.ts

@@ -1,4 +1,4 @@
-import ApplicationInstance from '@ember/application/instance';
+import type ApplicationInstance from '@ember/application/instance';
 
 import type { FirebaseApp, FirebaseError, FirebaseOptions } from 'firebase/app';
 import type { Firestore, EmulatorMockTokenOptions } from 'firebase/firestore';

tests/dummy/app/app.js tests/dummy/app/app.ts

@@ -2,18 +2,18 @@ import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import Controller from '@ember/controller';
-import EmberArray from '@ember/array';
-import Store from '@ember-data/store';
+import type EmberArray from '@ember/array';
+import type Store from '@ember-data/store';
 
-import { CollectionReference, Firestore } from 'firebase/firestore';
+import type { CollectionReference, Firestore } from 'firebase/firestore';
 
 import {
   collection,
   query,
   where,
 } from 'ember-cloud-firestore-adapter/firebase/firestore';
-import UserModel from '../models/user';
-import PostModel from '../models/post';
+import type UserModel from '../models/user';
+import type PostModel from '../models/post';
 
 export default class FeaturesController extends Controller {
   @service

tests/dummy/app/controllers/features.ts

@@ -9,8 +9,8 @@ import type { Type } from '@warp-drive/core-types/symbols';
 import { Query } from 'firebase/firestore';
 
 import { limit, query } from 'ember-cloud-firestore-adapter/firebase/firestore';
-import PostModel from './post';
-import UserModel from './user';
+import type PostModel from './post';
+import type UserModel from './user';
 
 export default class GroupModel extends Model {
   @attr('string')

tests/dummy/app/models/group.ts

@@ -6,12 +6,12 @@
 import Model, { attr, belongsTo, type AsyncBelongsTo } from '@ember-data/model';
 import type { Type } from '@warp-drive/core-types/symbols';
 
-import { Firestore } from 'firebase/firestore';
+import type { Firestore } from 'firebase/firestore';
 
 import { collection } from 'ember-cloud-firestore-adapter/firebase/firestore';
-import TimestampTransform from 'ember-cloud-firestore-adapter/transforms/timestamp';
-import GroupModel from './group';
-import UserModel from './user';
+import type TimestampTransform from 'ember-cloud-firestore-adapter/transforms/timestamp';
+import type GroupModel from './group';
+import type UserModel from './user';
 
 export default class PostModel extends Model {
   @attr('string')

tests/dummy/app/models/post.ts

@@ -6,8 +6,8 @@
 import Model, { attr, hasMany, type AsyncHasMany } from '@ember-data/model';
 import type { Type } from '@warp-drive/core-types/symbols';
 
-import GroupModel from './group';
-import PostModel from './post';
+import type GroupModel from './group';
+import type PostModel from './post';
 
 export default class UserModel extends Model {
   @attr('string')

tests/dummy/app/models/user.ts

@@ -1,10 +1,10 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
-import PostModel from '../models/post';
-import GroupModel from '../models/group';
-import UserModel from '../models/user';
+import type PostModel from '../models/post';
+import type GroupModel from '../models/group';
+import type UserModel from '../models/user';
 
 export default class CreateRecordRoute extends Route {
   @service

tests/dummy/app/router.js tests/dummy/app/router.ts

@@ -1,6 +1,6 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
 import UserModel from '../models/user';
 

tests/dummy/app/routes/create-record.ts

@@ -1,8 +1,8 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
-import GroupModel from '../models/group';
+import type GroupModel from '../models/group';
 
 export default class FindAllRoute extends Route {
   @service

tests/dummy/app/routes/delete-record.ts

@@ -1,8 +1,8 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
-import GroupModel from '../models/group';
+import type GroupModel from '../models/group';
 
 export default class FindRecordRoute extends Route {
   @service

tests/dummy/app/routes/find-all.ts

@@ -1,17 +1,17 @@
 import { service } from '@ember/service';
 import type { Collection } from '@ember-data/store/-private/record-arrays/identifier-array';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
-import { CollectionReference } from 'firebase/firestore';
+import type { CollectionReference } from 'firebase/firestore';
 
 import {
   limit,
   query,
   orderBy,
 } from 'ember-cloud-firestore-adapter/firebase/firestore';
 
-import GroupModel from '../models/group';
+import type GroupModel from '../models/group';
 
 export default class QueryRoute extends Route {
   @service

tests/dummy/app/routes/find-record.ts

@@ -1,8 +1,8 @@
 import { service } from '@ember/service';
 import Route from '@ember/routing/route';
-import Store from '@ember-data/store';
+import type Store from '@ember-data/store';
 
-import PostModel from '../models/post';
+import type PostModel from '../models/post';
 
 export default class UpdateRecordRoute extends Route {
   @service

tests/dummy/app/routes/query.ts

@@ -1,4 +1,4 @@
-import { Firestore } from 'firebase/firestore';
+import type { Firestore } from 'firebase/firestore';
 
 import {
   doc,