File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change 1
1
'use strict' ;
2
2
3
3
const path = require ( 'path' ) ;
4
- const resolve = require ( 'resolve' ) ;
5
4
const fs = require ( 'fs' ) ;
6
5
const findYarnWorkspaceRoot = require ( 'find-yarn-workspace-root' ) ;
7
6
const readFile = fs . readFileSync ;
@@ -89,7 +88,7 @@ class EmberCLIDependencyChecker {
89
88
90
89
lookupNodeModule ( name , versionSpecified ) {
91
90
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' ) ) ;
93
92
const version = this . lookupPackageVersion ( nodePackage , versionSpecified ) ;
94
93
return { version : version , path : path . dirname ( nodePackage ) } ;
95
94
} catch ( err ) {
Original file line number Diff line number Diff line change 1
1
'use strict' ;
2
2
3
+ const resolve = require ( 'resolve' ) ;
4
+
3
5
let defaultProject , projectBuilder ;
4
6
5
7
function simpleMerge ( target , object ) {
@@ -46,7 +48,11 @@ defaultProject = {
46
48
root : 'tests/fixtures/project-npm-check' ,
47
49
bowerDirectory : 'bower_components' ,
48
50
dependencies : projectBuilder . buildDependencies ( ) ,
49
- bowerDependencies : projectBuilder . buildBowerDependencies ( )
51
+ bowerDependencies : projectBuilder . buildBowerDependencies ( ) ,
52
+
53
+ resolveSync ( path ) {
54
+ return resolve . sync ( path , { basedir : this . root } ) ;
55
+ }
50
56
} ;
51
57
52
58
module . exports = projectBuilder ;
You can’t perform that action at this time.
0 commit comments