Merge branch 'release' into vladimirov/merge-appbuilder-fixes

Conflicts:
	lib/services/android-project-service.ts

Author: rosen-vladimirov

lib/declarations.ts

@@ -65,6 +65,7 @@ interface IOptions extends ICommonOptions {
 	keyStoreAlias: string;
 	keyStoreAliasPassword: string;
 	sdk: string;
+	ignoreScripts: boolean;
 }
 
 interface IProjectFilesManager {

lib/node-package-manager.ts

@@ -28,6 +28,11 @@ export class NodePackageManager implements INodePackageManager {
 	}
 
 	public install(packageName: string, pathToSave: string, config?: any): IFuture<any> {
+		if(this.$options.ignoreScripts) {
+			config = config || {};
+			config["ignore-scripts"] = true;
+		}
+
 		return this.loadAndExecute("install", [pathToSave, packageName], { config: config });
 	}
 

lib/options.ts

@@ -27,7 +27,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			keyStorePassword: { type: OptionType.String,},
 			keyStoreAlias: { type: OptionType.String },
 			keyStoreAliasPassword: { type: OptionType.String },
-			sdk: { type: OptionType.String }
+			sdk: { type: OptionType.String },
+			ignoreScripts: {type: OptionType.Boolean }
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/services/android-project-service.ts

@@ -189,7 +189,7 @@ class AndroidProjectService implements IPlatformProjectService {
 	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
 	}
-	
+
 	private getProjectPropertiesManager(filePath: string): IAndroidProjectPropertiesManager {
 		if(!this._androidProjectPropertiesManagers[filePath]) {
 			this._androidProjectPropertiesManagers[filePath] = this.$injector.resolve(androidProjectPropertiesManagerLib.AndroidProjectPropertiesManager, { directoryPath: filePath });
@@ -252,17 +252,18 @@ class AndroidProjectService implements IPlatformProjectService {
 	public prepareProject(): IFuture<void> {
 		return (() => { }).future<void>()();
 	}
-	
+
 	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
 		return (() => {
 			let resourcesDirPath = path.join(appResourcesDirectoryPath, this.platformData.normalizedPlatformName);
-			let resourcesDirs = this.$fs.readDirectory(resourcesDirPath).wait();
+			let valuesDirRegExp = /^values/;
+			let resourcesDirs = this.$fs.readDirectory(resourcesDirPath).wait().filter(resDir => !resDir.match(valuesDirRegExp));
 			_.each(resourcesDirs, resourceDir => {
-				this.$fs.deleteDirectory(path.join(this.platformData.appResourcesDestinationDirectoryPath, resourceDir)).wait();				
+				this.$fs.deleteDirectory(path.join(this.platformData.appResourcesDestinationDirectoryPath, resourceDir)).wait();
 			});	
 		}).future<void>()();
 	}
-	
+
 	public preparePluginNativeCode(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData);

lib/services/platform-service.ts

@@ -169,7 +169,7 @@ export class PlatformService implements IPlatformService {
 			var appResourcesDirectoryPath = path.join(appDestinationDirectoryPath, constants.APP_RESOURCES_FOLDER_NAME);
 			if (this.$fs.exists(appResourcesDirectoryPath).wait()) {
 				platformData.platformProjectService.prepareAppResources(appResourcesDirectoryPath).wait();
-				shell.cp("-R", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), platformData.appResourcesDestinationDirectoryPath);
+				shell.cp("-Rf", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), platformData.appResourcesDestinationDirectoryPath);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
 			}
 

lib/services/plugins-service.ts

@@ -129,7 +129,11 @@ export class PluginsService implements IPluginsService {
 	}
 
 	public ensureAllDependenciesAreInstalled(): IFuture<void> {
-		return this.$childProcess.exec("npm install ", { cwd: this.$projectData.projectDir });
+		let command = "npm install ";
+		if(this.$options.ignoreScripts) {
+			command += "--ignore-scripts";
+		}
+		return this.$childProcess.exec(command, { cwd: this.$projectData.projectDir });
 	}
 
 	public getAllInstalledPlugins(): IFuture<IPluginData[]> {