fix(nx): use semver for version range comparison

nrwl · Sep 11, 2019 · 88512c2 · 88512c2
1 parent d5b4453
commit 88512c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/packages/angular/src/migrations/update-8-3-0/upgrade-ngrx-8-0.ts b/packages/angular/src/migrations/update-8-3-0/upgrade-ngrx-8-0.ts
@@ -6,6 +6,7 @@ import {
   updateJsonInTree
 } from '@nrwl/workspace';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { gt } from 'semver';
 
 function updateCLI() {
   const tasks: TaskId[] = [];
@@ -14,13 +15,7 @@ function updateCLI() {
       json.devDependencies = json.devDependencies || {};
       const cliVersion = json.devDependencies['@angular/cli'];
 
-      if (
-        cliVersion &&
-        (cliVersion > 8.1 ||
-          cliVersion.startsWith('8.1') ||
-          cliVersion.startsWith('~8.1') ||
-          cliVersion.startsWith('^8.1'))
-      ) {
+      if (cliVersion && gt(cliVersion, '8.1.1')) {
         return json;
       }
 

diff --git a/packages/angular/src/migrations/update-8-5-0/upgrade-cli-8-3.ts b/packages/angular/src/migrations/update-8-5-0/upgrade-cli-8-3.ts
@@ -6,6 +6,7 @@ import {
   updateJsonInTree
 } from '@nrwl/workspace';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { gt } from 'semver';
 
 const updateAngular = addUpdateTask('@angular/core', '8.2.4');
 
@@ -16,13 +17,7 @@ function updateCLI() {
       json.devDependencies = json.devDependencies || {};
       const cliVersion = json.devDependencies['@angular/cli'];
 
-      if (
-        cliVersion &&
-        (cliVersion > 8.3 ||
-          cliVersion.startsWith('8.3') ||
-          cliVersion.startsWith('~8.3') ||
-          cliVersion.startsWith('^8.3'))
-      ) {
+      if (cliVersion && gt(cliVersion, '8.3.3')) {
         return json;
       }
 

diff --git a/packages/workspace/src/migrations/update-8-3-0/update-ng-cli-8-1.ts b/packages/workspace/src/migrations/update-8-3-0/update-ng-cli-8-1.ts
@@ -1,18 +1,13 @@
 import { updateJsonInTree } from '@nrwl/workspace';
 import { chain, SchematicContext } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { gt } from 'semver';
 
 const updateCLI = updateJsonInTree('package.json', json => {
   json.devDependencies = json.devDependencies || {};
   const cliVersion = json.devDependencies['@angular/cli'];
 
-  if (
-    cliVersion &&
-    (cliVersion > 8.1 ||
-      cliVersion.startsWith('8.1') ||
-      cliVersion.startsWith('~8.1') ||
-      cliVersion.startsWith('^8.1'))
-  ) {
+  if (cliVersion && gt(cliVersion, '8.1.1')) {
     return json;
   }