From dbb8210f2ace69b552fe0cbad099e6367e074e4c Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 11 May 2017 11:43:19 +0300 Subject: [PATCH 1/6] Update Travis CI Scripts (#2799) Set `rc` tag to the publishConfig section for the release branch. --- .travis.yml | 9 ++++++++- .travis/add-publishConfig.js | 17 ++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 795bfd9141..e1b390b03a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ after_success: - mkdir s3-publish - cp nativescript*.tgz s3-publish/nativescript.tgz before_deploy: -- node .travis/add-publishConfig.js next +- node .travis/add-publishConfig.js deploy: - provider: s3 bucket: nativescript-ci @@ -43,3 +43,10 @@ deploy: branch: master api_key: secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q= + - provider: npm + skip_cleanup: true + email: nativescript@telerik.com + on: + branch: release + api_key: + secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q= diff --git a/.travis/add-publishConfig.js b/.travis/add-publishConfig.js index c6e3c6334b..8b2da05662 100644 --- a/.travis/add-publishConfig.js +++ b/.travis/add-publishConfig.js @@ -2,24 +2,23 @@ var fsModule = require('fs'); -//Adds a publishConfig section to the package.json file +// Adds a publishConfig section to the package.json file // and sets a tag to it var path = './package.json'; var fileOptions = {encoding: "utf-8"}; var content = fsModule.readFileSync(path, fileOptions); -var tag = process.argv[2]; -if (!tag) { - console.log('Please pass the tag name as an argument!'); - process.exit(1); -} - var packageDef = JSON.parse(content); if (!packageDef.publishConfig) { packageDef.publishConfig = {}; } -packageDef.publishConfig.tag = tag; + +if ($TRAVIS_BRANCH === 'release') { + packageDef.publishConfig.tag = 'rc'; +} else { + packageDef.publishConfig.tag = 'next'; +} var newContent = JSON.stringify(packageDef, null, ' '); -fsModule.writeFileSync(path, newContent, fileOptions); \ No newline at end of file +fsModule.writeFileSync(path, newContent, fileOptions); From 970f5484e3834678926bedb6ddfb360626b58189 Mon Sep 17 00:00:00 2001 From: yyosifov Date: Thu, 11 May 2017 12:49:53 +0300 Subject: [PATCH 2/6] Remove .html from the files included in the fast-livesync to force full reload (#2802) --- lib/providers/livesync-provider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/providers/livesync-provider.ts b/lib/providers/livesync-provider.ts index a175688275..88034a2323 100644 --- a/lib/providers/livesync-provider.ts +++ b/lib/providers/livesync-provider.ts @@ -10,7 +10,7 @@ export class LiveSyncProvider implements ILiveSyncProvider { private $childProcess: IChildProcess, private $options: IOptions) { } - private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml", ".html"]; + private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml"]; private deviceSpecificLiveSyncServicesCache: IDictionary = {}; public get deviceSpecificLiveSyncServices(): IDictionary { From a82cfecc771af0c2c3412eee3764c5f16ad10fd3 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Thu, 11 May 2017 12:59:21 +0300 Subject: [PATCH 3/6] Update Travis CI Scripts (#2804) --- .travis.yml | 2 +- .travis/add-publishConfig.js | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1b390b03a..71e3295d54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ after_success: - mkdir s3-publish - cp nativescript*.tgz s3-publish/nativescript.tgz before_deploy: -- node .travis/add-publishConfig.js +- node .travis/add-publishConfig.js $TRAVIS_BRANCH deploy: - provider: s3 bucket: nativescript-ci diff --git a/.travis/add-publishConfig.js b/.travis/add-publishConfig.js index 8b2da05662..e11c0dd434 100644 --- a/.travis/add-publishConfig.js +++ b/.travis/add-publishConfig.js @@ -1,11 +1,11 @@ #!/usr/bin/env node -var fsModule = require('fs'); +var fsModule = require("fs"); // Adds a publishConfig section to the package.json file // and sets a tag to it -var path = './package.json'; +var path = "./package.json"; var fileOptions = {encoding: "utf-8"}; var content = fsModule.readFileSync(path, fileOptions); @@ -14,11 +14,12 @@ if (!packageDef.publishConfig) { packageDef.publishConfig = {}; } -if ($TRAVIS_BRANCH === 'release') { - packageDef.publishConfig.tag = 'rc'; -} else { - packageDef.publishConfig.tag = 'next'; +var branch = process.argv[2]; +if (!branch) { + console.log("Please pass the branch name as an argument!"); + process.exit(1); } +packageDef.publishConfig.tag = branch === "release" ? "rc" : "next"; -var newContent = JSON.stringify(packageDef, null, ' '); +var newContent = JSON.stringify(packageDef, null, " "); fsModule.writeFileSync(path, newContent, fileOptions); From e37a10b2a6955cb276265a722c2d979d1cba5529 Mon Sep 17 00:00:00 2001 From: yyosifov Date: Thu, 11 May 2017 14:59:41 +0300 Subject: [PATCH 4/6] Fix UserId passing to Analytics Service (#2806) --- lib/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common b/lib/common index e5eba381ab..ebfdf06c65 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit e5eba381ab3c27838fbfe678575d0510b42b9675 +Subproject commit ebfdf06c656604551bfd4d261185f10cb7c566af From 3a1d40d083b705dc9d7fa48f758ea5929d3018a9 Mon Sep 17 00:00:00 2001 From: dtopuzov Date: Thu, 11 May 2017 17:24:06 +0300 Subject: [PATCH 5/6] Release notes for 3.0.1 (#2807) --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c355b7f02..39f25cbcc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,22 @@ NativeScript CLI Changelog ================ +3.0.1 (2017, May 11) +== + +### Fixed + +* [Fix #2780](https://github.com/NativeScript/nativescript-cli/issues/2780): CLI tool doesn't restart app if HTML/CSS file was modified +* [Fix #2732](https://github.com/NativeScript/nativescript-cli/issues/2732): Livesync crashes app every OTHER time on iOS with 3.0.0-rc.2 +* [Fix #2764](https://github.com/NativeScript/nativescript-cli/issues/2764): Error when executing "tns run ios" with 3.0 on a project that is located in a directory path with "spaces" + +2.5.5 (2017, May 11) +== + +### Fixed + +* [Fix #2782](https://github.com/NativeScript/nativescript-cli/issues/2782): [2.5.*] tns run always add latest platform + 3.0.0 (2017, May 3) == diff --git a/package.json b/package.json index b0ff51b42e..559d82b4d3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "3.0.0", + "version": "3.0.1", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 5311af86a729b9cd6b53953b21a953d293f0b326 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Fri, 12 May 2017 11:00:10 +0300 Subject: [PATCH 6/6] Update to latest common lib --- lib/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common b/lib/common index 5f1268ab1f..2388145d3c 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 5f1268ab1f1d1d1ffceb3610cf3ee1742ef67b9f +Subproject commit 2388145d3cca720ad2ab9cff857effa492c4d341