diff --git a/cli/src/lib/paths.js b/cli/src/lib/paths.js index 4f6be61a..59aa52e6 100644 --- a/cli/src/lib/paths.js +++ b/cli/src/lib/paths.js @@ -7,20 +7,20 @@ const shellSource = path.dirname( ) const shellAppDirname = 'src/D2App' -const findYarnLock = (base) => { - if (base === '/') { +const findYarnLock = (base, rootDirectory) => { + if (base === rootDirectory) { return null } - const yarnLock = path.join(base, './yarn.lock') if (fs.existsSync(yarnLock)) { return yarnLock } - return findYarnLock(path.dirname(base)) + return findYarnLock(path.dirname(base), rootDirectory) } module.exports = (cwd = process.cwd()) => { const base = path.resolve(cwd) + const rootDirectory = path.parse(cwd).root const paths = { babelConfig: path.join(__dirname, '../../config/babel.config.js'), configDefaultsApp: path.join( @@ -44,7 +44,7 @@ module.exports = (cwd = process.cwd()) => { base, package: path.join(base, './package.json'), - yarnLock: findYarnLock(base), + yarnLock: findYarnLock(base, rootDirectory), dotenv: path.join(base, './.env'), config: path.join(base, './d2.config.js'), readme: path.join(base, './README.md'),