mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2024-11-22 00:37:36 -06:00
Add various make targets for auditing the Python and JS modules. Update the install-node target so that it de-dupes JS modules.
Original patch by Aditya, with further work from Ashesh and I.
This commit is contained in:
parent
99a8b70e00
commit
8780462708
2
.gitignore
vendored
2
.gitignore
vendored
@ -43,3 +43,5 @@ web/pgAdmin/static/js/generated
|
|||||||
web/pgadmin/static/js/generated
|
web/pgadmin/static/js/generated
|
||||||
web/yarn-error.log
|
web/yarn-error.log
|
||||||
/web/cacert.pem
|
/web/cacert.pem
|
||||||
|
auditjs.html
|
||||||
|
auditpy.txt
|
||||||
|
19
Makefile
19
Makefile
@ -20,7 +20,12 @@ appbundle: docs
|
|||||||
./pkg/mac/build.sh
|
./pkg/mac/build.sh
|
||||||
|
|
||||||
install-node:
|
install-node:
|
||||||
cd web && yarn install
|
cd web && npm install
|
||||||
|
cd web && npm audit fix
|
||||||
|
rm -f web/yarn.lock
|
||||||
|
cd web && yarn import
|
||||||
|
cd web && yarn audit
|
||||||
|
rm -f package-lock.json
|
||||||
|
|
||||||
bundle:
|
bundle:
|
||||||
cd web && yarn run bundle
|
cd web && yarn run bundle
|
||||||
@ -34,6 +39,18 @@ linter:
|
|||||||
check: install-node bundle linter check-pep8
|
check: install-node bundle linter check-pep8
|
||||||
cd web && yarn run karma start --single-run && python regression/runtests.py
|
cd web && yarn run karma start --single-run && python regression/runtests.py
|
||||||
|
|
||||||
|
check-audit:
|
||||||
|
cd web && yarn run audit
|
||||||
|
|
||||||
|
check-auditjs:
|
||||||
|
cd web && yarn run auditjs
|
||||||
|
|
||||||
|
check-auditjs-html:
|
||||||
|
cd web && yarn run auditjs-html
|
||||||
|
|
||||||
|
check-auditpy:
|
||||||
|
cd web && yarn run auditpy
|
||||||
|
|
||||||
check-pep8:
|
check-pep8:
|
||||||
pycodestyle --config=.pycodestyle docs/
|
pycodestyle --config=.pycodestyle docs/
|
||||||
pycodestyle --config=.pycodestyle pkg/
|
pycodestyle --config=.pycodestyle pkg/
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
requests>=2.21.0
|
requests>=2.21.0
|
||||||
requests[security]>=2.21.0
|
requests[security]>=2.21.0
|
||||||
|
safety==1.8.5
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
"IMPORTANT:",
|
"IMPORTANT:",
|
||||||
"If runtime or build time dependencies are changed in this file, the ",
|
"If runtime or build time dependencies are changed in this file, the ",
|
||||||
"committer *must* ensure the DEB and RPM package maintainers are informed ",
|
"committer *must* ensure the DEB and RPM package maintainers are informed ",
|
||||||
"as soon as possible."],
|
"as soon as possible."
|
||||||
|
],
|
||||||
"license": "PostgreSQL",
|
"license": "PostgreSQL",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/core": "~7.3.4",
|
"@babel/core": "~7.3.4",
|
||||||
@ -39,13 +40,14 @@
|
|||||||
"uglifyjs-webpack-plugin": "^2.1.2",
|
"uglifyjs-webpack-plugin": "^2.1.2",
|
||||||
"url-loader": "^1.1.2",
|
"url-loader": "^1.1.2",
|
||||||
"webpack": "^4.29.6",
|
"webpack": "^4.29.6",
|
||||||
"webpack-cli": "^3.2.3"
|
"webpack-cli": "^3.2.3",
|
||||||
|
"yarn-audit-html": "^1.1.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/polyfill": "^7.2.5",
|
"@babel/polyfill": "^7.2.5",
|
||||||
"acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
|
"acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
|
||||||
"alertifyjs": "1.7.1",
|
"alertifyjs": "1.7.1",
|
||||||
"axios": "^0.18.0",
|
"axios": "^0.18.1",
|
||||||
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
|
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
|
||||||
"babel-preset-es2015-without-strict": "~0.0.4",
|
"babel-preset-es2015-without-strict": "~0.0.4",
|
||||||
"babelify": "~10.0.0",
|
"babelify": "~10.0.0",
|
||||||
@ -108,6 +110,10 @@
|
|||||||
"test:karma": "yarn run linter && yarn run karma start",
|
"test:karma": "yarn run linter && yarn run karma start",
|
||||||
"test:feature": "yarn run bundle && python regression/runtests.py --pkg feature_tests",
|
"test:feature": "yarn run bundle && python regression/runtests.py --pkg feature_tests",
|
||||||
"test": "yarn run test:karma-once && yarn run bundle && python regression/runtests.py",
|
"test": "yarn run test:karma-once && yarn run bundle && python regression/runtests.py",
|
||||||
"pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web"
|
"pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web",
|
||||||
|
"auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html",
|
||||||
|
"auditjs": "yarn audit",
|
||||||
|
"auditpy": "safety check --full-report",
|
||||||
|
"audit": "yarn run auditjs && yarn run auditpy"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4045
web/yarn.lock
4045
web/yarn.lock
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user