Skip to content

Commit

Permalink
Merge pull request #699 from ember-cli/enable-remaining-scenarios
Browse files Browse the repository at this point in the history
enable embroider scenarios
  • Loading branch information
stefanpenner authored Sep 9, 2021
2 parents 83d6386 + 0452261 commit 5f4546e
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 87 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions addon/resolvers/classic/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export class ModuleRegistry {
has(moduleName) {
return moduleName in this._entries;
}
get(moduleName) {
return require(moduleName);
get(...args) {
return require(...args);
}
}

Expand Down Expand Up @@ -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'];
Expand Down
Loading

0 comments on commit 5f4546e

Please sign in to comment.