Skip to content

Commit 29c149b

Browse files
Merge release in master (#2808)
* Update Travis CI Scripts (#2799) Set `rc` tag to the publishConfig section for the release branch. * Remove .html from the files included in the fast-livesync to force full reload (#2802) * Update Travis CI Scripts (#2804) * Fix UserId passing to Analytics Service (#2806) * Release notes for 3.0.1 (#2807) * Update to latest common lib
1 parent 0a36bb2 commit 29c149b

File tree

6 files changed

+39
-16
lines changed

6 files changed

+39
-16
lines changed

.travis.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ after_success:
2424
- mkdir s3-publish
2525
- cp nativescript*.tgz s3-publish/nativescript.tgz
2626
before_deploy:
27-
- node .travis/add-publishConfig.js next
27+
- node .travis/add-publishConfig.js $TRAVIS_BRANCH
2828
deploy:
2929
- provider: s3
3030
bucket: nativescript-ci
@@ -43,3 +43,10 @@ deploy:
4343
branch: master
4444
api_key:
4545
secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=
46+
- provider: npm
47+
skip_cleanup: true
48+
49+
on:
50+
branch: release
51+
api_key:
52+
secure: KzzsvF3eA3j4gRQa8tO//+XWNSR3XiX8Sa18o3PyKyG9/cBZ6PQ3Te74cNS1C3ZiLUOgs5dWA6/TmRVPci4XjvFaWo/B6e2fuVSl5H94Od99bkeBHJsbLSEkLN4ClV/YbGuyKgA5Q2yIFt6p2EJjL90RjbbIk7I4YuyG2Mo3j0Q=

.travis/add-publishConfig.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
#!/usr/bin/env node
22

3-
var fsModule = require('fs');
3+
var fsModule = require("fs");
44

5-
//Adds a publishConfig section to the package.json file
5+
// Adds a publishConfig section to the package.json file
66
// and sets a tag to it
77

8-
var path = './package.json';
8+
var path = "./package.json";
99
var fileOptions = {encoding: "utf-8"};
1010
var content = fsModule.readFileSync(path, fileOptions);
1111

12-
var tag = process.argv[2];
13-
if (!tag) {
14-
console.log('Please pass the tag name as an argument!');
15-
process.exit(1);
16-
}
17-
1812
var packageDef = JSON.parse(content);
1913
if (!packageDef.publishConfig) {
2014
packageDef.publishConfig = {};
2115
}
22-
packageDef.publishConfig.tag = tag;
2316

24-
var newContent = JSON.stringify(packageDef, null, ' ');
25-
fsModule.writeFileSync(path, newContent, fileOptions);
17+
var branch = process.argv[2];
18+
if (!branch) {
19+
console.log("Please pass the branch name as an argument!");
20+
process.exit(1);
21+
}
22+
packageDef.publishConfig.tag = branch === "release" ? "rc" : "next";
23+
24+
var newContent = JSON.stringify(packageDef, null, " ");
25+
fsModule.writeFileSync(path, newContent, fileOptions);

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
NativeScript CLI Changelog
22
================
33

4+
3.0.1 (2017, May 11)
5+
==
6+
7+
### Fixed
8+
9+
* [Fix #2780](https://github.com/NativeScript/nativescript-cli/issues/2780): CLI tool doesn't restart app if HTML/CSS file was modified
10+
* [Fix #2732](https://github.com/NativeScript/nativescript-cli/issues/2732): Livesync crashes app every OTHER time on iOS with 3.0.0-rc.2
11+
* [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"
12+
13+
2.5.5 (2017, May 11)
14+
==
15+
16+
### Fixed
17+
18+
* [Fix #2782](https://github.com/NativeScript/nativescript-cli/issues/2782): [2.5.*] tns run always add latest platform
19+
420
3.0.0 (2017, May 3)
521
==
622

lib/providers/livesync-provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class LiveSyncProvider implements ILiveSyncProvider {
1010
private $childProcess: IChildProcess,
1111
private $options: IOptions) { }
1212

13-
private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml", ".html"];
13+
private static FAST_SYNC_FILE_EXTENSIONS = [".css", ".xml"];
1414

1515
private deviceSpecificLiveSyncServicesCache: IDictionary<any> = {};
1616
public get deviceSpecificLiveSyncServices(): IDictionary<any> {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript",
33
"preferGlobal": true,
4-
"version": "3.0.0",
4+
"version": "3.0.1",
55
"author": "Telerik <[email protected]>",
66
"description": "Command-line interface for building NativeScript projects",
77
"bin": {

0 commit comments

Comments
 (0)