@@ -52,7 +52,8 @@ import {
52
52
53
53
export class MigrateController
54
54
extends UpdateControllerBase
55
- implements IMigrateController {
55
+ implements IMigrateController
56
+ {
56
57
constructor (
57
58
protected $fs : IFileSystem ,
58
59
protected $platformCommandHelper : IPlatformCommandHelper ,
@@ -189,7 +190,7 @@ export class MigrateController
189
190
{
190
191
packageName : "@nativescript/angular" ,
191
192
minVersion : "10.0.0" ,
192
- desiredVersion : "~15.2 .0" ,
193
+ desiredVersion : "^16.0 .0" ,
193
194
async shouldMigrateAction (
194
195
dependency : IMigrationDependency ,
195
196
projectData : IProjectData ,
@@ -582,10 +583,11 @@ export class MigrateController
582
583
projectData : IProjectData ,
583
584
loose : boolean
584
585
) : Promise < boolean > {
585
- const installedVersion = await this . $packageInstallationManager . getInstalledDependencyVersion (
586
- dependency . packageName ,
587
- projectData . projectDir
588
- ) ;
586
+ const installedVersion =
587
+ await this . $packageInstallationManager . getInstalledDependencyVersion (
588
+ dependency . packageName ,
589
+ projectData . projectDir
590
+ ) ;
589
591
590
592
const desiredVersion = dependency . desiredVersion ?? dependency . minVersion ;
591
593
const minVersion = dependency . minVersion ?? dependency . desiredVersion ;
@@ -724,12 +726,10 @@ export class MigrateController
724
726
constants . PACKAGE_LOCK_JSON_FILE_NAME ,
725
727
] ) ;
726
728
727
- const {
728
- dependencies,
729
- devDependencies,
730
- } = await this . $pluginsService . getDependenciesFromPackageJson (
731
- projectData . projectDir
732
- ) ;
729
+ const { dependencies, devDependencies } =
730
+ await this . $pluginsService . getDependenciesFromPackageJson (
731
+ projectData . projectDir
732
+ ) ;
733
733
const hasSchematics = [ ...dependencies , ...devDependencies ] . find (
734
734
( p ) => p . name === "@nativescript/schematics"
735
735
) ;
@@ -1118,10 +1118,11 @@ export class MigrateController
1118
1118
// force the config service to use nativescript.config.ts
1119
1119
this . $projectConfigService . setForceUsingNewConfig ( true ) ;
1120
1120
// migrate data into nativescript.config.ts
1121
- const hasUpdatedConfigSuccessfully = await this . $projectConfigService . setValue (
1122
- "" , // root
1123
- configData as { [ key : string ] : SupportedConfigValues }
1124
- ) ;
1121
+ const hasUpdatedConfigSuccessfully =
1122
+ await this . $projectConfigService . setValue (
1123
+ "" , // root
1124
+ configData as { [ key : string ] : SupportedConfigValues }
1125
+ ) ;
1125
1126
1126
1127
if ( ! hasUpdatedConfigSuccessfully ) {
1127
1128
if ( typeof newConfigPath === "string" ) {
@@ -1309,7 +1310,7 @@ export class MigrateController
1309
1310
1310
1311
private async migrateNativeScriptAngular ( ) : Promise < IMigrationDependency [ ] > {
1311
1312
const minVersion = "10.0.0" ;
1312
- const desiredVersion = "~15 .2.0" ;
1313
+ const desiredVersion = "~16 .2.0" ;
1313
1314
1314
1315
const dependencies : IMigrationDependency [ ] = [
1315
1316
{
@@ -1363,13 +1364,13 @@ export class MigrateController
1363
1364
{
1364
1365
packageName : "rxjs" ,
1365
1366
minVersion : "6.6.0" ,
1366
- desiredVersion : "~7.6 .0" ,
1367
+ desiredVersion : "~7.8 .0" ,
1367
1368
shouldAddIfMissing : true ,
1368
1369
} ,
1369
1370
{
1370
1371
packageName : "zone.js" ,
1371
1372
minVersion : "0.11.1" ,
1372
- desiredVersion : "~0.13 .0" ,
1373
+ desiredVersion : "~0.14 .0" ,
1373
1374
shouldAddIfMissing : true ,
1374
1375
} ,
1375
1376
@@ -1565,10 +1566,11 @@ export class MigrateController
1565
1566
1566
1567
try {
1567
1568
const scopedWebpackPackage = `@nativescript/webpack` ;
1568
- const resolvedVersion = await this . $packageInstallationManager . getMaxSatisfyingVersion (
1569
- scopedWebpackPackage ,
1570
- webpackVersion
1571
- ) ;
1569
+ const resolvedVersion =
1570
+ await this . $packageInstallationManager . getMaxSatisfyingVersion (
1571
+ scopedWebpackPackage ,
1572
+ webpackVersion
1573
+ ) ;
1572
1574
await this . runNPX ( [
1573
1575
"--package" ,
1574
1576
`${ scopedWebpackPackage } @${ resolvedVersion } ` ,
0 commit comments