fix: use ts-node and globby from root of plugin

oclif · Apr 30, 2018 · e86e23a · e86e23a
1 parent 82d2db9
commit e86e23a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -123,9 +123,9 @@ export class Plugin implements IPlugin {
     if (!this.commandsDir) return []
     let globby: typeof Globby
     try {
-      globby = require('globby')
-    } catch {
-      this._debug('not loading commands, globby not found')
+      globby = require(`${this.root}/node_modules/globby`)
+    } catch (err) {
+      this.warn(err, 'not loading commands, globby not found')
       return []
     }
     this._debug(`loading IDs from ${this.commandsDir}`)

diff --git a/src/ts_node.ts b/src/ts_node.ts
@@ -24,9 +24,9 @@ function registerTSNode(root: string) {
   const tsconfig = loadTSConfig(root)
   if (!tsconfig) return
   debug('registering ts-node at', root)
-  const tsNode: typeof TSNode = require('ts-node')
+  const tsNode: typeof TSNode = require(`${root}/node_modules/ts-node`)
   tsconfigs[root] = tsconfig
-  typeRoots.push(`${root}/../node_modules/@types`)
+  typeRoots.push(`${root}/node_modules/@types`)
   if (tsconfig.compilerOptions.rootDirs) {
     rootDirs.push(...tsconfig.compilerOptions.rootDirs.map(r => path.join(root, r)))
   } else {