fix: use require.resolve to find globby and ts-node

oclif · Apr 30, 2018 · 0a75d62 · 0a75d62
1 parent da83b32
commit 0a75d62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
             - v1-yarn-{{checksum ".circleci/config.yml"}}
       - run: .circleci/greenkeeper
       - run: yarn add -D nyc@11 @oclif/nyc-config@0
-      - run: cd test/fixtures/typescript && yarn
       - run: |
           $NYC yarn test
           $NYC report --reporter text-lcov > coverage.lcov

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -123,7 +123,8 @@ export class Plugin implements IPlugin {
     if (!this.commandsDir) return []
     let globby: typeof Globby
     try {
-      globby = require(`${this.root}/node_modules/globby`)
+      const globbyPath = require.resolve('globby', {paths: [this.root, __dirname]})
+      globby = require(globbyPath)
     } catch (err) {
       this.warn(err, 'not loading commands, globby not found')
       return []

diff --git a/src/ts_node.ts b/src/ts_node.ts
@@ -24,7 +24,8 @@ function registerTSNode(root: string) {
   const tsconfig = loadTSConfig(root)
   if (!tsconfig) return
   debug('registering ts-node at', root)
-  const tsNode: typeof TSNode = require(`${root}/node_modules/ts-node`)
+  const tsNodePath = require.resolve('ts-node', {paths: [root, __dirname]})
+  const tsNode: typeof TSNode = require(tsNodePath)
   tsconfigs[root] = tsconfig
   typeRoots.push(`${root}/node_modules/@types`)
   if (tsconfig.compilerOptions.rootDirs) {