Skip to content

Commit 879a1d8

Browse files
Add backward compatibility with inject as service import
1 parent 8a5fcc8 commit 879a1d8

File tree

11 files changed

+24
-12
lines changed

11 files changed

+24
-12
lines changed

packages/ember-cli-fastboot/addon/locations/none.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/* eslint-disable ember/no-classic-classes, ember/no-get, ember/require-computed-property-dependencies, prettier/prettier */
22
import { computed, get } from '@ember/object';
33
import { bool, readOnly } from '@ember/object/computed';
4-
import { service } from '@ember/service';
4+
import * as serviceModule from '@ember/service';
5+
const service = serviceModule.service || serviceModule.inject;
56
import { getOwner } from '@ember/application'
67
import NoneLocation from '@ember/routing/none-location'
78

packages/ember-cli-fastboot/tests/dummy/app/routes/application.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable ember/no-classic-classes, ember/no-get, prettier/prettier */
22
import Route from '@ember/routing/route';
3-
import { inject } from '@ember/service';
3+
import * as serviceModule from '@ember/service';
4+
const inject = serviceModule.service || serviceModule.inject;
45
import { readOnly } from '@ember/object/computed';
56

67
export default Route.extend({

test-packages/test-scenarios/fastboot-config-location-test.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ appScenarios
1414
routes: {
1515
'redirect-on-transition-to.js': `
1616
import Route from '@ember/routing/route';
17-
import { service } from '@ember/service';
17+
import * as serviceModule from '@ember/service';
18+
const service = serviceModule.service || serviceModule.inject;
1819
1920
export default class MyRoute extends Route {
2021
@service

test-packages/test-scenarios/fastboot-express-middleware-test.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ appScenarios
2727
app: {
2828
routes: {
2929
'index.js': `import Route from '@ember/routing/route';
30-
import { service } from '@ember/service';
30+
import * as serviceModule from '@ember/service';
31+
const service = serviceModule.service || serviceModule.inject;
3132
3233
function isEmptyObject(obj) {
3334
return Object.keys(obj).length === 0 && obj.constructor.name === 'Object';
@@ -46,7 +47,8 @@ appScenarios
4647
}
4748
}`,
4849
'application.js': `import Route from '@ember/routing/route';
49-
import { service } from '@ember/service';
50+
import * as serviceModule from '@ember/service';
51+
const service = serviceModule.service || serviceModule.inject;
5052
5153
export default class ApplicationRoute extends Route {
5254
@service fastboot;

test-packages/test-scenarios/fastboot-shoebox-test.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ appScenarios
1313
app: {
1414
routes: {
1515
'application.js': `import Route from '@ember/routing/route';
16-
import { service } from '@ember/service'
16+
import * as serviceModule from '@ember/service';
17+
const service = serviceModule.service || serviceModule.inject;
1718
1819
export default class ApplicationRoute extends Route {
1920
@service fastboot;

test-packages/test-scenarios/fixtures/basic-app/app/components/async-content.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { defer } from 'rsvp';
22
import { later } from '@ember/runloop';
33
import Component from '@glimmer/component';
44
import { tracked } from '@glimmer/tracking';
5-
import { service } from '@ember/service';
5+
import * as serviceModule from '@ember/service';
6+
const service = serviceModule.service || serviceModule.inject;
67

78
export default class AsyncContenComponent extends Component {
89
@service fastboot;

test-packages/test-scenarios/fixtures/basic-app/app/routes/application.js

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

45
export default class ApplicationRoute extends Route {
56
@service fastboot;

test-packages/test-scenarios/fixtures/basic-app/app/routes/echo-request-headers.js

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

45
export default class EchoRequestHeadersRoute extends Route {
56
@service fastboot;

test-packages/test-scenarios/fixtures/basic-app/app/routes/head-content.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { set } from '@ember/object';
22
import Route from '@ember/routing/route';
3-
import { service } from '@ember/service';
3+
import * as serviceModule from '@ember/service';
4+
const service = serviceModule.service || serviceModule.inject;
45

56
export default class HeadContentRoute extends Route {
67
@service headData;

test-packages/test-scenarios/fixtures/basic-app/app/routes/metadata.js

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

45
export default Route.extend({
56
fastboot: service(),

0 commit comments

Comments
 (0)