Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,3 +472,5 @@ injector.require(
"./services/metadata-filtering-service"
);
injector.require("tempService", "./services/temp-service");

injector.require("sharedEventBus", "./shared-event-bus");
11 changes: 3 additions & 8 deletions lib/commands/migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export class MigrateCommand implements ICommand {
constructor(
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
private $migrateController: IMigrateController,
private $staticConfig: Config.IStaticConfig,
private $projectData: IProjectData,
private $logger: ILogger
) {
Expand All @@ -28,18 +29,12 @@ export class MigrateCommand implements ICommand {
);

if (!shouldMigrateResult) {
const cliVersion = this.$staticConfig.version;
this.$logger.printMarkdown(
'__Project is compatible with NativeScript "v7.0.0". To get the latest NativeScript packages execute "ns update".__'
`__Project is compatible with NativeScript \`v${cliVersion}\`__`
);
return;
}
// else if (shouldMigrateResult.shouldMigrate === ShouldMigrate.ADVISED) {
// // todo: this shouldn't be here, because this is already the `ns migrate` path.
// this.$logger.printMarkdown(
// '__Project should work with NativeScript "v7.0.0" but a migration is advised. Run ns migrate to migrate.__'
// );
// return;
// }

await this.$migrateController.migrate(migrationData);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class UpdateCommand implements ICommand {
this.$devicePlatformsConstants.Android,
this.$devicePlatformsConstants.iOS,
],
allowInvalidVersions: true,
loose: true,
});

if (shouldMigrate) {
Expand Down
1 change: 1 addition & 0 deletions lib/common/dispatchers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export class CommandDispatcher implements ICommandDispatcher {

if (this.$logger.getLevel() === "TRACE") {
// CommandDispatcher is called from external CLI's only, so pass the path to their package.json
this.$logger.trace("Collecting system information...");
const sysInfo = await this.$sysInfo.getSysInfo({
pathToNativeScriptCliPackageJson: path.join(
__dirname,
Expand Down
Loading