Skip to content

Commit a31b3bb

Browse files
committed
feat(angular): use 16.2.0 on ns update
1 parent a35dfa6 commit a31b3bb

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

lib/controllers/migrate-controller.ts

+25-23
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ import {
5252

5353
export class MigrateController
5454
extends UpdateControllerBase
55-
implements IMigrateController {
55+
implements IMigrateController
56+
{
5657
constructor(
5758
protected $fs: IFileSystem,
5859
protected $platformCommandHelper: IPlatformCommandHelper,
@@ -189,7 +190,7 @@ export class MigrateController
189190
{
190191
packageName: "@nativescript/angular",
191192
minVersion: "10.0.0",
192-
desiredVersion: "~15.2.0",
193+
desiredVersion: "^16.0.0",
193194
async shouldMigrateAction(
194195
dependency: IMigrationDependency,
195196
projectData: IProjectData,
@@ -582,10 +583,11 @@ export class MigrateController
582583
projectData: IProjectData,
583584
loose: boolean
584585
): 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+
);
589591

590592
const desiredVersion = dependency.desiredVersion ?? dependency.minVersion;
591593
const minVersion = dependency.minVersion ?? dependency.desiredVersion;
@@ -724,12 +726,10 @@ export class MigrateController
724726
constants.PACKAGE_LOCK_JSON_FILE_NAME,
725727
]);
726728

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+
);
733733
const hasSchematics = [...dependencies, ...devDependencies].find(
734734
(p) => p.name === "@nativescript/schematics"
735735
);
@@ -1118,10 +1118,11 @@ export class MigrateController
11181118
// force the config service to use nativescript.config.ts
11191119
this.$projectConfigService.setForceUsingNewConfig(true);
11201120
// 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+
);
11251126

11261127
if (!hasUpdatedConfigSuccessfully) {
11271128
if (typeof newConfigPath === "string") {
@@ -1309,7 +1310,7 @@ export class MigrateController
13091310

13101311
private async migrateNativeScriptAngular(): Promise<IMigrationDependency[]> {
13111312
const minVersion = "10.0.0";
1312-
const desiredVersion = "~15.2.0";
1313+
const desiredVersion = "~16.2.0";
13131314

13141315
const dependencies: IMigrationDependency[] = [
13151316
{
@@ -1363,13 +1364,13 @@ export class MigrateController
13631364
{
13641365
packageName: "rxjs",
13651366
minVersion: "6.6.0",
1366-
desiredVersion: "~7.6.0",
1367+
desiredVersion: "~7.8.0",
13671368
shouldAddIfMissing: true,
13681369
},
13691370
{
13701371
packageName: "zone.js",
13711372
minVersion: "0.11.1",
1372-
desiredVersion: "~0.13.0",
1373+
desiredVersion: "~0.14.0",
13731374
shouldAddIfMissing: true,
13741375
},
13751376

@@ -1565,10 +1566,11 @@ export class MigrateController
15651566

15661567
try {
15671568
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+
);
15721574
await this.runNPX([
15731575
"--package",
15741576
`${scopedWebpackPackage}@${resolvedVersion}`,

0 commit comments

Comments
 (0)