diff --git a/.drone.yml b/.drone.yml index 07831c07af2..e61e5e26c01 100644 --- a/.drone.yml +++ b/.drone.yml @@ -117,14 +117,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - yarn storybook --quiet depends_on: - yarn-install detach: true - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: start-storybook - commands: - npx wait-on@7.2.0 -t 1m http://$HOST:$PORT @@ -175,14 +175,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update git bash - yarn betterer ci depends_on: - yarn-install - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: betterer-frontend - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -229,7 +229,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: test-frontend trigger: event: @@ -314,7 +314,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - yarn run prettier:check @@ -324,7 +324,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: lint-frontend - commands: - |- @@ -337,7 +337,7 @@ steps: \ " depends_on: - yarn-install - image: node:20-bookworm + image: node:22-bookworm name: verify-i18n trigger: event: @@ -667,7 +667,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update jq bash @@ -678,7 +678,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-frontend-packages - failure: ignore image: grafana/drone-downstream @@ -742,7 +742,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-test-plugins - commands: - apk add --update tar bash @@ -870,7 +870,7 @@ steps: HOST: grafana-server PORT: "3001" PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning - image: node:20-bookworm + image: node:22-bookworm name: playwright-plugin-e2e - commands: - apt-get update @@ -960,7 +960,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-storybook when: paths: @@ -1307,7 +1307,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - pip3 install codespell @@ -1320,7 +1320,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1695,7 +1695,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - pip3 install codespell @@ -1708,7 +1708,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana/latest @@ -1771,14 +1771,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update git bash - yarn betterer ci depends_on: - yarn-install - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -1786,7 +1786,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: test-frontend trigger: branch: main @@ -1829,7 +1829,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - yarn run prettier:check @@ -1839,7 +1839,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: lint-frontend - commands: - |- @@ -1852,7 +1852,7 @@ steps: \ " depends_on: - yarn-install - image: node:20-bookworm + image: node:22-bookworm name: verify-i18n trigger: branch: main @@ -2041,14 +2041,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - yarn storybook --quiet depends_on: - yarn-install detach: true - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: start-storybook - commands: - npx wait-on@7.2.0 -t 1m http://$HOST:$PORT @@ -2148,7 +2148,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update jq @@ -2159,7 +2159,7 @@ steps: - yarn install --mode=update-lockfile depends_on: - yarn-install - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: update-package-json-version - commands: - apk add --update jq bash @@ -2171,7 +2171,7 @@ steps: - update-package-json-version environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-frontend-packages - commands: - docker run --privileged --rm tonistiigi/binfmt --install all @@ -2226,7 +2226,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-test-plugins - commands: - apk add --update tar bash @@ -2354,7 +2354,7 @@ steps: HOST: grafana-server PORT: "3001" PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning - image: node:20-bookworm + image: node:22-bookworm name: playwright-plugin-e2e - commands: - apt-get update @@ -2444,7 +2444,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: build-storybook when: paths: @@ -2494,7 +2494,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: publish-frontend-metrics when: repo: @@ -2536,7 +2536,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: release-canary-npm-packages when: paths: @@ -2943,14 +2943,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update git bash - yarn betterer ci depends_on: - yarn-install - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2958,7 +2958,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: test-frontend trigger: branch: @@ -2999,7 +2999,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - yarn run prettier:check @@ -3009,7 +3009,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: lint-frontend - commands: - |- @@ -3022,7 +3022,7 @@ steps: \ " depends_on: - yarn-install - image: node:20-bookworm + image: node:22-bookworm name: verify-i18n trigger: branch: @@ -3863,7 +3863,7 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - ./bin/build artifacts npm retrieve --tag ${DRONE_TAG} @@ -3887,7 +3887,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: release-npm-packages trigger: event: @@ -3922,7 +3922,7 @@ steps: 1\n else\n sleep 60\n fi\n done\n \ " depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: verify-grafanacom trigger: event: @@ -4022,7 +4022,7 @@ steps: \ " depends_on: - publish-grafanacom - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: verify-grafanacom trigger: event: @@ -4446,14 +4446,14 @@ steps: - commands: - yarn install --immutable || yarn install --immutable depends_on: [] - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: yarn-install - commands: - apk add --update git bash - yarn betterer ci depends_on: - yarn-install - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4461,7 +4461,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: node:20.9.0-alpine + image: node:22.11.0-alpine name: test-frontend trigger: cron: @@ -5443,8 +5443,8 @@ steps: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.23.1-alpine - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22.11.0-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:22-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.3 @@ -5482,8 +5482,8 @@ steps: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.23.1-alpine - - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm + - trivy --exit-code 1 --severity HIGH,CRITICAL node:22.11.0-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL node:22-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.3 @@ -5751,6 +5751,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 04ba0c9b8e69705a28a24ba03de14ece0b15c4b44f6262fcbc6a9ee874b5a9db +hmac: 08edb24b8ec53e0ce09f525cf6fdf4ea5dc67710fe64c3ea93ceaf3af42b8305 ... diff --git a/.github/workflows/detect-breaking-changes-levitate.yml b/.github/workflows/detect-breaking-changes-levitate.yml index 408c71e6455..70c823483d9 100644 --- a/.github/workflows/detect-breaking-changes-levitate.yml +++ b/.github/workflows/detect-breaking-changes-levitate.yml @@ -31,7 +31,7 @@ jobs: path: './pr' - uses: actions/setup-node@v4 with: - node-version: 20.9.0 + node-version: 22.11.0 - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -79,7 +79,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20.9.0 + node-version: 22.11.0 - name: Get yarn cache directory path id: yarn-cache-dir-path @@ -126,7 +126,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20.9.0 + node-version: 22.11.0 - name: Get built packages from pr uses: actions/download-artifact@v4 diff --git a/.nvmrc b/.nvmrc index 805b5a4e00b..bb8c76c68e2 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.9.0 +v22.11.0 diff --git a/Dockerfile b/Dockerfile index dc326221eb0..324597b0254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=alpine:3.20 -ARG JS_IMAGE=node:20-alpine +ARG JS_IMAGE=node:22-alpine ARG JS_PLATFORM=linux/amd64 ARG GO_IMAGE=golang:1.23.1-alpine diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index 804daa903e0..9a4d98d8003 100644 --- a/contribute/developer-guide.md +++ b/contribute/developer-guide.md @@ -18,7 +18,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen ``` brew install git brew install go -brew install node@20 +brew install node@22 brew install corepack corepack enable ``` diff --git a/e2e/test-plugins/grafana-extensionstest-app/package.json b/e2e/test-plugins/grafana-extensionstest-app/package.json index fe2cf427950..e071c25cf66 100644 --- a/e2e/test-plugins/grafana-extensionstest-app/package.json +++ b/e2e/test-plugins/grafana-extensionstest-app/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@grafana/plugin-configs": "workspace:*", "@types/lodash": "4.17.7", - "@types/node": "20.14.14", + "@types/node": "22.10.2", "@types/prismjs": "1.26.4", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/e2e/test-plugins/grafana-test-datasource/package.json b/e2e/test-plugins/grafana-test-datasource/package.json index 98f5bab46cf..519ba9f2731 100644 --- a/e2e/test-plugins/grafana-test-datasource/package.json +++ b/e2e/test-plugins/grafana-test-datasource/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@grafana/plugin-configs": "11.5.0-pre", "@types/lodash": "4.17.7", - "@types/node": "20.14.14", + "@types/node": "22.10.2", "@types/prismjs": "1.26.4", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/package.json b/package.json index 3d0dc685fd4..031790f1409 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@types/lodash": "4.17.13", "@types/logfmt": "^1.2.3", "@types/lucene": "^2", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/node-forge": "^1", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.4", "@types/pluralize": "^0.0.33", @@ -448,7 +448,7 @@ ] }, "engines": { - "node": ">= 20" + "node": ">= 22" }, "packageManager": "yarn@4.5.3", "dependenciesMeta": { diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index af55235aa81..bf294d4cf70 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -66,7 +66,7 @@ "@types/dompurify": "^3.0.0", "@types/history": "4.7.11", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/papaparse": "5.3.15", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 10d4d6d62df..67ed12e44c8 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -40,7 +40,7 @@ }, "devDependencies": { "@rollup/plugin-node-resolve": "15.3.0", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/semver": "7.5.8", "esbuild": "0.24.0", "rimraf": "6.0.1", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index bd89eddf7f9..fb19a78a9b4 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -68,7 +68,7 @@ "@types/d3": "^7", "@types/jest": "^29.5.4", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-virtualized-auto-sizer": "1.0.4", "@types/tinycolor2": "1.4.6", diff --git a/packages/grafana-icons/package.json b/packages/grafana-icons/package.json index 3da9b39aeed..4b1f5bc29cb 100644 --- a/packages/grafana-icons/package.json +++ b/packages/grafana-icons/package.json @@ -45,7 +45,7 @@ "@svgr/plugin-prettier": "^8.1.0", "@svgr/plugin-svgo": "^8.1.0", "@types/babel__core": "^7", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "esbuild": "0.24.0", diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index eef5c567570..93a0668ecdb 100644 --- a/packages/grafana-o11y-ds-frontend/package.json +++ b/packages/grafana-o11y-ds-frontend/package.json @@ -36,7 +36,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/jest": "^29.5.4", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/systemjs": "6.15.1", "jest": "^29.6.4", diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 5980575d5f2..f8ea06e3423 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -92,7 +92,7 @@ "@types/jest": "29.5.14", "@types/jquery": "3.5.32", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/pluralize": "^0.0.33", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index c5b2888db46..d1d539a4a06 100644 --- a/packages/grafana-sql/package.json +++ b/packages/grafana-sql/package.json @@ -42,7 +42,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "^29.5.4", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "@types/react-virtualized-auto-sizer": "1.0.4", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 665db5f4d5f..d67a177f0d4 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -144,7 +144,7 @@ "@types/is-hotkey": "0.1.10", "@types/jest": "29.5.14", "@types/mock-raf": "1.0.6", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", "@types/react-color": "3.0.12", diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 76e07e77b51..d9b89b0c373 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -33,7 +33,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 871b77b7cbe..fae06f0ce64 100644 --- a/public/app/plugins/datasource/cloud-monitoring/package.json +++ b/public/app/plugins/datasource/cloud-monitoring/package.json @@ -35,7 +35,7 @@ "@types/debounce-promise": "3.1.9", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json index 1cbbf04b7a9..c8dd82e5398 100644 --- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json +++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json @@ -23,7 +23,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "ts-node": "10.9.2", "typescript": "5.5.4", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index abea7a88eed..46381b60009 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -27,7 +27,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index 74696b23884..98d66817aeb 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -30,7 +30,7 @@ "@types/d3-random": "^3.0.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "@types/uuid": "9.0.8", diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json index ea8ce4d9a84..69c34d37e15 100644 --- a/public/app/plugins/datasource/jaeger/package.json +++ b/public/app/plugins/datasource/jaeger/package.json @@ -31,7 +31,7 @@ "@types/jest": "29.5.14", "@types/lodash": "4.17.13", "@types/logfmt": "^1.2.3", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "@types/react-window": "1.8.8", diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json index c4ea78cfbbc..3fa83058650 100644 --- a/public/app/plugins/datasource/mssql/package.json +++ b/public/app/plugins/datasource/mssql/package.json @@ -23,7 +23,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "ts-node": "10.9.2", "typescript": "5.5.4", diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json index b3bd70432d5..f4eba056126 100644 --- a/public/app/plugins/datasource/mysql/package.json +++ b/public/app/plugins/datasource/mysql/package.json @@ -23,7 +23,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "ts-node": "10.9.2", "typescript": "5.5.4", diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index 3657e81b193..2db8b77cd13 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -23,7 +23,7 @@ "@testing-library/react": "16.0.1", "@testing-library/user-event": "14.5.2", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "ts-node": "10.9.2", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 68f3ebae996..bd64af43cc8 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -46,7 +46,7 @@ "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/prismjs": "1.26.5", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 14cc700877a..27bb1b61f48 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -26,7 +26,7 @@ "@testing-library/react": "16.0.1", "@types/jest": "29.5.14", "@types/lodash": "4.17.13", - "@types/node": "20.16.15", + "@types/node": "22.10.2", "@types/react": "18.3.3", "@types/react-dom": "18.2.25", "ts-node": "10.9.2", diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 1ab4fc7590d..bd9536ee040 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -6,4 +6,4 @@ grabpl_version = "v3.1.1" golang_version = "1.23.1" # nodejs_version should match what's in ".nvmrc", but without the v prefix. -nodejs_version = "20.9.0" +nodejs_version = "22.11.0" diff --git a/yarn.lock b/yarn.lock index 75f2246a467..6416fc3773a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2800,7 +2800,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -2842,7 +2842,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" react: "npm:18.2.0" @@ -2872,7 +2872,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -2914,7 +2914,7 @@ __metadata: "@types/d3-random": "npm:^3.0.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" "@types/uuid": "npm:9.0.8" @@ -2955,7 +2955,7 @@ __metadata: "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" "@types/logfmt": "npm:^1.2.3" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" "@types/react-window": "npm:1.8.8" @@ -2995,7 +2995,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" react: "npm:18.2.0" @@ -3026,7 +3026,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" lodash: "npm:4.17.21" react: "npm:18.2.0" @@ -3054,7 +3054,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" lodash: "npm:4.17.21" @@ -3092,7 +3092,7 @@ __metadata: "@types/debounce-promise": "npm:3.1.9" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3147,7 +3147,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3197,7 +3197,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@types/jest": "npm:29.5.14" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" lodash: "npm:4.17.21" @@ -3256,7 +3256,7 @@ __metadata: "@types/dompurify": "npm:^3.0.0" "@types/history": "npm:4.7.11" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/papaparse": "npm:5.3.15" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -3303,7 +3303,7 @@ __metadata: dependencies: "@grafana/tsconfig": "npm:^2.0.0" "@rollup/plugin-node-resolve": "npm:15.3.0" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/semver": "npm:7.5.8" esbuild: "npm:0.24.0" rimraf: "npm:6.0.1" @@ -3464,7 +3464,7 @@ __metadata: "@types/d3": "npm:^7" "@types/jest": "npm:^29.5.4" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-virtualized-auto-sizer": "npm:1.0.4" "@types/tinycolor2": "npm:1.4.6" @@ -3548,7 +3548,7 @@ __metadata: "@testing-library/react": "npm:16.0.1" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:^29.5.4" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/systemjs": "npm:6.15.1" jest: "npm:^29.6.4" @@ -3638,7 +3638,7 @@ __metadata: "@types/jest": "npm:29.5.14" "@types/jquery": "npm:3.5.32" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/pluralize": "npm:^0.0.33" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" @@ -3770,7 +3770,7 @@ __metadata: "@svgr/plugin-prettier": "npm:^8.1.0" "@svgr/plugin-svgo": "npm:^8.1.0" "@types/babel__core": "npm:^7" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" esbuild: "npm:0.24.0" @@ -3869,7 +3869,7 @@ __metadata: "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:^29.5.4" "@types/lodash": "npm:4.17.13" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" "@types/react-virtualized-auto-sizer": "npm:1.0.4" @@ -3956,7 +3956,7 @@ __metadata: "@types/jquery": "npm:3.5.32" "@types/lodash": "npm:4.17.13" "@types/mock-raf": "npm:1.0.6" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.5" "@types/react": "npm:18.3.3" "@types/react-color": "npm:3.0.12" @@ -8409,7 +8409,7 @@ __metadata: "@grafana/schema": "workspace:*" "@grafana/ui": "workspace:*" "@types/lodash": "npm:4.17.7" - "@types/node": "npm:20.14.14" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.4" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -8441,7 +8441,7 @@ __metadata: "@grafana/schema": "workspace:*" "@grafana/ui": "workspace:*" "@types/lodash": "npm:4.17.7" - "@types/node": "npm:20.14.14" + "@types/node": "npm:22.10.2" "@types/prismjs": "npm:1.26.4" "@types/react": "npm:18.3.3" "@types/react-dom": "npm:18.2.25" @@ -9511,30 +9511,30 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=10.0.0, @types/node@npm:>=13.7.0, @types/node@npm:>=13.7.4, @types/node@npm:^22.0.0": - version: 22.10.1 - resolution: "@types/node@npm:22.10.1" +"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^22.0.0": + version: 22.9.0 + resolution: "@types/node@npm:22.9.0" dependencies: - undici-types: "npm:~6.20.0" - checksum: 10/c802a526da2f3fa3ccefd00a71244e7cb825329951719e79e8fec62b1dbc2855388c830489770611584665ce10be23c05ed585982038b24924e1ba2c2cce03fd + undici-types: "npm:~6.19.8" + checksum: 10/a7df3426891868b0f5fb03e46aeddd8446178233521c624a44531c92a040cf08a82d8235f7e1e02af731fd16984665d4d71f3418caf9c2788313b10f040d615d languageName: node linkType: hard -"@types/node@npm:20.14.14": - version: 20.14.14 - resolution: "@types/node@npm:20.14.14" +"@types/node@npm:22.10.2": + version: 22.10.2 + resolution: "@types/node@npm:22.10.2" dependencies: - undici-types: "npm:~5.26.4" - checksum: 10/035bc347e3de04888d537801e23eb4b4f99522975ca002dbfef978edd853710031b7cd43bf022670d6aba4ed5d4ac75ea1b5ff77ff8f80998bffd943b7bcef48 + undici-types: "npm:~6.20.0" + checksum: 10/451adfefed4add58b069407173e616220fd4aaa3307cdde1bb701aa053b65b54ced8483db2f870dcedec7a58cb3b06101fbc19d85852716672ec1fd3660947fa languageName: node linkType: hard -"@types/node@npm:20.16.15": - version: 20.16.15 - resolution: "@types/node@npm:20.16.15" +"@types/node@npm:>=10.0.0, @types/node@npm:>=13.7.4": + version: 22.10.1 + resolution: "@types/node@npm:22.10.1" dependencies: - undici-types: "npm:~6.19.2" - checksum: 10/f4706676fdff05c7fb188399da578bbcce9260f889cfd767f1c3ee4fb33c369eb1ffa24161651ea3ef5b6a33e2e9b66f393949cab2be77d019277a1e16a7af36 + undici-types: "npm:~6.20.0" + checksum: 10/c802a526da2f3fa3ccefd00a71244e7cb825329951719e79e8fec62b1dbc2855388c830489770611584665ce10be23c05ed585982038b24924e1ba2c2cce03fd languageName: node linkType: hard @@ -17646,7 +17646,7 @@ __metadata: "@types/lodash": "npm:4.17.13" "@types/logfmt": "npm:^1.2.3" "@types/lucene": "npm:^2" - "@types/node": "npm:20.16.15" + "@types/node": "npm:22.10.2" "@types/node-forge": "npm:^1" "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.4" "@types/pluralize": "npm:^0.0.33" @@ -29808,14 +29808,7 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10/0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd - languageName: node - linkType: hard - -"undici-types@npm:~6.19.2": +"undici-types@npm:~6.19.8": version: 6.19.8 resolution: "undici-types@npm:6.19.8" checksum: 10/cf0b48ed4fc99baf56584afa91aaffa5010c268b8842f62e02f752df209e3dea138b372a60a963b3b2576ed932f32329ce7ddb9cb5f27a6c83040d8cd74b7a70