Skip to content

Commit b2607b9

Browse files
author
Fatme
authored
Merge pull request #4714 from NativeScript/fatme/merge-release-into-master-541
chore: merge release into master
2 parents 8b72f12 + 797c1ae commit b2607b9

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

lib/commands/init.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ export class ProjectInitCommand implements ICommand {
22
public allowedParameters: ICommandParameter[] = [];
33
public enableHooks = false;
44

5-
constructor(private $projectInitService: IProjectInitService) { }
5+
constructor(private $logger: ILogger,
6+
private $projectInitService: IProjectInitService) { }
67

78
public async execute(args: string[]): Promise<void> {
9+
this.$logger.warn("This command is deprecated and it will be removed in the next major release of NativeScript");
810
return this.$projectInitService.initialize();
911
}
1012
}

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
128128
const availableEmulatorsOutput = await this.getEmulatorImages({ platform: options.platform });
129129
const emulators = this.$emulatorHelper.getEmulatorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
130130
const errors = this.$emulatorHelper.getErrorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
131-
if (errors.length) {
132-
return errors;
133-
}
134131

135132
let emulator = null;
136133
if (options.imageIdentifier) {
@@ -140,7 +137,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
140137
}
141138

142139
if (!emulator) {
143-
return [`Unable to find emulator with provided options: ${options}`];
140+
const additionalErrors = errors && errors.length ? errors : [];
141+
return [`Unable to find emulator with provided options: ${options}`, ...additionalErrors];
144142
}
145143

146144
// emulator is already running

npm-shrinkwrap.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"esprima": "2.7.0",
4545
"iconv-lite": "0.4.11",
4646
"inquirer": "6.2.0",
47-
"ios-device-lib": "0.5.1",
47+
"ios-device-lib": "0.5.2",
4848
"ios-mobileprovision-finder": "1.0.10",
4949
"ios-sim-portable": "4.0.9",
5050
"istextorbinary": "2.2.1",

resources/test/karma.conf.js

+2
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,7 @@ function setWebpack(config, options) {
102102
options.webpack = require('./webpack.config')(env);
103103
delete options.webpack.entry;
104104
delete options.webpack.output.libraryTarget;
105+
const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
106+
options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
105107
}
106108
}

0 commit comments

Comments
 (0)