diff --git a/.betterer.results b/.betterer.results index d7809d85b8b..43a15b6825b 100644 --- a/.betterer.results +++ b/.betterer.results @@ -1659,8 +1659,7 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], "packages/grafana-ui/src/slate-plugins/braces.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"] + [0, 0, 0, "Do not use any type assertions.", "0"] ], "packages/grafana-ui/src/slate-plugins/slate-prism/index.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], diff --git a/.github/workflows/doc-validator.yml b/.github/workflows/doc-validator.yml index 695b07ef338..5444eef33a0 100644 --- a/.github/workflows/doc-validator.yml +++ b/.github/workflows/doc-validator.yml @@ -7,10 +7,10 @@ jobs: doc-validator: runs-on: "ubuntu-latest" container: - image: "grafana/doc-validator:v1.5.0" + image: "grafana/doc-validator:v1.9.0" steps: - name: "Checkout code" uses: "actions/checkout@v3" - name: "Run doc-validator tool" # Ensure that the CI always passes until all errors are resolved. - run: "doc-validator ./docs/sources || true" + run: "doc-validator --skip-image-validation ./docs/sources /docs/grafana/latest || true" diff --git a/.nvmrc b/.nvmrc index bf79505bb85..9dfef472196 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.14.0 +v18.12.0 diff --git a/contribute/developer-guide.md b/contribute/developer-guide.md index 202d9e192b2..fb20192b939 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@16 +brew install node@18 npm install -g yarn ``` diff --git a/package.json b/package.json index 2554095324d..5498b8304fa 100644 --- a/package.json +++ b/package.json @@ -433,7 +433,7 @@ ] }, "engines": { - "node": ">= 16" + "node": ">= 18" }, "packageManager": "yarn@3.2.4" } diff --git a/packages/grafana-ui/src/slate-plugins/braces.ts b/packages/grafana-ui/src/slate-plugins/braces.ts index 7af64918c11..d05360fffa6 100644 --- a/packages/grafana-ui/src/slate-plugins/braces.ts +++ b/packages/grafana-ui/src/slate-plugins/braces.ts @@ -2,7 +2,7 @@ import { Annotation } from 'slate'; import { Plugin } from 'slate-react'; import { v4 as uuidv4 } from 'uuid'; -const BRACES: any = { +const BRACES: Record = { '[': ']', '{': '}', '(': ')', diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx index aa5bafaea12..b53775a64c2 100644 --- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx +++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx @@ -71,6 +71,7 @@ beforeEach(() => { config.featureToggles.publicDashboards = true; mockDashboard = new DashboardModel({ uid: 'mockDashboardUid', + timezone: 'utc', }); mockPanel = new PanelModel({ diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index a0c1e6f792c..32c90995f10 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -105,7 +105,7 @@ FROM debian:buster-20220822 ENV GOVERSION=1.19.4 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=16.14.0-1nodesource1 \ + NODEVERSION=18.12.0-1nodesource1 \ YARNVERSION=1.22.19-1 # Use ARG so as not to persist environment variable in image @@ -141,7 +141,7 @@ RUN apt-get update && \ gem install --conservative -N fpm && \ ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil && \ curl -fsS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - curl -O https://deb.nodesource.com/node_16.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ + curl -O https://deb.nodesource.com/node_18.x/pool/main/n/nodejs/nodejs_${NODEVERSION}_amd64.deb &&\ dpkg -i nodejs_${NODEVERSION}_amd64.deb &&\ rm nodejs_${NODEVERSION}_amd64.deb &&\ curl -fsS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ diff --git a/scripts/build/ci-build/README.md b/scripts/build/ci-build/README.md index 00d396d4b36..72bd15705f7 100644 --- a/scripts/build/ci-build/README.md +++ b/scripts/build/ci-build/README.md @@ -14,3 +14,5 @@ In order to build and publish the Grafana build Docker image, execute the follow docker build -t grafana/build-container: . docker push grafana/build-container: ``` + +If you're running on a machine that has an ARM chip (Apple M1/M2, etc.), add `--platform linux/amd64` to the `docker build` command. It can take approximately four hours for an initial build to complete. Due to caching, subsequent builds take less time (~10 mins or so).