Skip to content

Commit

Permalink
[7.17] Bump Node.js from 18.17.1 to 18.18.2 (#168914) (#169058)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `7.17`:
- [Bump Node.js from 18.17.1 to 18.18.2
(#168914)](#168914)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Thomas
Watson","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-10-16T13:50:15Z","message":"Bump
Node.js from 18.17.1 to 18.18.2
(#168914)","sha":"217929a636afe0c6c6ee8990e42dc4bb8d771123","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["blocker","Team:uptime","release_note:skip","backport:all-open","v8.12.0","v8.10.4"],"number":168914,"url":"https://github.com/elastic/kibana/pull/168914","mergeCommit":{"message":"Bump
Node.js from 18.17.1 to 18.18.2
(#168914)","sha":"217929a636afe0c6c6ee8990e42dc4bb8d771123"}},"sourceBranch":"main","suggestedTargetBranches":["8.10"],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/168914","number":168914,"mergeCommit":{"message":"Bump
Node.js from 18.17.1 to 18.18.2
(#168914)","sha":"217929a636afe0c6c6ee8990e42dc4bb8d771123"}},{"branch":"8.10","label":"v8.10.4","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"url":"https://github.com/elastic/kibana/pull/168966","number":168966,"branch":"8.11","state":"OPEN"}]}]
BACKPORT-->
  • Loading branch information
Thomas Watson authored Oct 17, 2023
1 parent 117d2d8 commit 0a2c338
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts

ARG NODE_VERSION=18.17.1
ARG NODE_VERSION=18.18.2

FROM node:${NODE_VERSION} AS base

Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
18.18.2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
18.18.2
12 changes: 6 additions & 6 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
# we can update that rule.
node_repositories(
node_repositories = {
"18.17.1-darwin_amd64": ("node-v18.17.1-darwin-x64.tar.gz", "node-v18.17.1-darwin-x64", "b3e083d2715f07ec3f00438401fb58faa1e0bdf3c7bde9f38b75ed17809d92fa"),
"18.17.1-darwin_arm64": ("node-v18.17.1-darwin-arm64.tar.gz", "node-v18.17.1-darwin-arm64", "18ca716ea57522b90473777cb9f878467f77fdf826d37beb15a0889fdd74533e"),
"18.17.1-linux_arm64": ("node-v18.17.1-linux-arm64.tar.xz", "node-v18.17.1-linux-arm64", "2743722f164df953b11663a6c25f9cf35769bf500e712e21a6c20e896177da30"),
"18.17.1-linux_amd64": ("node-v18.17.1-linux-x64.tar.xz", "node-v18.17.1-linux-x64", "4612954fef461bb05ba952112636bd11e51c0a59db94e6c4b26328fee4d4d9ab"),
"18.17.1-windows_amd64": ("node-v18.17.1-win-x64.zip", "node-v18.17.1-win-x64", "afc83f5cf6e8b45a4d3fb842904f604dcd271fefada31ad6654f8302f8da28c9"),
"18.18.2-darwin_amd64": ("node-v18.18.2-darwin-x64.tar.gz", "node-v18.18.2-darwin-x64", "5bb8da908ed590e256a69bf2862238c8a67bc4600119f2f7721ca18a7c810c0f"),
"18.18.2-darwin_arm64": ("node-v18.18.2-darwin-arm64.tar.gz", "node-v18.18.2-darwin-arm64", "9f982cc91b28778dd8638e4f94563b0c2a1da7aba62beb72bd427721035ab553"),
"18.18.2-linux_arm64": ("node-v18.18.2-linux-arm64.tar.xz", "node-v18.18.2-linux-arm64", "8a5a03f6a742159c9aa0ae3a99b368cd938cf62f3a5522a2e5acbe6313710efe"),
"18.18.2-linux_amd64": ("node-v18.18.2-linux-x64.tar.xz", "node-v18.18.2-linux-x64", "f7cf590bc7153f3beaa9e1138d00e50d74df223f0bec61f63e7df65f7315b76a"),
"18.18.2-windows_amd64": ("node-v18.18.2-win-x64.zip", "node-v18.18.2-win-x64", "3bb0e51e579a41a22b3bf6cb2f3e79c03801aa17acbe0ca00fc555d1282e7acd"),
},
node_version = "18.17.1",
node_version = "18.18.2",
node_urls = [
"https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v{version}/{filename}",
],
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"url": "https://github.com/elastic/kibana.git"
},
"engines": {
"node": "18.17.1",
"node": "18.18.2",
"yarn": "^1.21.1"
},
"resolutions": {
Expand All @@ -76,7 +76,7 @@
"**/@babel/traverse": "^7.21.2",
"**/@babel/types": "^7.21.2",
"**/@types/babel__generator/@babel/types": "^7.21.0",
"**/@types/node": "18.17.5",
"**/@types/node": "18.18.5",
"**/@types/react": "^16.14.25",
"**/@types/react-dom": "^16.9.8",
"**/@typescript-eslint/utils": "5.62.0",
Expand Down Expand Up @@ -581,7 +581,7 @@
"@types/mustache": "^0.8.31",
"@types/ncp": "^2.0.1",
"@types/nock": "^10.0.3",
"@types/node": "18.17.5",
"@types/node": "18.18.5",
"@types/node-fetch": "2.6.4",
"@types/node-forge": "^1.3.1",
"@types/nodemailer": "^6.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-register/src/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class Cache {
private readonly pathRoot: string;
private readonly prefix: string;
private readonly log?: Writable;
private readonly timer: NodeJS.Timer;
private readonly timer: NodeJS.Timeout;

constructor(config: { pathRoot: string; dir: string; prefix: string; log?: Writable }) {
if (!Path.isAbsolute(config.pathRoot)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es-archiver/src/lib/progress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const SECOND = 1000;
export class Progress {
private total?: number;
private complete?: number;
private loggingInterval?: NodeJS.Timer;
private loggingInterval?: NodeJS.Timeout;

getTotal() {
return this.total;
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-legacy-logging/src/log_format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ export abstract class BaseLogFormat extends Stream.Transform {

abstract format(data: Record<string, any>): string;

filter(data: Record<string, unknown>) {
filterData(data: Record<string, unknown>) {
if (!this.config.filter) {
return data;
}
return applyFiltersToKeys(data, this.config.filter);
}

_transform(event: AnyEvent, enc: string, next: Stream.TransformCallback) {
const data = this.filter(this.readEvent(event));
const data = this.filterData(this.readEvent(event));
this.push(this.format(data) + '\n');
next();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class BulkUploader implements IBulkUploader {
private kibanaStatusSubscription?: Subscription;
private readonly opsMetrics$: Observable<OpsMetrics>;
private kibanaStatus: ServiceStatusLevel | null;
private _timer: NodeJS.Timer | null;
private _timer: NodeJS.Timeout | null;
private readonly _interval: number;
private readonly config: MonitoringConfig;
constructor({
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6430,10 +6430,10 @@
dependencies:
"@types/node" "*"

"@types/node@*", "@types/node@18.17.5", "@types/node@>= 8", "@types/node@>=8.9.0", "@types/node@^10.1.0", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^18.17.5":
version "18.17.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.5.tgz#c58b12bca8c2a437b38c15270615627e96dd0bc5"
integrity sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA==
"@types/node@*", "@types/node@18.18.5", "@types/node@>= 8", "@types/node@>=8.9.0", "@types/node@^10.1.0", "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0", "@types/node@^18.17.5":
version "18.18.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.5.tgz#afc0fd975df946d6e1add5bbf98264225b212244"
integrity sha512-4slmbtwV59ZxitY4ixUZdy1uRLf9eSIvBWPQxNjhHYWEtn0FryfKpyS2cvADYXTayWdKEIsJengncrVvkI4I6A==

"@types/nodemailer@^6.4.0":
version "6.4.0"
Expand Down

0 comments on commit 0a2c338

Please sign in to comment.