Skip to content

Commit

Permalink
[MIGRATION] - Fixed some issues for project and package json
Browse files Browse the repository at this point in the history
(cherry picked from commit 9710689)
  • Loading branch information
VitoAlbano committed Aug 19, 2024
1 parent 16c3955 commit 6174a08
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 5 deletions.
2 changes: 0 additions & 2 deletions lib/eslint-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"
}
},
Expand Down
1 change: 0 additions & 1 deletion lib/js-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions lib/testing/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -21,7 +20,6 @@
"projectRoot": "lib/testing",
"outputPath": "dist/libs/testing",
"main": "lib/testing/index.ts",
"generatePackageJson": true,
"tsConfig": "lib/testing/tsconfig.prod.json"
}
},
Expand Down
29 changes: 29 additions & 0 deletions scripts/migration/export-commits.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6174a08

Please sign in to comment.