Merge pull request #699 from ember-cli/enable-remaining-scenarios

enable embroider scenarios
ember-cli · Sep 9, 2021 · 5f4546e · 5f4546e
2 parents 83d6386 + 0452261
commit 5f4546e
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 87 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -79,8 +79,8 @@ jobs:
           - ember-canary
           - ember-classic
           - ember-default-with-jquery
-          # - embroider-safe
-          # - embroider-optimized
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v2

diff --git a/addon/resolvers/classic/index.js b/addon/resolvers/classic/index.js
@@ -21,8 +21,8 @@ export class ModuleRegistry {
   has(moduleName) {
     return moduleName in this._entries;
   }
-  get(moduleName) {
-    return require(moduleName);
+  get(...args) {
+    return require(...args);
   }
 }
 
@@ -471,7 +471,7 @@ const Resolver = EmberObject.extend({
   },
 
   _extractDefaultExport(normalizedModuleName) {
-    let module = require(normalizedModuleName, null, null, true /* force sync */);
+    let module = this._moduleRegistry.get(normalizedModuleName, null, null, true /* force sync */);
 
     if (module && module['default']) {
       module = module['default'];