From 33845fa7c39b466b88cf9b4181e81d0d7530caaf Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Fri, 9 Jun 2017 15:58:03 +0300 Subject: [PATCH 1/3] feat: skip adding paths to tsconfig on postinstall --- postinstall.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/postinstall.js b/postinstall.js index 4bee859..0d25f63 100644 --- a/postinstall.js +++ b/postinstall.js @@ -1,17 +1,20 @@ -var hook = require("nativescript-hook")(__dirname); +const hook = require("nativescript-hook")(__dirname); hook.postinstall(); -var fs = require("fs"); -var path = require("path"); -var upgrader = require("./tsconfig-upgrader"); +const fs = require("fs"); +const path = require("path"); +const upgrader = require("./tsconfig-upgrader"); -var projectDir = hook.findProjectDir(); +const ENV_VARS = process.env; +const KEEP_TS_CONFIG = true; + +const projectDir = hook.findProjectDir(); if (projectDir) { const tsconfigPath = path.join(projectDir, "tsconfig.json"); - if (fs.existsSync(tsconfigPath)) { - upgrader.migrateTsConfig(tsconfigPath, projectDir); - } else { + if (!fs.existsSync(tsconfigPath)) { createTsconfig(tsconfigPath); + } else if (!KEEP_TS_CONFIG) { + upgrader.migrateTsConfig(tsconfigPath, projectDir); } const hasModules30 = upgrader.hasModules30(projectDir); @@ -23,7 +26,7 @@ if (projectDir) { } function createReferenceFile() { - var referenceFilePath = path.join(projectDir, "references.d.ts"), + const referenceFilePath = path.join(projectDir, "references.d.ts"), content = "/// Needed for autocompletion and compilation."; if (!fs.existsSync(referenceFilePath)) { @@ -32,7 +35,7 @@ function createReferenceFile() { } function createTsconfig(tsconfigPath) { - var tsconfig = {}; + const tsconfig = {}; tsconfig.compilerOptions = { module: "commonjs", @@ -51,9 +54,9 @@ function createTsconfig(tsconfigPath) { function getProjectTypeScriptVersion() { try { - var packageJsonPath = path.join(projectDir, "package.json"), - packageJsonContent = fs.readFileSync(packageJsonPath, "utf8"), - jsonContent = JSON.parse(packageJsonContent); + const packageJsonPath = path.join(projectDir, "package.json"); + const packageJsonContent = fs.readFileSync(packageJsonPath, "utf8"); + const jsonContent = JSON.parse(packageJsonContent); return (jsonContent.dependencies && jsonContent.dependencies.typescript) || (jsonContent.devDependencies && jsonContent.devDependencies.typescript); From 9cbca769c726a7a17c0b9b9ead292286927b5f4b Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Fri, 9 Jun 2017 16:39:01 +0300 Subject: [PATCH 2/3] release: cut the 0.4.6 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2e83bd..d65f745 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-dev-typescript", - "version": "0.4.5", + "version": "0.4.6", "description": "TypeScript support for NativeScript projects. Install using `tns install typescript`.", "scripts": { "test": "exit 0", From 7ddfcfa4a999f3c1611adeaf02e6c65c70afc9df Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Fri, 9 Jun 2017 16:39:02 +0300 Subject: [PATCH 3/3] docs: add changelog for 0.4.6 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d122a6e..6b78125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [0.4.6](https://github.com/NativeScript/nativescript-dev-typescript/compare/0.4.5...0.4.6) (2017-06-09) + + +### Features + +* skip adding paths to tsconfig on postinstall ([33845fa](https://github.com/NativeScript/nativescript-dev-typescript/commit/33845fa)) + + + ## [0.4.5](https://github.com/NativeScript/nativescript-dev-typescript/compare/0.4.4...0.4.5) (2017-05-17)