Merge pull request #1272 from gitKrystan/preview-types

Use ember preview types

Author: chriskrycho

addon-test-support/@ember/test-helpers/-internal/build-registry.ts

@@ -1,4 +1,4 @@
-import type Resolver from 'ember-resolver';
+import type { Resolver } from '@ember/owner';
 import ApplicationInstance from '@ember/application/instance';
 import Application from '@ember/application';
 import EmberObject from '@ember/object';
@@ -58,9 +58,11 @@ const Owner = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin, {
    * @see {@link https://github.com/emberjs/ember.js/blob/v4.5.0-alpha.5/packages/%40ember/engine/instance.ts#L152-L167}
    */
   unregister(fullName: string) {
+    // @ts-expect-error
     this['__container__'].reset(fullName);
 
     // We overwrote this method from RegistryProxyMixin.
+    // @ts-expect-error
     this['__registry__'].unregister(fullName);
   },
 });
@@ -73,6 +75,7 @@ const Owner = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin, {
 export default function (resolver: Resolver) {
   let fallbackRegistry, registry, container;
   let namespace = EmberObject.create({
+    // @ts-expect-error
     Resolver: {
       create() {
         return resolver;
@@ -102,11 +105,13 @@ export default function (resolver: Resolver) {
   registry.describe = fallbackRegistry.describe;
 
   let owner = Owner.create({
+    // @ts-expect-error
     __registry__: registry,
     __container__: null,
   });
 
   container = registry.container({ owner: owner });
+  // @ts-expect-error
   owner.__container__ = container;
 
   exposeRegistryMethodsWithoutDeprecations(container);

addon-test-support/@ember/test-helpers/build-owner.ts

@@ -1,5 +1,5 @@
 import Application from '@ember/application';
-import type Resolver from 'ember-resolver';
+import type { Resolver } from '@ember/owner';
 
 import { Promise } from './-utils';
 
@@ -55,7 +55,7 @@ export default function buildOwner(
     );
   }
 
-  let { owner } = legacyBuildRegistry(resolver) as { owner: Owner };
+  let { owner } = legacyBuildRegistry(resolver) as unknown as { owner: Owner };
 
   return Promise.resolve(owner);
 }

addon-test-support/@ember/test-helpers/resolver.ts

@@ -1,4 +1,4 @@
-import type Resolver from 'ember-resolver';
+import type { Resolver } from '@ember/owner';
 
 let __resolver__: Resolver | undefined;
 

addon-test-support/@ember/test-helpers/settled.ts

@@ -48,7 +48,7 @@ if (typeof jQuery !== 'undefined' && _internalPendingRequestsModule) {
   //
   // This can be removed once Ember 4.0.0 is released
   EmberApplicationInstance.reopen({
-    willDestroy(...args: any[]) {
+    willDestroy(this: EmberApplicationInstance, ...args: any[]) {
       jQuery(document).off(
         'ajaxSend',
         _internalPendingRequestsModule.incrementPendingRequests

addon-test-support/@ember/test-helpers/setup-context.ts

@@ -1,6 +1,6 @@
 import { _backburner, run } from '@ember/runloop';
 import { set, setProperties, get, getProperties } from '@ember/object';
-import type Resolver from 'ember-resolver';
+import type { Resolver } from '@ember/owner';
 import { setOwner } from '@ember/application';
 
 import buildOwner, { Owner } from './build-owner';

package.json

@@ -60,20 +60,7 @@
     "@glimmer/interfaces": "^0.84.1",
     "@glimmer/reference": "^0.84.1",
     "@tsconfig/ember": "^1.0.1",
-    "@types/ember": "~4.0.0",
-    "@types/ember-resolver": "^5.0.13",
-    "@types/ember-testing-helpers": "^0.0.4",
-    "@types/ember__application": "~4.0.5",
-    "@types/ember__component": "~4.0.8",
-    "@types/ember__debug": "~4.0.1",
-    "@types/ember__destroyable": "~4.0.0",
-    "@types/ember__engine": "~4.0.4",
-    "@types/ember__object": "~4.0.2",
-    "@types/ember__polyfills": "~4.0.0",
-    "@types/ember__routing": "~4.0.7",
-    "@types/ember__runloop": "~4.0.1",
-    "@types/ember__service": "~4.0.0",
-    "@types/ember__test": "~4.0.0",
+    "@types/jquery": "^3.5.14",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.29.0",
     "@typescript-eslint/parser": "^4.29.0",

tsconfig.json

@@ -9,5 +9,5 @@
       "*": ["./types/*"]
     }
   },
-  "include": ["./addon-test-support/**/*.ts", "tests/**/*.ts"]
+  "include": ["addon-test-support/**/*.ts", "tests/**/*.ts", "types/**/*.ts"]
 }

type-tests/api.ts

@@ -71,7 +71,7 @@ import {
 import { ComponentInstance } from '@glimmer/interfaces';
 import { Owner } from '@ember/test-helpers/build-owner';
 import { DebugInfo as BackburnerDebugInfo } from '@ember/runloop/-private/backburner';
-import EmberResolver from 'ember-resolver';
+import type { Resolver as EmberResolver } from '@ember/owner';
 import Application from '@ember/application';
 import { TemplateFactory } from 'ember-cli-htmlbars';
 

type-tests/tsconfig.json

@@ -13,5 +13,6 @@
         "types/*"
       ]
     }
-  }
+  },
+  "include": ["api.ts", "../types/**/*"]
 }

types/dummy/index.d.ts

@@ -0,0 +1,2 @@
+import 'ember-source/types';
+import 'ember-source/types/preview';