Skip to content

Commit 6cd4304

Browse files
Merge pull request #2951 from NativeScript/vladimirov/merge-rel-master
Merge release in master
2 parents e500166 + 0c619e0 commit 6cd4304

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
NativeScript CLI Changelog
22
================
3+
4+
3.1.2 (2017, July 06)
5+
==
6+
7+
### Fixed
8+
* [Fixed #2950](https://github.com/NativeScript/nativescript-cli/issues/2950): Unable to provide user input on postinstall of plugin
9+
310
3.1.1 (2017, June 28)
411
==
512

@@ -8,6 +15,7 @@ NativeScript CLI Changelog
815
* [Fixed #2892](https://github.com/NativeScript/nativescript-cli/issues/2892): Not copying the CFBundleURLTypes from the plist file to the project
916
* [Fixed #2916](https://github.com/NativeScript/nativescript-cli/issues/2916): If no device or emulator is attached `tns debug android` kills the commandline process and doesn't start an emulator
1017
* [Fixed #2923](https://github.com/NativeScript/nativescript-cli/issues/2923): Fix asking for user email on postinstall
18+
* [Fixed #2929](https://github.com/NativeScript/nativescript-cli/issues/2929): Android release builds with webpack disregards plugin's gradle dependencies.
1119

1220

1321
3.1.0 (2017, June 22)

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Apache License
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright (c) 2015-2016 Telerik AD
189+
Copyright (c) 2015-2017 Telerik AD
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@ Apache License
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

lib/config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export class StaticConfig extends StaticConfigBase implements IStaticConfig {
2424
public CLIENT_NAME = "tns";
2525
public CLIENT_NAME_ALIAS = "NativeScript";
2626
public ANALYTICS_API_KEY = "5752dabccfc54c4ab82aea9626b7338e";
27+
public ANALYTICS_EXCEPTIONS_API_KEY = "35478fe7de68431399e96212540a3d5d";
2728
public TRACK_FEATURE_USAGE_SETTING_NAME = "TrackFeatureUsage";
2829
public ERROR_REPORT_SETTING_NAME = "TrackExceptions";
2930
public ANALYTICS_INSTALLATION_ID_SETTING_NAME = "AnalyticsInstallationID";

lib/node-package-manager.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as path from "path";
22
import { exported } from "./common/decorators";
3+
import { isInteractive } from "./common/helpers";
34

45
export class NodePackageManager implements INodePackageManager {
56
private static SCOPED_DEPENDENCY_REGEXP = /^(@.+?)(?:@(.+?))?$/;
@@ -208,16 +209,20 @@ export class NodePackageManager implements INodePackageManager {
208209
private async getNpmInstallResult(params: string[], cwd: string): Promise<ISpawnResult> {
209210
return new Promise<ISpawnResult>((resolve, reject) => {
210211
const npmExecutable = this.getNpmExecutableName();
211-
let childProcess = this.$childProcess.spawn(npmExecutable, params, { cwd, stdio: "pipe" });
212+
const stdioValue = isInteractive() ? "inherit" : "pipe";
213+
214+
const childProcess = this.$childProcess.spawn(npmExecutable, params, { cwd, stdio: stdioValue });
212215

213216
let isFulfilled = false;
214217
let capturedOut = "";
215218
let capturedErr = "";
216219

217-
childProcess.stdout.on("data", (data: string) => {
218-
this.$logger.write(data.toString());
219-
capturedOut += data;
220-
});
220+
if (childProcess.stdout) {
221+
childProcess.stdout.on("data", (data: string) => {
222+
this.$logger.write(data.toString());
223+
capturedOut += data;
224+
});
225+
}
221226

222227
if (childProcess.stderr) {
223228
childProcess.stderr.on("data", (data: string) => {

0 commit comments

Comments
 (0)