RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32699 from tspmelo/wip-npm-audit-fix

Browse Source 
mgr/dashboard: Fix npm vulnerabilities

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
This commit is contained in:
Laura Paduano 2020-01-22 14:44:25 +01:00 committed by GitHub
commit c4f555fda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1215 additions and 1313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pybind/mgr/dashboard/CMakeLists.txt
View File

@ -32,7 +32,7 @@ else()
OUTPUT "${mgr-dashboard-nodeenv-dir}/bin/npm"
COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv-dir}
COMMAND ${mgr-dashboard-nodeenv-dir}/bin/pip install nodeenv
COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.16.0
COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.18.1
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "dashboard nodeenv is being installed"
)

2514
src/pybind/mgr/dashboard/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
src/pybind/mgr/dashboard/frontend/package.json
View File

@ -45,6 +45,7 @@
"fix:tslint": "npm run lint:tslint -- --fix",
"fixmod": "pretty-quick --pattern \"{src,e2e}/**/*.{ts,scss}\" --branch HEAD",
"fix": "npm run fix:tslint; npm run fix:prettier",
"fix:audit": "npx npm-force-resolutions",
"compodoc": "compodoc",
"doc-build": "compodoc -p src/tsconfig.app.json",
"doc-serve": "compodoc --port 8444 -s src/tsconfig.app.json"
@ -112,8 +113,8 @@
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.803.19",
"@angular/cli": "8.3.19",
"@angular-devkit/build-angular": "0.803.23",
"@angular/cli": "8.3.23",
"@angular/compiler-cli": "8.2.14",
"@angular/language-service": "8.2.14",
"@compodoc/compodoc": "1.1.11",
@ -131,7 +132,8 @@
"jest-canvas-mock": "2.2.0",
"jest-preset-angular": "8.0.0",
"jest-silent-reporter": "0.1.2",
"npm-run-all": "^4.1.5",
"npm-force-resolutions": "0.0.3",
"npm-run-all": "4.1.5",
"prettier": "1.18.2",
"pretty-quick": "1.11.1",
"protractor": "5.4.2",
@ -142,5 +144,9 @@
"ts-node": "8.4.1",
"tslint": "5.20.0",
"typescript": "3.5.3"
},
"resolutions": {
"lodash": "4.17.15",
"mem": "4.3.0"
}
}