From 6174a08cfec245b4ca66f59dc3c31fc4acd8f2d3 Mon Sep 17 00:00:00 2001
From: VitoAlbano <vito.albano.123@gmail.com>
Date: Mon, 19 Aug 2024 23:08:10 +0100
Subject: [PATCH] [MIGRATION] - Fixed some issues for project and package json

(cherry picked from commit 97106892be9a3ea4f1068256c5cb2b42049eeb2d)
---
 lib/eslint-angular/project.json     |  2 --
 lib/js-api/package.json             |  1 -
 lib/testing/project.json            |  2 --
 scripts/migration/export-commits.sh | 29 +++++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 scripts/migration/export-commits.sh

diff --git a/lib/eslint-angular/project.json b/lib/eslint-angular/project.json
index 01755b2c2dd..88dbdbd02bb 100644
--- a/lib/eslint-angular/project.json
+++ b/lib/eslint-angular/project.json
@@ -11,7 +11,6 @@
         "projectRoot": "lib/eslint-angular",
         "outputPath": "dist/libs/eslint-plugin-eslint-angular",
         "main": "lib/eslint-angular/index.ts",
-        "generatePackageJson": true,
         "tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json",
         "stylePreprocessorOptions": {
           "includePaths": ["lib", "lib/core/src/lib"]
@@ -24,7 +23,6 @@
           "projectRoot": "lib/eslint-angular",
           "outputPath": "dist/libs/eslint-plugin-eslint-angular",
           "main": "lib/eslint-angular/index.ts",
-          "generatePackageJson": true,
           "tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json"
         }
       },
diff --git a/lib/js-api/package.json b/lib/js-api/package.json
index 33449e43002..8f21673a41e 100644
--- a/lib/js-api/package.json
+++ b/lib/js-api/package.json
@@ -19,7 +19,6 @@
     "superagent": "^9.0.1",
     "tslib": "^2.6.1"
   },
-  "main": "./index.js",
   "typings": "./typings/index.d.ts",
   "module": "./esm5/index.js",
   "es2015": "./esm2015/index.js"
diff --git a/lib/testing/project.json b/lib/testing/project.json
index 8a2ef5c2119..d22c5f2bebe 100644
--- a/lib/testing/project.json
+++ b/lib/testing/project.json
@@ -11,7 +11,6 @@
         "projectRoot": "lib/testing",
         "outputPath": "dist/libs/testing",
         "main": "lib/testing/index.ts",
-        "generatePackageJson": true,
         "tsConfig": "lib/testing/tsconfig.prod.json",
         "target": "node",
         "compiler": "tsc"
@@ -21,7 +20,6 @@
           "projectRoot": "lib/testing",
           "outputPath": "dist/libs/testing",
           "main": "lib/testing/index.ts",
-          "generatePackageJson": true,
           "tsConfig": "lib/testing/tsconfig.prod.json"
         }
       },
diff --git a/scripts/migration/export-commits.sh b/scripts/migration/export-commits.sh
new file mode 100644
index 00000000000..e03f1f4eba7
--- /dev/null
+++ b/scripts/migration/export-commits.sh
@@ -0,0 +1,29 @@
+git fetch
+
+git checkout develop
+git pull --rebase
+git checkout ng16-develop
+git rebase origin/develop
+git push origin ng16-develop --force --no-verify
+echo -e "\e[34m===> Rebase complete \e[0m"
+
+if [ $? -eq 0 ]; then
+    echo -e "\e[34m===> Resetting Migration Branch \e[0m"
+    git checkout ng16-migration
+    git reset --hard origin/develop
+
+    git cherry-pick  --quit
+    echo -e "\e[34m===> Merge changes from cherry pick branch: ng16-develop cherry pick list\e[0m"
+    git cherry-pick `git log --pretty=format:"%H" origin/develop..origin/ng16-develop --grep="[MIGRATION]" --reverse` -x
+    if [ $? -eq 0 ]; then
+        echo -e "\e[34m===> Cherry Picking complete! Pushing... \e[0m"
+        git push origin ng16-migration --force --no-verify
+        echo -e "\e[34m===> Pushed \e[0m"
+    else
+        echo -e "\e[31mThere was some error during cherry-picking of ng16-develop\e[0m"
+        exit 1;
+    fi
+else
+    echo -e "\e[31mThere was some error during rebasing/resetting!\e[0m"
+    exit 1;
+fi