Skip to content

Commit 30b66f3

Browse files
authored
Merge pull request #20481 from emberjs/backport-proxy-mixin-type-locations
[BUGFIX LTS] Backport some stable type import locations
2 parents 1171312 + 5e94c92 commit 30b66f3

File tree

5 files changed

+28
-19
lines changed

5 files changed

+28
-19
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
declare module '@ember/-internals/runtime/lib/mixins/container_proxy' {
2+
import { ContainerProxy } from '@ember/-internals/owner';
3+
import Mixin from '@ember/object/mixin';
4+
5+
/**
6+
* Given a fullName return a factory manager.
7+
*/
8+
interface ContainerProxyMixin extends ContainerProxy {}
9+
const ContainerProxyMixin: Mixin;
10+
export default ContainerProxyMixin;
11+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
declare module '@ember/-internals/runtime/lib/mixins/registry_proxy' {
2+
import { RegistryProxy } from '@ember/-internals/owner';
3+
import Mixin from '@ember/object/mixin';
4+
5+
/**
6+
* RegistryProxyMixin is used to provide public access to specific
7+
* registry functionality.
8+
*/
9+
interface RegistryProxyMixin extends RegistryProxy {}
10+
const RegistryProxyMixin: Mixin;
11+
export default RegistryProxyMixin;
12+
}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
declare module '@ember/engine/-private/container-proxy-mixin' {
2-
import { ContainerProxy } from '@ember/-internals/owner';
3-
import Mixin from '@ember/object/mixin';
4-
5-
/**
6-
* Given a fullName return a factory manager.
7-
*/
8-
interface ContainerProxyMixin extends ContainerProxy {}
9-
const ContainerProxyMixin: Mixin;
10-
export default ContainerProxyMixin;
2+
export type { default } from '@ember/-internals/runtime/lib/mixins/container_proxy';
113
}
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
declare module '@ember/engine/-private/registry-proxy-mixin' {
2-
import { RegistryProxy } from '@ember/-internals/owner';
3-
import Mixin from '@ember/object/mixin';
4-
5-
/**
6-
* RegistryProxyMixin is used to provide public access to specific
7-
* registry functionality.
8-
*/
9-
interface RegistryProxyMixin extends RegistryProxy {}
10-
const RegistryProxyMixin: Mixin;
11-
export default RegistryProxyMixin;
2+
export type { default } from '@ember/-internals/runtime/lib/mixins/registry_proxy';
123
}

types/preview/index.d.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
import './ember';
3535
import './ember/-private/type-utils';
3636

37+
import './@ember/-internals/runtime/lib/mixins/container_proxy';
38+
import './@ember/-internals/runtime/lib/mixins/registry_proxy';
39+
3740
import './@ember/application';
3841
import './@ember/application/-private/event-dispatcher';
3942
import './@ember/application/-private/registry';

0 commit comments

Comments
 (0)