mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Add version in web/ui/package-lock.json (#12771)

Browse source 
This commit adds the option --include-workspace-root in ui_release.sh
npm scripts in order to also include the version in web/ui/pagkage jsons
files when bumping the version. This also avoids issues when building
directly with npm install on some systems.

Signed-off-by: Daniel Mellado <dmellado@redhat.com>
This commit is contained in:
Daniel Mellado 2023-09-01 10:38:15 +02:00 committed by GitHub
parent 1df0fb5569
commit 6ee3db15e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/ui_release.sh
View file

@ -85,7 +85,7 @@ function bumpVersion() {
fi fi
done done
# increase the version on all packages # increase the version on all packages
npm version "${version}" --workspaces npm version "${version}" --workspaces --include-workspace-root
} }
if [[ "$1" == "--copy" ]]; then if [[ "$1" == "--copy" ]]; then

4
web/ui/README.md
View file

@ -1,9 +1,9 @@
## Overview ## Overview
The `ui` directory contains static files and templates used in the web UI. For The `ui` directory contains static files and templates used in the web UI. For
easier distribution they are compressed (c.f. Makefile) and statically compiled easier distribution they are compressed (c.f. Makefile) and statically compiled
into the Prometheus binary using the embed package. into the Prometheus binary using the embed package.
During development it is more convenient to always use the files on disk to During development it is more convenient to always use the files on disk to
directly see changes without recompiling. directly see changes without recompiling.
To make this work, remove the `builtinassets` build tag in the `flags` entry To make this work, remove the `builtinassets` build tag in the `flags` entry
in `.promu.yml`, and then `make build` (or build Prometheus using in `.promu.yml`, and then `make build` (or build Prometheus using

2
web/ui/package-lock.json generated
View file

@ -1,10 +1,12 @@
{ {
"name": "prometheus-io", "name": "prometheus-io",
"version": "0.46.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "prometheus-io", "name": "prometheus-io",
"version": "0.46.0",
"workspaces": [ "workspaces": [
"react-app", "react-app",
"module/*" "module/*"

3
web/ui/package.json
View file

@ -27,5 +27,6 @@
"react-scripts": "^5.0.1", "react-scripts": "^5.0.1",
"ts-jest": "^29.1.0", "ts-jest": "^29.1.0",
"typescript": "^4.9.5" "typescript": "^4.9.5"
} },
"version": "0.46.0"
} }