RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24932 from tspmelo/wip-nodejs-update

Browse Source 
mgr/dashboard: Update Node.js to current LTS

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
This commit is contained in:
Lenz Grimmer 2018-11-19 13:16:28 +01:00 committed by GitHub
commit cb4e28a140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make-dist
View File

@ -80,10 +80,9 @@ build_dashboard_frontend() {
TEMP_DIR=`mktemp -d`
$CURR_DIR/src/tools/setup-virtualenv.sh --python=$(_python_autoselect) $TEMP_DIR
$TEMP_DIR/bin/pip install nodeenv
$TEMP_DIR/bin/nodeenv -p --node=8.11.3
$TEMP_DIR/bin/nodeenv -p --node=10.13.0
cd src/pybind/mgr/dashboard/frontend
. $TEMP_DIR/bin/activate
npm i -g npm --unsafe-perm
npm ci
npm run build -- --prod --progress=false
deactivate

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

@ -43,7 +43,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=8.11.3
COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.13.0
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "dashboard nodeenv is being installed"
)
@ -59,7 +59,7 @@ endif()
add_npm_command(
OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
COMMAND npm i -g npm@6.2.0 --unsafe-perm && npm ci
COMMAND npm ci
DEPENDS frontend/package.json
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
COMMENT "dashboard frontend dependencies are being installed"

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

@ -932,9 +932,9 @@
"dev": true
},
"@types/node": {
"version": "8.10.37",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.37.tgz",
"integrity": "sha512-Jp39foY8Euv/PG4OGPyzxis82mnjcUtXLEMA8oFMCE4ilmuJgZPdV2nZNV1moz+99EJTtcpOSgDCgATUwABKig==",
"version": "10.12.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz",
"integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ==",
"dev": true
},
"@types/q": {

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

@ -79,7 +79,7 @@
"@types/jasminewd2": "2.0.5",
"@types/jest": "23.3.9",
"@types/lodash": "4.14.117",
"@types/node": "8.10.37",
"@types/node": "10.12.2",
"babel-preset-env": "1.7.0",
"codelyzer": "4.5.0",
"html-linter": "1.1.0",