Fixes microsoft#279 adding helper that checks if Cordova is namespace…

…d by Ionic CLI
neilor · May 24, 2017 · 5018a47 · 5018a47
1 parent cfc7d56
commit 5018a47
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/debugger/extension.ts b/src/debugger/extension.ts
@@ -78,6 +78,12 @@ export function cordovaStartCommand(args: string[], cordovaRootPath: string): ch
     let cliName = CordovaProjectHelper.isIonicProject(cordovaRootPath) ? 'ionic' : 'cordova';
     let commandExtension = os.platform() === 'win32' ? '.cmd' : '';
     let command = cliName + commandExtension;
+
+    if (CordovaProjectHelper.isIonicCordovaCLINamespacedProject(cordovaRootPath)) {
+        // add cordova namespace to Ionic projects that uses cli-plugin-cordova
+        args.unshift('cordova');
+    }
+
     return child_process.spawn(command, args, { cwd: cordovaRootPath });
 }
 

diff --git a/src/utils/cordovaProjectHelper.ts b/src/utils/cordovaProjectHelper.ts
@@ -302,6 +302,23 @@ export class CordovaProjectHelper {
         return false;
     }
 
+    /**
+     *  Helper function to determine whether the project is an Ionic project using cli-plugin-cordova that add Cordova commands to an namespace
+     */
+    public static isIonicCordovaCLINamespacedProject(projectRoot: string): boolean {
+        // First look if is an Ionic project, because cli-plugin-cordova didn't depend which Ionic version of project
+        if (CordovaProjectHelper.isIonicProject(projectRoot)) {
+            const packageJsonPath = path.join(projectRoot, 'package.json');
+            if (!fs.existsSync(packageJsonPath)) {
+                return false;
+            }
+            const devDependencies = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8')).devDependencies;
+
+            return !!(devDependencies && devDependencies['@ionic/cli-plugin-cordova']);
+        }
+        return false;
+    }
+
     /**
      * Helper function to determine whether the project has a tsconfig.json
      * manifest and can be considered as a typescript project.