Skip to content

Commit 2f144d5

Browse files
authored
Merge pull request #94 from Turbo87/pnp
DependencyChecker: Reuse `resolveSync()` method on `Project` class
2 parents 50a6f37 + df8e1fe commit 2f144d5

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

lib/dependency-checker.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const path = require('path');
4-
const resolve = require('resolve');
54
const fs = require('fs');
65
const findYarnWorkspaceRoot = require('find-yarn-workspace-root');
76
const readFile = fs.readFileSync;
@@ -89,7 +88,7 @@ class EmberCLIDependencyChecker {
8988

9089
lookupNodeModule(name, versionSpecified) {
9190
try {
92-
const nodePackage = resolve.sync(path.join(name, 'package.json'), { basedir: this.project.root });
91+
const nodePackage = this.project.resolveSync(path.join(name, 'package.json'));
9392
const version = this.lookupPackageVersion(nodePackage, versionSpecified);
9493
return { version: version, path: path.dirname(nodePackage) };
9594
} catch(err) {

tests/helpers/project-builder.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
'use strict';
22

3+
const resolve = require('resolve');
4+
35
let defaultProject, projectBuilder;
46

57
function simpleMerge(target, object) {
@@ -46,7 +48,11 @@ defaultProject = {
4648
root: 'tests/fixtures/project-npm-check',
4749
bowerDirectory: 'bower_components',
4850
dependencies: projectBuilder.buildDependencies(),
49-
bowerDependencies: projectBuilder.buildBowerDependencies()
51+
bowerDependencies: projectBuilder.buildBowerDependencies(),
52+
53+
resolveSync(path) {
54+
return resolve.sync(path, { basedir: this.root });
55+
}
5056
};
5157

5258
module.exports = projectBuilder;

0 commit comments

Comments
 (0)