Skip to content

Commit eaaa2be

Browse files
committed
chore: cleanup @ember/service deprecation from shipped library code
1 parent 6ba33e8 commit eaaa2be

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

packages/adapter/src/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ By default when using with Ember you only need to implement this hook if you wan
188188
*/
189189

190190
import EmberObject from '@ember/object';
191-
import { inject as service } from '@ember/service';
191+
import * as s from '@ember/service';
192192

193193
import type { AdapterPayload, MinimumAdapterInterface, SerializerOptions } from '@ember-data/legacy-compat';
194194
import type { Snapshot, SnapshotRecordArray } from '@ember-data/legacy-compat/-private';
@@ -197,6 +197,7 @@ import type { ModelSchema } from '@ember-data/store/types';
197197
import { DEBUG } from '@warp-drive/build-config/env';
198198
import { assert } from '@warp-drive/build-config/macros';
199199

200+
const service = s.service ?? s.inject;
200201
/**
201202
An adapter is an object that receives requests from a store and
202203
translates them into the appropriate action to take against your

packages/debug/src/data-adapter.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import type { NativeArray } from '@ember/array';
2727
import { A } from '@ember/array';
2828
import DataAdapter from '@ember/debug/data-adapter';
2929
import { addObserver, removeObserver } from '@ember/object/observers';
30-
import { inject as service } from '@ember/service';
30+
import * as s from '@ember/service';
3131

3232
import { getGlobalConfig, macroCondition } from '@embroider/macros';
3333

@@ -38,6 +38,7 @@ import { recordIdentifierFor } from '@ember-data/store';
3838
import type { ModelSchema } from '@ember-data/store/types';
3939
import { assert } from '@warp-drive/build-config/macros';
4040

41+
const service = s.service ?? s.inject;
4142
const StoreTypesMap = new WeakMap<Store, Map<string, boolean>>();
4243

4344
type RecordColor = 'black' | 'red' | 'blue' | 'green';

packages/serializer/src/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,14 @@
108108
*/
109109

110110
import EmberObject from '@ember/object';
111-
import { inject as service } from '@ember/service';
111+
import * as s from '@ember/service';
112112

113113
import type Store from '@ember-data/store';
114114
import type { ModelSchema } from '@ember-data/store/types';
115115
import type { EmptyResourceDocument, SingleResourceDocument } from '@warp-drive/core-types/spec/json-api-raw';
116116

117+
const service = s.service ?? s.inject;
118+
117119
/**
118120
> ⚠️ CAUTION you likely want the docs for [<Interface> Serializer](/ember-data/release/classes/%3CInterface%3E%20Serializer)
119121
> as extending this abstract class is unnecessary.

0 commit comments

Comments
 (0)