fix(@schematics/update): fix major of angular compat with major + 1

When there are complex ranges, ltr(x) is not equal to !gtr(x).

Fix angular/angular-cli#10540

Author: hansl

packages/schematics/update/update/index.ts

@@ -35,15 +35,16 @@ const peerCompatibleWhitelist: { [name: string]: PeerVersionTransform } = {
   '@angular/core': (range: string) => {
     range = semver.validRange(range);
     let major = 1;
-    while (semver.ltr(major + '.0.0', range)) {
+    while (!semver.gtr(major + '.0.0', range)) {
       major++;
       if (major >= 99) {
         throw new SchematicsException(`Invalid range: ${JSON.stringify(range)}`);
       }
     }
 
-    // Add the major - 1 version as compatible with the angular compatible.
-    return semver.validRange(`^${major + 1}.0.0-rc.0 || ${range}`) || range;
+    // Add the major version as compatible with the angular compatible. This is already one
+    // major above the greatest supported, because we increment `major` before checking.
+    return semver.validRange(`^${major}.0.0-rc.0 || ${range}`) || range;
   },
 };
 

packages/schematics/update/update/index_spec.ts

@@ -129,6 +129,51 @@ describe('@schematics/update', () => {
     ).subscribe(undefined, done.fail, done);
   }, 45000);
 
+  it('updates Angular as compatible with Angular N-1 (2)', done => {
+    // Add the basic migration package.
+    const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
+    const packageJson = JSON.parse(content);
+    const dependencies = packageJson['dependencies'];
+    dependencies['@angular-devkit-tests/update-peer-dependencies-angular-5-2'] = '1.0.0';
+    dependencies['@angular/core'] = '5.1.0';
+    dependencies['@angular/animations'] = '5.1.0';
+    dependencies['@angular/common'] = '5.1.0';
+    dependencies['@angular/compiler'] = '5.1.0';
+    dependencies['@angular/platform-browser'] = '5.1.0';
+    dependencies['rxjs'] = '5.5.0';
+    dependencies['zone.js'] = '0.8.26';
+    host.sync.write(
+      normalize('/package.json'),
+      virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
+    );
+
+    schematicRunner.runSchematicAsync('update', {
+      packages: ['@angular/core'],
+      next: true,
+    }, appTree).pipe(
+      map(tree => {
+        const packageJson = JSON.parse(tree.readContent('/package.json'));
+        expect(packageJson['dependencies']['@angular/core'][0]).toBe('6');
+
+        // Check install task.
+        expect(schematicRunner.tasks).toEqual([
+          {
+            name: 'node-package',
+            options: jasmine.objectContaining({
+              command: 'install',
+            }),
+          },
+          {
+            name: 'run-schematic',
+            options: jasmine.objectContaining({
+              name: 'migrate',
+            }),
+          },
+        ]);
+      }),
+    ).subscribe(undefined, done.fail, done);
+  }, 45000);
+
   it('can migrate only', done => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));

tests/schematics/update/packages/update-peer-dependencies-angular-5-2/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@angular-devkit-tests/update-peer-dependencies-angular-5-2",
+  "version": "1.0.0",
+  "description": "Tests",
+  "peerDependencies": {
+    "@angular/animations": ">= 1 < 5.0.0 || >= 5.0.0-rc.0 < 6.0.0",
+    "@angular/compiler": ">= 1 < 5.0.0 || >= 5.0.0-rc.0 < 6.0.0",
+    "@angular/platform-browser": ">= 1 < 5.0.0 || >= 5.0.0-rc.0 < 6.0.0"
+  }
+}