Merge pull request #4715 from NativeScript/fatme/mmwo

chore: merge master branch

Author: Dimitar Tachev

lib/common/mobile/mobile-core/devices-service.ts

@@ -128,9 +128,6 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		const availableEmulatorsOutput = await this.getEmulatorImages({ platform: options.platform });
 		const emulators = this.$emulatorHelper.getEmulatorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
 		const errors = this.$emulatorHelper.getErrorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
-		if (errors.length) {
-			return errors;
-		}
 
 		let emulator = null;
 		if (options.imageIdentifier) {
@@ -140,7 +137,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		}
 
 		if (!emulator) {
-			return [`Unable to find emulator with provided options: ${options}`];
+			const additionalErrors = errors && errors.length ? errors : [];
+			return [`Unable to find emulator with provided options: ${options}`, ...additionalErrors];
 		}
 
 		// emulator is already running

npm-shrinkwrap.json

@@ -44,7 +44,7 @@
     "esprima": "2.7.0",
     "iconv-lite": "0.4.11",
     "inquirer": "6.2.0",
-    "ios-device-lib": "0.5.1",
+    "ios-device-lib": "0.5.2",
     "ios-mobileprovision-finder": "1.0.10",
     "ios-sim-portable": "4.0.9",
     "istextorbinary": "2.2.1",

package.json

@@ -102,5 +102,7 @@ function setWebpack(config, options) {
     options.webpack = require('./webpack.config')(env);
     delete options.webpack.entry;
     delete options.webpack.output.libraryTarget;
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
   }
 }