Merge pull request AmadeusITGroup#531 from AmadeusITGroup/bugfix/sdk-…

…generator-peer-deps fix: carret on peer dep and remove useless dep
fpaul-1A · Jul 27, 2023 · 6e0a953 · 6e0a953
2 parents e8dba92 + 0765333
commit 6e0a953
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/packages/@ama-sdk/core/package.json b/packages/@ama-sdk/core/package.json
@@ -42,19 +42,15 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "~16.0.5",
-    "@angular/cli": "~16.0.5",
-    "@schematics/angular": "~16.0.5",
+    "@angular-devkit/schematics": "^16.0.5",
+    "@schematics/angular": "^16.0.5",
     "isomorphic-fetch": "^3.0.0",
     "typescript": "~5.0.2"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/schematics": {
       "optional": true
     },
-    "@angular/cli": {
-      "optional": true
-    },
     "@schematics/angular": {
       "optional": true
     },
@@ -69,7 +65,6 @@
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-eslint/eslint-plugin": "~16.0.3",
-    "@angular/cli": "~16.0.5",
     "@nx/jest": "~16.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/dev-tools": "workspace:^",

diff --git a/packages/@ama-sdk/schematics/package.json b/packages/@ama-sdk/schematics/package.json
@@ -27,9 +27,6 @@
     "@angular-devkit/schematics-cli": {
       "optional": true
     },
-    "@angular/cli": {
-      "optional": true
-    },
     "@angular/compiler": {
       "optional": true
     },
@@ -42,12 +39,11 @@
   },
   "peerDependencies": {
     "@ama-sdk/core": "workspace:^",
-    "@angular-devkit/core": "~16.0.5",
-    "@angular-devkit/schematics": "~16.0.5",
-    "@angular-devkit/schematics-cli": "~16.0.5",
-    "@angular/cli": "~16.0.5",
+    "@angular-devkit/core": "^16.0.5",
+    "@angular-devkit/schematics": "^16.0.5",
+    "@angular-devkit/schematics-cli": "^16.0.5",
     "@openapitools/openapi-generator-cli": "~2.7.0",
-    "@schematics/angular": "~16.0.5"
+    "@schematics/angular": "^16.0.5"
   },
   "dependencies": {
     "@angular-devkit/core": "~16.0.5",

diff --git a/packages/@o3r/dev-tools/src/cli/version-harmonize.ts b/packages/@o3r/dev-tools/src/cli/version-harmonize.ts
@@ -60,7 +60,7 @@ const getLatestRange = (dependencies: DependencyInfo[], dependencyName: string):
         } else if (!minAccVersion) {
           return current;
         }
-        return semver.lt(minCurrentVersion, minAccVersion) ? acc : current;
+        return semver.lte(minCurrentVersion, minAccVersion) ? acc : current;
       }
     }, undefined);
 

diff --git a/yarn.lock b/yarn.lock
@@ -66,7 +66,6 @@ __metadata:
     "@angular-devkit/core": ~16.0.5
     "@angular-devkit/schematics": ~16.0.5
     "@angular-eslint/eslint-plugin": ~16.0.3
-    "@angular/cli": ~16.0.5
     "@nx/jest": ~16.5.0
     "@o3r/build-helpers": "workspace:^"
     "@o3r/dev-tools": "workspace:^"
@@ -100,16 +99,13 @@ __metadata:
     typescript: ~5.0.2
     uuid: ^9.0.0
   peerDependencies:
-    "@angular-devkit/schematics": ~16.0.5
-    "@angular/cli": ~16.0.5
-    "@schematics/angular": ~16.0.5
+    "@angular-devkit/schematics": ^16.0.5
+    "@schematics/angular": ^16.0.5
     isomorphic-fetch: ^3.0.0
     typescript: ~5.0.2
   peerDependenciesMeta:
     "@angular-devkit/schematics":
       optional: true
-    "@angular/cli":
-      optional: true
     "@schematics/angular":
       optional: true
     isomorphic-fetch:
@@ -276,19 +272,16 @@ __metadata:
     typescript: ~5.0.2
   peerDependencies:
     "@ama-sdk/core": "workspace:^"
-    "@angular-devkit/core": ~16.0.5
-    "@angular-devkit/schematics": ~16.0.5
-    "@angular-devkit/schematics-cli": ~16.0.5
-    "@angular/cli": ~16.0.5
+    "@angular-devkit/core": ^16.0.5
+    "@angular-devkit/schematics": ^16.0.5
+    "@angular-devkit/schematics-cli": ^16.0.5
     "@openapitools/openapi-generator-cli": ~2.7.0
-    "@schematics/angular": ~16.0.5
+    "@schematics/angular": ^16.0.5
   peerDependenciesMeta:
     "@ama-sdk/core":
       optional: true
     "@angular-devkit/schematics-cli":
       optional: true
-    "@angular/cli":
-      optional: true
     "@angular/compiler":
       optional: true
     "@o3r/schematics":