fix: use rootDirs not rootDir

oclif · Jan 25, 2018 · dcba41b · dcba41b
1 parent cc87e10
commit dcba41b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -47,7 +47,7 @@ export interface ICLIConfig extends IConfig {
 
 export interface TSConfig {
   compilerOptions: {
-    rootDir?: string
+    rootDirs?: string[]
     outDir?: string
   }
 }
@@ -172,8 +172,9 @@ export class Config {
     if (!orig) return
     orig = path.join(this.root, orig)
     if (!this.tsconfig) return orig
-    let {rootDir, outDir} = this.tsconfig.compilerOptions
-    if (!rootDir || !outDir) return orig
+    let {rootDirs, outDir} = this.tsconfig.compilerOptions
+    if (!rootDirs || !rootDirs.length || !outDir) return orig
+    let rootDir = rootDirs[0]
     try {
       // rewrite path from ./lib/foo to ./src/foo
       const lib = path.join(this.root, outDir) // ./lib

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -23,7 +23,7 @@ describe('PluginConfig', () => {
       configDir: path.join('/my/home/.config/heroku-cli-status'),
       errlog: path.join('/my/home/Library/Caches/heroku-cli-status/error.log'),
       dataDir: path.join('/my/home/.local/share/heroku-cli-status'),
-      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'src/commands'),
+      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'lib/commands'),
       home: path.join('/my/home'),
     })
   })
@@ -39,7 +39,7 @@ describe('PluginConfig', () => {
       configDir: path.join('/my/home/.config/heroku-cli-status'),
       errlog: path.join('/my/home/.cache/heroku-cli-status/error.log'),
       dataDir: path.join('/my/home/.local/share/heroku-cli-status'),
-      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'src/commands'),
+      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'lib/commands'),
       home: path.join('/my/home'),
     })
   })
@@ -55,7 +55,7 @@ describe('PluginConfig', () => {
       configDir: path.join('/my/home/localappdata/heroku-cli-status'),
       errlog: path.join('/my/home/localappdata/heroku-cli-status/error.log'),
       dataDir: path.join('/my/home/localappdata/heroku-cli-status'),
-      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'src/commands'),
+      commandsDir: path.join(pluginRoot('heroku-cli-status'), 'lib/commands'),
       home: path.join('/my/home'),
     })
   })