Skip to content

Use the parent registry for determining JS extensions #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobbieTheWagner merged 1 commit into from
Apr 4, 2018
Merged

Use the parent registry for determining JS extensions #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ module.exports = {

// Ember Methods

included: function() {
included: function(appOrAddon) {
this._super.included.apply(this, arguments);

this.fileLookup = {};
this.parentRegistry = appOrAddon.registry;

if (!this._registeredWithBabel && this._isCoverageEnabled()) {
let checker = new VersionChecker(this.parent).for('ember-cli-babel', 'npm');
Expand Down Expand Up @@ -201,7 +202,7 @@ module.exports = {
_getIncludesForDir: function(dir, prefix) {
if (fs.existsSync(dir)) {
let dirname = path.relative(this.project.root, dir);
let globs = this.registry.extensionsForType('js').map((extension) => `**/*.${extension}`);
let globs = this.parentRegistry.extensionsForType('js').map((extension) => `**/*.${extension}`);

return walkSync(dir, { directories: false, globs }).map(file => {
let module = prefix + '/' + file.replace(EXT_RE, '.js');
Expand Down
4 changes: 2 additions & 2 deletions test/unit/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ describe('index.js', function() {
beforeEach(function() {
sandbox = sinon.sandbox.create();

Index.parent = Index.project = Index.app = Index.IstanbulPlugin = Index.registry = null;
Index.parent = Index.project = Index.app = Index.IstanbulPlugin = Index.parentRegistry = null;
sandbox.stub(Index, 'fileLookup').value({});
sandbox.stub(Index, 'registry').value({
sandbox.stub(Index, 'parentRegistry').value({
extensionsForType: function() {
return ['js'];
}
Expand Down