Skip to content

Commit c07560c

Browse files
Merge pull request #415 from ZacharyMohler/inject-from-service-deprecated
import service instead of inject from '@ember/service'
2 parents b59dc16 + f39c97c commit c07560c

10 files changed

Lines changed: 30 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { run } from '@ember/runloop';
22
import Helper from '@ember/component/helper';
33
import { observer } from '@ember/object';
4-
import { inject as service } from '@ember/service';
4+
import * as emberService from '@ember/service';
5+
6+
const service = emberService.service ?? emberService.inject;
57

68
// eslint-disable-next-line ember/no-classic-classes
79
export default Helper.extend({

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { action, set } from '@ember/object';
22
import { dependentKeyCompat } from '@ember/object/compat';
33
import { tracked } from '@glimmer/tracking';
4-
import { inject as service } from '@ember/service';
54
import Controller from '@ember/controller';
5+
import * as emberService from '@ember/service';
6+
7+
const service = emberService.service ?? emberService.inject;
68

79
export default class Index extends Controller {
810
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
2+
import * as emberService from '@ember/service';
3+
4+
const service = emberService.service ?? emberService.inject;
35

46
export default class Application extends Route {
57
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
32
import { set } from '@ember/object';
43
import { run } from '@ember/runloop';
4+
import * as emberService from '@ember/service';
5+
6+
const service = emberService.service ?? emberService.inject;
57

68
export default class Index extends Route {
79
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { action, set } from '@ember/object';
22
import { dependentKeyCompat } from '@ember/object/compat';
33
import { tracked } from '@glimmer/tracking';
4-
import { inject as service } from '@ember/service';
54
import Controller from '@ember/controller';
5+
import * as emberService from '@ember/service';
6+
7+
const service = emberService.service ?? emberService.inject;
68

79
export default class Index extends Controller {
810
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
2+
import * as emberService from '@ember/service';
3+
4+
const service = emberService.service ?? emberService.inject;
35

46
export default class Application extends Route {
57
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
32
import { set } from '@ember/object';
43
import { run } from '@ember/runloop';
4+
import * as emberService from '@ember/service';
5+
6+
const service = emberService.service ?? emberService.inject;
57

68
export default class Index extends Route {
79
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { action, set } from '@ember/object';
22
import { dependentKeyCompat } from '@ember/object/compat';
33
import { tracked } from '@glimmer/tracking';
4-
import { inject as service } from '@ember/service';
54
import Controller from '@ember/controller';
5+
import * as emberService from '@ember/service';
6+
7+
const service = emberService.service ?? emberService.inject;
68

79
export default class Index extends Controller {
810
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
2+
import * as emberService from '@ember/service';
3+
4+
const service = emberService.service ?? emberService.inject;
35

46
export default class Application extends Route {
57
@service moment;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
32
import { set } from '@ember/object';
43
import { run } from '@ember/runloop';
4+
import * as emberService from '@ember/service';
5+
6+
const service = emberService.service ?? emberService.inject;
57

68
export default class Index extends Route {
79
@service moment;

0 commit comments

Comments
 (0)