fix(nx): add check to see if CLI version is more recent

nrwl · Sep 11, 2019 · d5b4453 · d5b4453
1 parent 20b292b
commit d5b4453
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 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
@@ -16,7 +16,8 @@ function updateCLI() {
 
       if (
         cliVersion &&
-        (cliVersion.startsWith('8.1') ||
+        (cliVersion > 8.1 ||
+          cliVersion.startsWith('8.1') ||
           cliVersion.startsWith('~8.1') ||
           cliVersion.startsWith('^8.1'))
       ) {

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
@@ -14,6 +14,17 @@ function updateCLI() {
   const rule = chain([
     updateJsonInTree('package.json', json => {
       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'))
+      ) {
+        return json;
+      }
 
       if (json['devDependencies']['@angular/cli']) {
         json['devDependencies']['@angular/cli'] = '8.3.3';

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
@@ -8,7 +8,8 @@ const updateCLI = updateJsonInTree('package.json', json => {
 
   if (
     cliVersion &&
-    (cliVersion.startsWith('8.1') ||
+    (cliVersion > 8.1 ||
+      cliVersion.startsWith('8.1') ||
       cliVersion.startsWith('~8.1') ||
       cliVersion.startsWith('^8.1'))
   ) {