Merge pull request #963 from ember-fastboot/import-service

Fix ember v6 importing-inject-from-ember-service deprecation

Author: mansona

.github/workflows/ci.yml

@@ -153,7 +153,7 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - id: set-matrix
         working-directory: test-packages/test-scenarios
-        run: echo "matrix=$(npm run --silent test:list -- --matrix 'npm run test -- --filter %s:')" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(npm run --silent test:list -- --matrix 'pnpm test --filter %s:')" >> $GITHUB_OUTPUT
 
   scenario-tester:
     needs: discover_matrix

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

@@ -1,7 +1,7 @@
 /* eslint-disable ember/no-classic-classes, ember/no-get, ember/require-computed-property-dependencies */
 import { computed, get } from '@ember/object';
 import { bool, readOnly } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import NoneLocation from '@ember/routing/none-location';
 

packages/ember-cli-fastboot/index.js

@@ -21,6 +21,8 @@ const p = require('ember-cli-preprocess-registry/preprocessors');
 const fastbootTransform = require('fastboot-transform');
 const existsSync = fs.existsSync;
 
+const ServiceImportReplacer = require('./lib/broccoli/service-import');
+
 let checker;
 function getVersionChecker(context) {
   if (!checker) {
@@ -150,6 +152,17 @@ module.exports = {
     return tree;
   },
 
+  treeForAddon(tree) {
+    if (this._getEmberVersion().lt('4.1.0')) {
+      return this._super.treeForAddon.call(
+        this,
+        new ServiceImportReplacer(tree),
+      );
+    }
+
+    return this._super.treeForAddon.call(this, tree);
+  },
+
   _processAddons(addons, fastbootTrees) {
     addons.forEach((addon) => {
       this._processAddon(addon, fastbootTrees);
@@ -382,13 +395,13 @@ module.exports = {
   },
 
   _getEmberCliVersion() {
-    const checker = getVersionChecker(this);
+    const checker = getVersionChecker(this.project);
 
     return checker.for('ember-cli', 'npm');
   },
 
   _getEmberVersion() {
-    const checker = getVersionChecker(this);
+    const checker = getVersionChecker(this.project);
     const emberVersionChecker = checker.for('ember-source', 'npm');
 
     if (emberVersionChecker.version) {

packages/ember-cli-fastboot/lib/broccoli/service-import.js

@@ -0,0 +1,17 @@
+const Filter = require('broccoli-persistent-filter');
+
+module.exports = class ServiceImportReplacer extends Filter {
+  constructor(inputNode, search, replace, options = {}) {
+    super(inputNode, {
+      annotation: options.annotation,
+    });
+    this.extensions = ['js'];
+    this.targetExtension = 'js';
+  }
+  processString(content) {
+    return content.replace(
+      `import { service } from '@ember/service';`,
+      `import { inject as service } from '@ember/service';`,
+    );
+  }
+};

packages/ember-cli-fastboot/package.json

@@ -28,14 +28,15 @@
     "test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\" --prefixColors auto",
     "test:mocha": "mocha",
     "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each"
+    "test-ember-compatibility": "ember try:each"
   },
   "dependencies": {
     "@babel/core": "^7.29.0",
     "broccoli-concat": "^4.2.5",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
+    "broccoli-persistent-filter": "^3.1.3",
     "broccoli-plugin": "^4.0.7",
     "chalk": "^4.1.2",
     "ember-cli-babel": "^8.3.1",

pnpm-lock.yaml

@@ -9,12 +9,14 @@ const { module: Qmodule, test } = qunit;
 
 appScenarios
   .map('fastboot-config-location', (project) => {
+    // this test app has the service import itself so we need the polyfill to do its work
+    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {
           'redirect-on-transition-to.js': `
           import Route from '@ember/routing/route';
-          import { inject as service } from '@ember/service';
+          import { service } from '@ember/service';
 
           export default class MyRoute extends Route {
             @service

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

@@ -23,11 +23,13 @@ Object.assign(qunit.assert, {
 
 appScenarios
   .map('fastboot-express-middleware', (project) => {
+    // this test app has the service import itself so we need the polyfill to do its work
+    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {
           'index.js': `import Route from '@ember/routing/route';
-          import { inject as service } from '@ember/service';
+          import { service } from '@ember/service';
 
           function isEmptyObject(obj) {
             return Object.keys(obj).length === 0 && obj.constructor.name === 'Object';
@@ -46,7 +48,7 @@ appScenarios
             }
           }`,
           'application.js': `import Route from '@ember/routing/route';
-          import { inject as service } from '@ember/service';
+          import { service } from '@ember/service';
 
           export default class ApplicationRoute extends Route {
             @service fastboot;

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

@@ -9,11 +9,13 @@ const { module: Qmodule, test } = qunit;
 
 appScenarios
   .map('fastboot-shoebox-test', (project) => {
+    // this test app has the service import itself so we need the polyfill to do its work
+    project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' });
     merge(project.files, {
       app: {
         routes: {
           'application.js': `import Route from '@ember/routing/route';
-          import { inject as service } from '@ember/service'
+          import { service } from '@ember/service'
 
           export default class ApplicationRoute extends Route {
             @service fastboot;

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

@@ -2,7 +2,7 @@ import { defer } from 'rsvp';
 import { later } from '@ember/runloop';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class AsyncContenComponent extends Component {
   @service fastboot;