From d263106fbf671bab8112e92acb496adbff61e6e4 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sat, 8 Aug 2020 18:26:00 -0400 Subject: [PATCH] Revert "Ensure app/foo/index.js can be looked up with foo:main" This reverts commit 9fae5ba1c5df7ce14fdfb6afc57ac8e2481b647b as it has reported that it breaks some normal lookup patterns. I'd still like to bring back this change, but we'll need to investigate the reported issues and figure out how to mitigate. --- addon/resolvers/classic/index.js | 2 +- tests/unit/resolvers/classic/basic-test.js | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/addon/resolvers/classic/index.js b/addon/resolvers/classic/index.js index 610e560d..7643470b 100644 --- a/addon/resolvers/classic/index.js +++ b/addon/resolvers/classic/index.js @@ -19,7 +19,7 @@ export class ModuleRegistry { return Object.keys(this._entries); } has(moduleName) { - return require.has(moduleName); + return moduleName in this._entries; } get(moduleName) { return require(moduleName); diff --git a/tests/unit/resolvers/classic/basic-test.js b/tests/unit/resolvers/classic/basic-test.js index bfb8c9fb..2428ff7b 100644 --- a/tests/unit/resolvers/classic/basic-test.js +++ b/tests/unit/resolvers/classic/basic-test.js @@ -386,17 +386,6 @@ test("store:main is looked up as prefix/store", function(assert) { resolver.resolve('store:main'); }); -test("store:main is looked up as prefix/store/index.js", function(assert) { - assert.expect(1); - - define('appkit/store/index', [], function(){ - assert.ok(true, 'store:main was looked up'); - return 'whatever'; - }); - - resolver.resolve('store:main'); -}); - test("store:posts as prefix/stores/post", function(assert) { assert.expect(1);