Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ember preview types #1272

Merged
merged 2 commits into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These types aren't public and there is a bunch of EmberObject and as any in this file, so I figured leaving @ts-expect-error was OK...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the best move, yep. We can flag it up for figuring out a non-private-API way of tackling in the future!

this['__container__'].reset(fullName);

// We overwrote this method from RegistryProxyMixin.
// @ts-expect-error
this['__registry__'].unregister(fullName);
},
});
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions addon-test-support/@ember/test-helpers/build-owner.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion addon-test-support/@ember/test-helpers/resolver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type Resolver from 'ember-resolver';
import type { Resolver } from '@ember/owner';

let __resolver__: Resolver | undefined;

Expand Down
2 changes: 1 addition & 1 deletion addon-test-support/@ember/test-helpers/settled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addon-test-support/@ember/test-helpers/setup-context.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
15 changes: 1 addition & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed because @types/ember-testing-helpers was removed.

"@types/rsvp": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.29.0",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"*": ["./types/*"]
}
},
"include": ["./addon-test-support/**/*.ts", "tests/**/*.ts"]
"include": ["addon-test-support/**/*.ts", "tests/**/*.ts", "types/**/*.ts"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was necessary for the types to see types/dummy/index.d.ts

}
2 changes: 1 addition & 1 deletion type-tests/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
3 changes: 2 additions & 1 deletion type-tests/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
"types/*"
]
}
}
},
"include": ["api.ts", "../types/**/*"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was necessary for the types to see types/dummy/index.d.ts

}
2 changes: 2 additions & 0 deletions types/dummy/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import 'ember-source/types';
import 'ember-source/types/preview';
Loading