Skip to content

Commit becbdd3

Browse files
committed
Support Owner Proxy imports for Ember 4.8 preview types
1 parent 1f92d29 commit becbdd3

3 files changed

Lines changed: 40 additions & 214 deletions

File tree

addon/addon-test-support/@ember/test-helpers/-internal/-owner-mixin-imports.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ import type CPM_DTS from '@ember/engine/-private/container-proxy-mixin.d.ts';
4444
// @ts-ignore
4545
import type RPM_DTS from '@ember/engine/-private/registry-proxy-mixin.d.ts';
4646

47-
// Imports from the preview types
47+
// Imports from the preview types on 4.8
48+
// @ts-ignore
49+
import type CPM_4_8 from '@ember/engine/-private/container-proxy-mixin';
50+
// @ts-ignore
51+
import type RPM_4_8 from '@ember/engine/-private/registry-proxy-mixin';
52+
53+
// Imports from the preview types on 4.12
4854
// @ts-ignore
4955
import type CPM_4_12 from '@ember/-internals/runtime/lib/mixins/container_proxy';
5056
// @ts-ignore
@@ -62,7 +68,11 @@ import type { RegistryProxyMixin as RPM_stable } from '@ember/-internals/runtime
6268
// that it resolves regardless.
6369
import Ember from 'ember';
6470
export const ContainerProxyMixin = (Ember as any)._ContainerProxyMixin;
65-
export type ContainerProxyMixin = NonNever<[CPM_DTS, CPM_4_12, CPM_stable]>;
71+
export type ContainerProxyMixin = NonNever<
72+
[CPM_DTS, CPM_4_8, CPM_4_12, CPM_stable]
73+
>;
6674

6775
export const RegistryProxyMixin = (Ember as any)._RegistryProxyMixin;
68-
export type RegistryProxyMixin = NonNever<[RPM_DTS, RPM_4_12, RPM_stable]>;
76+
export type RegistryProxyMixin = NonNever<
77+
[RPM_DTS, RPM_4_8, RPM_4_12, RPM_stable]
78+
>;

addon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"ember-load-initializers": "^2.1.2",
8484
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
8585
"ember-resolver": "^9.0.1",
86-
"ember-source": "^5.1.0",
86+
"ember-source": "~4.8",
8787
"ember-source-channel-url": "^3.0.0",
8888
"ember-try": "^2.0.0",
8989
"eslint": "^7.32.0",

0 commit comments

Comments
 (0)