Add bundled flow

This is used as a third option for users that do not flow
installed globally or locally

Author: BrainMaestro

CHANGELOG.md

@@ -1,5 +1,10 @@
 ### Master
 
+### 0.7.0
+
+* Bundles `flow-bin` with the plugin to use in cases where it has not been
+  installed globally or locally. - [@BrainMaestro]() [#118](https://github.com/flowtype/flow-for-vscode/pull/118)
+
 ### 0.6.0
 
 * Adds the status indicator (spinner) to the statusbar which appears when flow is

lib/pkg/flow-base/lib/FlowHelpers.js

@@ -18,6 +18,7 @@ import {checkOutput} from '../../commons-node/process';
 import fsPromise from '../../commons-node/fsPromise';
 import LRU from 'lru-cache';
 import invariant from 'assert';
+import path from 'path';
 
 import {getLogger} from '../../nuclide-logging/lib/main';
 const logger = getLogger();
@@ -166,13 +167,17 @@ async function getPathToFlow(): Promise<string> {
     const config = global.vscode.workspace.getConfiguration('flow');
     const shouldUseNodeModule = config.get('useNPMPackagedFlow');
     const userPath = config.get('pathToFlow');
+    const nodeModuleFlowPath = nodeModuleFlowLocation(global.vscode.workspace.rootPath)
 
-    if (shouldUseNodeModule && await canFindFlow(nodeModuleFlowLocation())){
-      global.cachedPathToFlowBin = nodeModuleFlowLocation();
+    if (shouldUseNodeModule && await canFindFlow(nodeModuleFlowPath)){
+      global.cachedPathToFlowBin = nodeModuleFlowPath;
     } else if (await canFindFlow(userPath)) {
       global.cachedPathToFlowBin = userPath;
+    } else if (await canFindFlow('flow')) {
+      global.cachedPathToFlowBin = 'flow';
     } else {
-      global.cachedPathToFlowBin = "flow";
+      const extensionRoot = path.resolve(__dirname, '../../../../');
+      global.cachedPathToFlowBin = nodeModuleFlowLocation(extensionRoot)
     }
 
     logger.info("Path to Flow: " + global.cachedPathToFlowBin);
@@ -185,11 +190,11 @@ async function getPathToFlow(): Promise<string> {
  * @return The potential path to Flow on the user's machine if they are using NPM/Yarn to manage
  * their installs of flow.
  */
-function nodeModuleFlowLocation(): string {
+function nodeModuleFlowLocation(rootPath: string): string {
   if (process.platform === 'win32') {
-    return `${global.vscode.workspace.rootPath}\\node_modules\\.bin\\flow.cmd`
+    return `${rootPath}\\node_modules\\.bin\\flow.cmd`
   } else {
-    return `${global.vscode.workspace.rootPath}/node_modules/.bin/flow`
+    return `${rootPath}/node_modules/.bin/flow`
   }
 }
 

package.json

@@ -72,6 +72,7 @@
         "cross-spawn": "^4.0.0",
         "dequeue": "^1.0.5",
         "event-kit": "^2.0.0",
+        "flow-bin": "^0.43.0",
         "fs-plus": "^2.8.2",
         "fuzzaldrin": "^2.1.0",
         "js-beautify": "^1.6.12",
@@ -91,7 +92,6 @@
         "babel-plugin-transform-flow-strip-types": "^6.0.14",
         "babel-preset-es2015": "^6.1.4",
         "babel-preset-stage-1": "^6.1.2",
-        "flow-bin": "^0.43.0",
         "vscode": "0.11.x"
     },
     "icon": "flow-logo.png",