[BUGFIX] Fix runtime/lint errors in StrictResolver tests and add missing pluralizations

packages/@ember/engine/lib/strict-resolver.ts

@@ -4,10 +4,12 @@ const KNOWN_EASY_PLURALS = new Set([
   'adapter',
   'component',
   'controller',
+  'helper',
   'model',
   'modifier',
   'route',
   'serializer',
+  'service',
   'template',
 ]);
 

packages/@ember/engine/tests/resolver/basic-test.js

@@ -1,9 +1,8 @@
 import { StrictResolver } from '@ember/engine/lib/strict-resolver';
 
-import * as QUnit from 'qunit';
-const { test } = QUnit;
+const { module, test } = QUnit;
 
-QUnit.module('StrictResolver', function (hooks) {
+module('StrictResolver', function (hooks) {
   let resolver;
   let modules;
 
@@ -12,7 +11,7 @@ QUnit.module('StrictResolver', function (hooks) {
     resolver = new StrictResolver(modules);
   });
 
-  QUnit.module('#resolve + #addModules', function () {
+  module('#resolve + #addModules', function () {
     test('resolves the standard ember types via default pluralization', function (assert) {
       // All of these go through the same `type + 's' -> dir` path. One table-
       // driven test keeps the coverage without nine copies of the same setup.
@@ -63,7 +62,7 @@ QUnit.module('StrictResolver', function (hooks) {
     });
   });
 
-  QUnit.module('#addModules + normalization', function () {
+  module('#addModules + normalization', function () {
     test('normalization', function (assert) {
       assert.strictEqual(resolver.normalize('controller:posts'), 'controller:posts');
       assert.strictEqual(resolver.normalize('controller:postsIndex'), 'controller:posts-index');

packages/@ember/engine/tests/resolver/registry_test.ts

@@ -1,12 +1,11 @@
-import * as QUnit from 'qunit';
 import Application from '@ember/application';
 import Service from '@ember/service';
 import { run } from '@ember/runloop';
 import type ApplicationInstance from '@ember/application/instance';
 
-const { test } = QUnit;
+const { module, test } = QUnit;
 
-QUnit.module('strict-resolver | Application with modules', function (hooks) {
+module('strict-resolver | Application with modules', function (hooks) {
   let app: Application | undefined;
   let instance: ApplicationInstance | undefined;
 

smoke-tests/scenarios/scenarios.ts

@@ -37,12 +37,16 @@ function strictResolver(project: Project) {
 
         /**
          * See: https://github.com/embroider-build/embroider/issues/2708
+         *
+         * @embroider/virtual/compat-modules emits keys like
+         * \`<modulePrefix>/<rest>\`. The strict resolver expects \`./<rest>\`.
          */
         function fixModulePrefix(modules) {
           let fixed = {};
+          let prefix = config.modulePrefix + '/';
 
-          for (let [key, module] of Object.entries(project)) {
-            let newName = key.replace(new RegExp(\`/\${config.modulePrefix}\//\`), './');
+          for (let [key, module] of Object.entries(modules)) {
+            let newName = key.startsWith(prefix) ? './' + key.slice(prefix.length) : key;
             fixed[newName] = module;
           }
 

tests/node-vitest/tree-shakability.test.js

@@ -58,6 +58,7 @@ it('[dev] has expected tree-shakable entrypoints', async () => {
       "ember-source/@ember/deprecated-features/index.js",
       "ember-source/@ember/destroyable/index.js",
       "ember-source/@ember/engine/lib/engine-parent.js",
+      "ember-source/@ember/engine/lib/strict-resolver.js",
       "ember-source/@ember/engine/parent.js",
       "ember-source/@ember/owner/index.js",
       "ember-source/@ember/reactive/index.js",
@@ -251,6 +252,7 @@ it('[prod] has expected tree-shakable entrypoints', async () => {
       "ember-source/@ember/deprecated-features/index.js",
       "ember-source/@ember/destroyable/index.js",
       "ember-source/@ember/engine/lib/engine-parent.js",
+      "ember-source/@ember/engine/lib/strict-resolver.js",
       "ember-source/@ember/engine/parent.js",
       "ember-source/@ember/owner/index.js",
       "ember-source/@ember/reactive/index.js",