Chore: Move to node 18 again (#62079)

move to node 18 again

.betterer.results

@@ -1622,8 +1622,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"],

.nvmrc

@@ -1 +1 @@
-v16.14.0
+v18.12.0

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG BASE_IMAGE=alpine:3.15
-ARG JS_IMAGE=node:16-alpine3.15
+ARG JS_IMAGE=node:18-alpine3.15
 ARG GO_IMAGE=golang:1.19.4-alpine3.17
 
 ARG GO_SRC=go-builder

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
 ```
 

package.json

@@ -436,7 +436,7 @@
     ]
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "packageManager": "yarn@3.3.0"
 }

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<string, string> = {
   '[': ']',
   '{': '}',
   '(': ')',

public/app/features/dashboard/components/ShareModal/SharePublicDashboard/SharePublicDashboard.test.tsx

@@ -75,6 +75,7 @@ beforeEach(() => {
   config.featureToggles.publicDashboards = true;
   mockDashboard = createDashboardModelFixture({
     uid: 'mockDashboardUid',
+    timezone: 'utc',
   });
 
   mockPanel = new PanelModel({
@@ -172,7 +173,7 @@ describe('SharePublic', () => {
     await renderSharePublicDashboard({ panel: mockPanel, dashboard: mockDashboard, onDismiss: () => {} });
 
     await screen.findByText('Welcome to Grafana public dashboards alpha!');
-    expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 01:59:59')).toBeInTheDocument();
+    expect(screen.getByText('2022-08-30 00:00:00 to 2022-09-04 00:59:59')).toBeInTheDocument();
   });
   it('when modal is opened, then loader spinner appears and inputs are disabled', async () => {
     await renderSharePublicDashboard({ panel: mockPanel, dashboard: mockDashboard, onDismiss: () => {} });

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 - && \

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:<VERSION> .
 docker push grafana/build-container:<VERSION>
 ```
+
+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).

scripts/drone/steps/lib.star

@@ -6,7 +6,7 @@ load(
 )
 
 grabpl_version = 'v3.0.20'
-build_image = 'grafana/build-container:1.6.6'
+build_image = 'grafana/build-container:1.6.7'
 publish_image = 'grafana/grafana-ci-deploy:1.3.3'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
 alpine_image = 'alpine:3.15.6'