From 0a3cc5634ebc2a1b88ea8fc553a97196ed6fbf01 Mon Sep 17 00:00:00 2001
From: MichalKinas <113341662+MichalKinas@users.noreply.github.com>
Date: Wed, 14 Jun 2023 12:31:41 +0200
Subject: [PATCH] Fix js-api version in adf-cli (#8665)

* Fix js-api version in adf-cli

* Add caret to js-api version

* CR fix
---
 .github/workflows/upstream-js.yml | 9 +++++----
 lib/cli/package-lock.json         | 8 ++++----
 lib/cli/package.json              | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/upstream-js.yml b/.github/workflows/upstream-js.yml
index b59759c3b1..947c7036c3 100644
--- a/.github/workflows/upstream-js.yml
+++ b/.github/workflows/upstream-js.yml
@@ -113,10 +113,11 @@ jobs:
         run: |
 
           migrateDependenciesJS() {
-              echo "Update JS dependencies to: ${PACKAGE_VERSION_JS}"
-              echo "Calling migration JS"
-              npx nx migrate @alfresco/js-api@${PACKAGE_VERSION_JS}
-              echo "Migration JS done"
+            echo "Update JS dependencies to: ${PACKAGE_VERSION_JS}"
+            echo "Calling migration JS"
+            npx nx migrate @alfresco/js-api@^${PACKAGE_VERSION_JS}
+            (cd lib/cli && npx nx migrate @alfresco/js-api@^${PACKAGE_VERSION_JS})
+            echo "Migration JS done"
           }
 
           regeneratePackageLock() {
diff --git a/lib/cli/package-lock.json b/lib/cli/package-lock.json
index 3995a0a25b..c04ea171c7 100644
--- a/lib/cli/package-lock.json
+++ b/lib/cli/package-lock.json
@@ -9,7 +9,7 @@
       "version": "6.1.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@alfresco/js-api": "^6.1.0-0",
+        "@alfresco/js-api": "^6.2.0-982",
         "commander": "^6.2.1",
         "ejs": "^3.1.9",
         "license-checker": "^25.0.1",
@@ -30,9 +30,9 @@
       }
     },
     "node_modules/@alfresco/js-api": {
-      "version": "6.1.0-927",
-      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.1.0-927.tgz",
-      "integrity": "sha512-GjsDdUn1lGGejPhPsbFyi1NW6fm5Anj9YNLXrEOSa+dqrs987WmmQvlIR1odpHvRD328CxFPV7YlsXAevdIV2A==",
+      "version": "6.2.0-982",
+      "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-6.2.0-982.tgz",
+      "integrity": "sha512-tP7/VblH0QOMAlhjzCW8n/kE9PXA2nwkPisalNVNVtvOa6jVnwMQQlVvfnCRKf+yXX7SQYBMTKbvMA9Io0gBqw==",
       "dependencies": {
         "event-emitter": "^0.3.5",
         "superagent": "^6.0.0",
diff --git a/lib/cli/package.json b/lib/cli/package.json
index 1858c5920b..5e2f80934a 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -20,7 +20,7 @@
     "dist": "rm -rf ../../dist/libs/cli && npm run build && cp -R ./bin ../../dist/libs/cli && cp -R ./resources ../../dist/libs/cli && cp -R ./templates ../../dist/libs/cli && cp ./package.json ../../dist/libs/cli"
   },
   "dependencies": {
-    "@alfresco/js-api": "^6.1.0",
+    "@alfresco/js-api": "^6.2.0-982",
     "commander": "^6.2.1",
     "ejs": "^3.1.9",
     "license-checker": "^25.0.1",