Skip to content

Commit

Permalink
mgr/dashboard: update npm packages (ceph#28343)
Browse files Browse the repository at this point in the history
mgr/dashboard: update npm packages

Reviewed-by: Ernesto Puerta <[email protected]>
Reviewed-by: Laura Paduano <[email protected]>
Reviewed-by: Ricardo Marques <[email protected]>
Reviewed-by: Volker Theile <[email protected]>
  • Loading branch information
Lenz Grimmer authored Aug 5, 2019
2 parents 9f4b2be + 7f7f8a4 commit 7a6f741
Show file tree
Hide file tree
Showing 62 changed files with 6,271 additions and 6,223 deletions.
4 changes: 2 additions & 2 deletions make-dist
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ 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=10.13.0
$TEMP_DIR/bin/nodeenv -p --node=10.16.0
cd src/pybind/mgr/dashboard/frontend
. $TEMP_DIR/bin/activate
timeout 1h npm ci
NG_CLI_ANALYTICS="false" timeout 1h npm ci
npm run build -- --prod --progress=false
deactivate
cd $CURR_DIR
Expand Down
4 changes: 2 additions & 2 deletions src/pybind/mgr/dashboard/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if(WITH_SYSTEM_NPM)
set(mgr-dashboard-nodeenv-dir )
set(nodeenv "")
add_custom_target(mgr-dashboard-frontend-deps
DEPENDS frontend/node_modules
DEPENDS frontend/node_modules
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
)
else()
Expand All @@ -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=10.13.0
COMMAND ${mgr-dashboard-nodeenv-dir}/bin/nodeenv -p --node=10.16.0
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "dashboard nodeenv is being installed"
)
Expand Down
9 changes: 6 additions & 3 deletions src/pybind/mgr/dashboard/frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
]
}
}
}
},
"cli": {}
},
"ceph-dashboard-e2e": {
"root": "",
Expand All @@ -112,7 +113,8 @@
]
}
}
}
},
"cli": {}
}
},
"defaultProject": "ceph-dashboard",
Expand All @@ -124,5 +126,6 @@
"@schematics/angular:directive": {
"prefix": "cd"
}
}
},
"cli": {}
}
12 changes: 12 additions & 0 deletions src/pybind/mgr/dashboard/frontend/browserslist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
Loading

0 comments on commit 7a6f741

Please sign in to comment.