mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-09-10 14:11:42 +00:00
[MIGRATION] - Fixed some issues for project and package json
This commit is contained in:
@@ -11,7 +11,6 @@
|
|||||||
"projectRoot": "lib/eslint-angular",
|
"projectRoot": "lib/eslint-angular",
|
||||||
"outputPath": "dist/libs/eslint-plugin-eslint-angular",
|
"outputPath": "dist/libs/eslint-plugin-eslint-angular",
|
||||||
"main": "lib/eslint-angular/index.ts",
|
"main": "lib/eslint-angular/index.ts",
|
||||||
"generatePackageJson": true,
|
|
||||||
"tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json",
|
"tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json",
|
||||||
"stylePreprocessorOptions": {
|
"stylePreprocessorOptions": {
|
||||||
"includePaths": ["lib", "lib/core/src/lib"]
|
"includePaths": ["lib", "lib/core/src/lib"]
|
||||||
@@ -24,7 +23,6 @@
|
|||||||
"projectRoot": "lib/eslint-angular",
|
"projectRoot": "lib/eslint-angular",
|
||||||
"outputPath": "dist/libs/eslint-plugin-eslint-angular",
|
"outputPath": "dist/libs/eslint-plugin-eslint-angular",
|
||||||
"main": "lib/eslint-angular/index.ts",
|
"main": "lib/eslint-angular/index.ts",
|
||||||
"generatePackageJson": true,
|
|
||||||
"tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json"
|
"tsConfig": "lib/eslint-angular/tsconfig.lib.prod.json"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
"superagent": "^9.0.1",
|
"superagent": "^9.0.1",
|
||||||
"tslib": "^2.6.1"
|
"tslib": "^2.6.1"
|
||||||
},
|
},
|
||||||
"main": "./index.js",
|
|
||||||
"typings": "./typings/index.d.ts",
|
"typings": "./typings/index.d.ts",
|
||||||
"module": "./esm5/index.js",
|
"module": "./esm5/index.js",
|
||||||
"es2015": "./esm2015/index.js"
|
"es2015": "./esm2015/index.js"
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
"projectRoot": "lib/testing",
|
"projectRoot": "lib/testing",
|
||||||
"outputPath": "dist/libs/testing",
|
"outputPath": "dist/libs/testing",
|
||||||
"main": "lib/testing/index.ts",
|
"main": "lib/testing/index.ts",
|
||||||
"generatePackageJson": true,
|
|
||||||
"tsConfig": "lib/testing/tsconfig.prod.json",
|
"tsConfig": "lib/testing/tsconfig.prod.json",
|
||||||
"target": "node",
|
"target": "node",
|
||||||
"compiler": "tsc"
|
"compiler": "tsc"
|
||||||
@@ -21,7 +20,6 @@
|
|||||||
"projectRoot": "lib/testing",
|
"projectRoot": "lib/testing",
|
||||||
"outputPath": "dist/libs/testing",
|
"outputPath": "dist/libs/testing",
|
||||||
"main": "lib/testing/index.ts",
|
"main": "lib/testing/index.ts",
|
||||||
"generatePackageJson": true,
|
|
||||||
"tsConfig": "lib/testing/tsconfig.prod.json"
|
"tsConfig": "lib/testing/tsconfig.prod.json"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -14,10 +14,10 @@ if [ $? -eq 0 ]; then
|
|||||||
|
|
||||||
git cherry-pick --quit
|
git cherry-pick --quit
|
||||||
echo -e "\e[34m===> Merge changes from cherry pick branch: ng16-develop cherry pick list\e[0m"
|
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 --reverse` -x
|
git cherry-pick `git log --pretty=format:"%H" origin/develop..origin/ng16-develop --grep="[MIGRATION]" --reverse` -x
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo -e "\e[34m===> Cherry Picking complete! Pushing... \e[0m"
|
echo -e "\e[34m===> Cherry Picking complete! Pushing... \e[0m"
|
||||||
# git push origin ng16-migration --force --no-verify
|
git push origin ng16-migration --force --no-verify
|
||||||
echo -e "\e[34m===> Pushed \e[0m"
|
echo -e "\e[34m===> Pushed \e[0m"
|
||||||
else
|
else
|
||||||
echo -e "\e[31mThere was some error during cherry-picking of ng16-develop\e[0m"
|
echo -e "\e[31mThere was some error during cherry-picking of ng16-develop\e[0m"
|
||||||
|
Reference in New Issue
Block a user