Merge pull request #418 from adopted-ember-addons/revert-415-inject-from-service-deprecated

Revert "import service instead of inject from '@ember/service'"

Author: mansona

ember-moment/src/helpers/-base.js

@@ -1,9 +1,7 @@
 import { run } from '@ember/runloop';
 import Helper from '@ember/component/helper';
 import { observer } from '@ember/object';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
+import { inject as service } from '@ember/service';
 
 // eslint-disable-next-line ember/no-classic-classes
 export default Helper.extend({

package.json

@@ -22,7 +22,7 @@
     "release-plan": "^0.9.0"
   },
   "volta": {
-    "node": "18.20.3",
+    "node": "24.14.1",
     "pnpm": "9.4.0"
   },
   "pnpm": {

test-app-3.x/app/controllers/index.js

@@ -1,10 +1,8 @@
 import { action, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
 
 export default class Index extends Controller {
   @service moment;

test-app-3.x/app/routes/application.js

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

test-app-3.x/app/routes/index.js

@@ -1,9 +1,7 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
 import { run } from '@ember/runloop';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
 
 export default class Index extends Route {
   @service moment;

test-app-4.x/app/controllers/index.js

@@ -1,10 +1,8 @@
 import { action, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
 
 export default class Index extends Controller {
   @service moment;

test-app-4.x/app/routes/application.js

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

test-app-4.x/app/routes/index.js

@@ -1,9 +1,7 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 import { set } from '@ember/object';
 import { run } from '@ember/runloop';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
 
 export default class Index extends Route {
   @service moment;

test-app-5.x/app/controllers/index.js

@@ -1,10 +1,8 @@
 import { action, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import * as emberService from '@ember/service';
-
-const service = emberService.service ?? emberService.inject;
 
 export default class Index extends Controller {
   @service moment;

test-app-5.x/app/routes/application.js

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