diff --git a/.travis.yml b/.travis.yml index 795bfd9141..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 next +- node .travis/add-publishConfig.js $TRAVIS_BRANCH 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..e11c0dd434 100644 --- a/.travis/add-publishConfig.js +++ b/.travis/add-publishConfig.js @@ -1,25 +1,25 @@ #!/usr/bin/env node -var fsModule = require('fs'); +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 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; -var newContent = JSON.stringify(packageDef, null, ' '); -fsModule.writeFileSync(path, newContent, fileOptions); \ No newline at end of file +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, " "); +fsModule.writeFileSync(path, newContent, fileOptions); 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/lib/common b/lib/common index 5f1268ab1f..2388145d3c 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit 5f1268ab1f1d1d1ffceb3610cf3ee1742ef67b9f +Subproject commit 2388145d3cca720ad2ab9cff857effa492c4d341 diff --git a/lib/providers/livesync-provider.ts b/lib/providers/livesync-provider.ts index 0724a34fd0..deb7ca717b 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 { diff --git a/package.json b/package.json index b28106c687..f1b8624aeb 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": {