chore: cleanup deprecations (#9779)

Author: runspired

guides/requests/examples/1-auth.md

@@ -76,7 +76,7 @@ Lets imagine we are using [Ember Simple Auth](https://github.com/simplabs/ember-
 **app/services/auth-handler.js**
 
 ```ts
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import type { NextFn, RequestContext } from '@ember-data/request';
 
 export default class AuthHandler {

pnpm-lock.yaml

@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/application';
-import Service, { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 import type { TestContext } from '@ember/test-helpers';
 
 import Resolver from 'ember-resolver';
@@ -8,6 +8,9 @@ import RequestManager from '@ember-data/request';
 import { module, test } from '@warp-drive/diagnostic';
 import { setupTest } from '@warp-drive/diagnostic/ember';
 
+const Service = s.default;
+const service = s.service ?? s.inject;
+
 module('RequestManager | Ember Service Setup', function (hooks) {
   setupTest(hooks, { resolver: new Resolver() });
 

tests/ember-data__request/tests/integration/service-test.ts

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 
 // @ts-expect-error untyped
 import { buildTree } from 'ember-simple-tree/utils/tree';
@@ -10,6 +10,8 @@ import { setBuildURLConfig } from '@ember-data/request-utils';
 import type Person from '../models/person';
 import type Store from '../services/store';
 
+const service = s.service ?? s.inject;
+
 export default class IndexRoute extends Route {
   @service declare store: Store;
   @service declare fastboot: {

tests/fastboot/app/routes/index.ts

@@ -1,5 +1,7 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
+
+const service = s.service ?? s.inject;
 
 export default class PersonNewRoute extends Route {
   @service store;

tests/fastboot/app/routes/person/new.js

@@ -1,10 +1,11 @@
 import Route from '@ember/routing/route';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
 
 import type Store from '@ember-data/store';
 
+const service = s.service ?? s.inject;
 export default class ApplicationRoute extends Route {
-  @inject declare store: Store;
+  @service declare store: Store;
 
   override model() {
     // adding a model to the store to enable manually testing the debug-adapter

tests/main/app/route.ts

@@ -1,10 +1,11 @@
 import Route from '@ember/routing/route';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
 
 import type Store from '@ember-data/store';
 
+const service = s.service ?? s.inject;
 export default class ApplicationRoute extends Route {
-  @inject declare store: Store;
+  @service declare store: Store;
 
   override model() {
     // adding a model to the store to enable manually testing the debug-adapter

tests/main/app/routes/application.ts

@@ -61,6 +61,9 @@ module.exports = async function (defaults) {
 
   setConfig(app, __dirname, {
     compatWith: isEnabled(process.env.EMBER_DATA_FULL_COMPAT) ? '99.0' : null,
+    deprecations: {
+      DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
+    },
     debug: {
       // LOG_GRAPH: true,
       // LOG_IDENTIFIERS: true,

tests/main/ember-cli-build.js

@@ -55,11 +55,11 @@
     "@glint/environment-ember-template-imports": "1.5.2",
     "@glint/template": "1.5.2",
     "@types/qunit": "2.19.10",
-    "@warp-drive/core-types": "workspace:*",
-    "@warp-drive/schema-record": "workspace:*",
     "@warp-drive/build-config": "workspace:*",
+    "@warp-drive/core-types": "workspace:*",
     "@warp-drive/holodeck": "workspace:*",
     "@warp-drive/internal-config": "workspace:*",
+    "@warp-drive/schema-record": "workspace:*",
     "broccoli-concat": "^4.2.5",
     "broccoli-merge-trees": "^4.2.0",
     "broccoli-stew": "^3.0.0",
@@ -82,12 +82,12 @@
     "ember-inflector": "5.0.2",
     "ember-load-initializers": "^3.0.1",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-template-imports": "4.3.0",
     "ember-qunit": "8.0.2",
     "ember-resolver": "^11.0.1",
-    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/be20bd3f8ea066050eb91862af5180e10ba37134.tgz",
+    "ember-source": "~5.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-strict-resolver": "^1.3.0",
+    "ember-template-imports": "4.3.0",
     "ember-try": "^3.0.0",
     "loader.js": "^4.7.0",
     "pretender": "^3.4.7",

tests/main/package.json

@@ -2,7 +2,7 @@ import ArrayProxy from '@ember/array/proxy';
 import { setComponentTemplate } from '@ember/component';
 import { action } from '@ember/object';
 import { sort } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 import { click, find, findAll, render, rerender, settled } from '@ember/test-helpers';
 import Component from '@glimmer/component';
 
@@ -18,6 +18,8 @@ import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { LEGACY_SUPPORT } from '@ember-data/model/-private';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 
+const service = s.service ?? s.inject;
+
 class Person extends Model {
   @attr()
   name;

tests/main/tests/acceptance/relationships/has-many-test.js

@@ -1,6 +1,6 @@
 import { setComponentTemplate } from '@ember/component';
 import { action } from '@ember/object';
-import { inject } from '@ember/service';
+import * as s from '@ember/service';
 import { click, findAll, render } from '@ember/test-helpers';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
@@ -12,6 +12,8 @@ import { setupRenderingTest } from 'ember-qunit';
 
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
+const service = s.service ?? s.inject;
+
 class Tag {
   @tracked rev = 0;
 }
@@ -54,7 +56,7 @@ module('tracking state flags on a record', function (hooks) {
     }
     let childId = 1;
     class ChildrenList extends Component {
-      @inject store;
+      @service store;
       @tracked newChild = null;
 
       // an intentionally complicated way of resolving the async proxy

tests/main/tests/acceptance/relationships/tracking-record-state-test.js

@@ -1,5 +1,5 @@
 import { setComponentTemplate } from '@ember/component';
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 import { render, settled } from '@ember/test-helpers';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
@@ -12,6 +12,8 @@ import { setupRenderingTest } from 'ember-qunit';
 import Model, { attr } from '@ember-data/model';
 import { cached, memoTransact, transact, untracked } from '@ember-data/tracking';
 
+const service = s.service ?? s.inject;
+
 module('acceptance/tracking-transactions', function (hooks) {
   setupRenderingTest(hooks);
 

tests/main/tests/acceptance/tracking-create-record-test.js

@@ -1,6 +1,6 @@
 // ensure DS namespace is set
 import Controller from '@ember/controller';
-import Service, { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 
 import { module, test } from 'qunit';
 
@@ -9,6 +9,9 @@ import { setupTest } from 'ember-qunit';
 
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 
+const Service = s.default;
+const service = s.service ?? s.inject;
+
 module('integration/application - Injecting a Custom Store', function (hooks) {
   setupTest(hooks);
 

tests/main/tests/integration/application-test.js

@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 
 import { module, test } from 'qunit';
 
@@ -30,6 +30,8 @@ import type {
 import type { ExistingResourceObject, ResourceIdentifierObject } from '@warp-drive/core-types/spec/json-api-raw';
 import type { Type } from '@warp-drive/core-types/symbols';
 
+const service = s.service ?? s.inject;
+
 type FakeRecord = { [key: string]: unknown; destroy: () => void };
 type UserRecord = {
   id: string;

tests/main/tests/integration/cache-handler/store-package-setup-test.ts

@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import * as s from '@ember/service';
 
 import { module, test } from 'qunit';
 
@@ -7,6 +7,8 @@ import { setupTest } from 'ember-qunit';
 
 import RequestManager from '@ember-data/request';
 
+const service = s.service ?? s.inject;
+
 module('Integration | Store Extension', function (hooks) {
   setupTest(hooks);
 

tests/main/tests/integration/store-extension-test.ts

@@ -1,12 +1,15 @@
 import { computed } from '@ember/object';
-import Service, { inject } from '@ember/service';
+import * as s from '@ember/service';
 
 import { module, test } from 'qunit';
 
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr } from '@ember-data/model';
 
+const Service = s.default;
+const service = s.service ?? s.inject;
+
 function startsWith(str, substr) {
   if (typeof str.startsWith === 'function') {
     return str.startsWith(substr);
@@ -26,7 +29,7 @@ module('@ember-data/model klass.modelName', function (hooks) {
       @attr() name;
     }
     class AnimalHelper extends Service {
-      @inject store;
+      @service store;
 
       @computed('animal.constructor.modelName')
       get animalModelName() {

tests/main/tests/integration/store/model-name-test.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/add-children-then-materialize.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/add-children-to-materialized.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/add-children.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 import { deleteRecord } from '@ember-data/json-api/request';
 

tests/performance/app/routes/destroy.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/relationship-materialization-complex.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 import { query } from '@ember-data/json-api/request';
 

tests/performance/app/routes/relationship-materialization-simple.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/unload-all.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),

tests/performance/app/routes/unload.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * Measures the performance characteristics of pushing a large payload

tests/performance/app/routes/unused-relationships.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable no-undef */
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 const DEBUG = false;
 

tests/performance/app/routes/update-with-same-state-m2m.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default Route.extend({
   store: service(),