Merge pull request #71 from NativeScript/tachev/fix-ts-install-issues

Fix Typescript installation issues

Author: Dimitar Tachev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-typescript",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "TypeScript support for NativeScript projects. Install using `tns install typescript`.",
   "scripts": {
     "test": "exit 0",
@@ -41,6 +41,7 @@
   },
   "dependencies": {
     "nativescript-hook": "^0.2.0",
-    "semver": "5.5.0"
+    "semver": "5.5.0",
+    "typescript": "~3.1.1"
   }
 }

postinstall.js

@@ -18,8 +18,6 @@ if (projectDir) {
     if (!hasModules30) {
         createReferenceFile();
     }
-
-    installTypescript();
 }
 
 function createReferenceFile() {
@@ -48,59 +46,3 @@ function createTsconfig(tsconfigPath) {
 
     fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 4));
 }
-
-function getProjectTypeScriptVersion() {
-    try {
-        var packageJsonPath = path.join(projectDir, "package.json"),
-            packageJsonContent = fs.readFileSync(packageJsonPath, "utf8"),
-            jsonContent = JSON.parse(packageJsonContent);
-
-        return (jsonContent.dependencies && jsonContent.dependencies.typescript) ||
-            (jsonContent.devDependencies && jsonContent.devDependencies.typescript);
-    } catch (err) {
-        console.error(err);
-        return null;
-    }
-}
-
-function installTypescript() {
-    const installedTypeScriptVersion = getProjectTypeScriptVersion();
-    const force = shouldInstallLatest(installedTypeScriptVersion);
-
-    if (installedTypeScriptVersion && !force) {
-        console.log(`Project already targets TypeScript ${installedTypeScriptVersion}`);
-    } else {
-        const command = "npm install -D typescript@latest";
-
-        console.log("Installing TypeScript...");
-
-        require("child_process").exec(command, { cwd: projectDir }, (err, stdout, stderr) => {
-            if (err) {
-                console.warn(`npm: ${err.toString()}`);
-            }
-
-            process.stdout.write(stdout);
-            process.stderr.write(stderr);
-        });
-    }
-}
-
-function shouldInstallLatest(tsVersion) {
-    if (!tsVersion) {
-        return true;
-    }
-
-    const justVersion = clearPatch(tsVersion);
-    const majorVer = justVersion[0];
-    const minorVer = justVersion[2];
-
-    return tsVersion === "2.2.0" ||
-        majorVer < 2 || // ex. 1.8.10
-        (majorVer === "2" && minorVer < 2); // ex. 2.1.6
-}
-
-function clearPatch(version) {
-    return version && (version.startsWith("~") || version.startsWith("^")) ?
-        version.substring(1) :
-        version;
-}