From daa2e827c4cc222200bbb044d571915cd63dcb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 17:59:02 +0300 Subject: [PATCH 1/7] Update dev dependencies to latest --- .../paging_predicate_sample/main/pom.xml | 4 +-- package.json | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code_samples/paging_predicate_sample/main/pom.xml b/code_samples/paging_predicate_sample/main/pom.xml index 88aa82dd4..6f5880106 100644 --- a/code_samples/paging_predicate_sample/main/pom.xml +++ b/code_samples/paging_predicate_sample/main/pom.xml @@ -30,7 +30,7 @@ com.hazelcast hazelcast - 5.1.3 + 5.4.0 - \ No newline at end of file + diff --git a/package.json b/package.json index 597c1c03a..27752c3ab 100644 --- a/package.json +++ b/package.json @@ -15,30 +15,30 @@ "devDependencies": { "@istanbuljs/nyc-config-typescript": "~1.0.2", "@types/node": "~10.17.60", - "@typescript-eslint/eslint-plugin": "~5.45.0", - "@typescript-eslint/parser": "~5.45.0", + "@typescript-eslint/eslint-plugin": "~v7.8.0", + "@typescript-eslint/parser": "~v7.8.0", "chai": "~4.3.6", "chai-as-promised": "~7.1.1", - "eslint": "~8.28.0", + "eslint": "~9.2.0", "eslint-plugin-mocha": "~9.0.0", "husky": "~6.0.0", "jsonschema": "~1.4.0", - "markdown-link-check": "~3.10.2", - "markdownlint-cli": "~0.32.2", - "mocha": "~9.2.2", + "markdown-link-check": "~3.12.1", + "markdownlint-cli": "~0.40.0", + "mocha": "~10.4.0", "mousse": "~0.3.1", "nyc": "~15.1.0", "path-exists-cli": "~2.0.0", - "rimraf": "~3.0.2", - "sinon": "~13.0.1", + "rimraf": "~5.0.5", + "sinon": "~17.0.2", "sinon-chai": "~3.7.0", "source-map-support": "~0.5.21", "thrift": "~0.16.0", - "ts-node": "~10.9.1", - "typedoc": "~0.22.18", - "typescript": "~4.7.4", - "winston": "~3.8.2", - "yargs": "~17.5.1" + "ts-node": "~10.9.2", + "typedoc": "~0.25.13", + "typescript": "~5.4.5", + "winston": "~3.13.0", + "yargs": "~17.7.2" }, "engines": { "node": ">=10.4.0" From 588fe582c2956a49b1d1996ba211bd88891c9b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 18:00:25 +0300 Subject: [PATCH 2/7] Update long.js to 5.2.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 27752c3ab..7b6bd8c5f 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "lib/**/*.d.ts" ], "dependencies": { - "@types/long": "4.0.0", - "long": "4.0.0" + "@types/long": "5.2.3", + "long": "5.2.3" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "~1.0.2", From fde53267a8ef8a1d534a97747b7bdc98c0e051ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 19:31:35 +0300 Subject: [PATCH 3/7] Lint fixes && server upgrade --- .eslintrc | 28 ++++++++++++++++++++++++---- package.json | 6 +++--- src/serialization/Portable.ts | 2 ++ tsconfig.eslint.json | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index b5260704e..8e7ba87f5 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,7 +4,7 @@ "node": true, "es2017": true }, - "extends": "eslint:recommended", + "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"], "rules": { "arrow-spacing": [ "warn", @@ -93,7 +93,9 @@ ] }], "space-in-parens": "error", - "curly": "error" + "curly": "error", + "@typescript-eslint/no-duplicate-enum-values": "off", + "@typescript-eslint/no-var-requires": "off" }, "parserOptions": { "ecmaVersion": 2018 @@ -120,10 +122,12 @@ "mocha/prefer-arrow-callback": ["error", { "allowNamedFunctions": true }], - "padded-blocks": ["error", "never"] + "padded-blocks": ["error", "never"], + "@typescript-eslint/no-unused-vars": "off" }, "parserOptions": { - "ecmaVersion": 11 + "ecmaVersion": 11, + "sourceType": "commonjs" } }, { @@ -134,6 +138,22 @@ "parserOptions": { "ecmaVersion": 11 } + }, + { + "files": ["scripts/**", "benchmark/**"], + "parserOptions": { + "sourceType": "commonjs" + } + }, + { + "files": ["code_samples/**/*"], + "env": { + "es2020": true + }, + "parserOptions": { + "ecmaVersion": 11, + "sourceType": "commonjs" + } } ] } diff --git a/package.json b/package.json index 7b6bd8c5f..89317a603 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "lib/**/*.d.ts" ], "dependencies": { - "@types/long": "5.2.3", - "long": "5.2.3" + "@types/long": "4.0.0", + "long": "4.0.0" }, "devDependencies": { "@istanbuljs/nyc-config-typescript": "~1.0.2", @@ -19,7 +19,7 @@ "@typescript-eslint/parser": "~v7.8.0", "chai": "~4.3.6", "chai-as-promised": "~7.1.1", - "eslint": "~9.2.0", + "eslint": "~8.56.0", "eslint-plugin-mocha": "~9.0.0", "husky": "~6.0.0", "jsonschema": "~1.4.0", diff --git a/src/serialization/Portable.ts b/src/serialization/Portable.ts index f25b30d3d..cdb347c60 100644 --- a/src/serialization/Portable.ts +++ b/src/serialization/Portable.ts @@ -37,6 +37,7 @@ export enum FieldType { FLOAT = 7, DOUBLE = 8, UTF = 9, // Defined for backwards compatibility. + /* eslint-disable @typescript-eslint/no-duplicate-enum-values */ STRING = 9, PORTABLE_ARRAY = 10, BYTE_ARRAY = 11, @@ -47,6 +48,7 @@ export enum FieldType { LONG_ARRAY = 16, FLOAT_ARRAY = 17, DOUBLE_ARRAY = 18, + /* eslint-disable @typescript-eslint/no-duplicate-enum-values */ UTF_ARRAY = 19, // Defined for backwards compatibility. STRING_ARRAY = 19, DECIMAL = 20, diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index 4f25668ac..d1f88884f 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -3,5 +3,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ] + ], } From 9c812ea0b96ed46fdd863ca976511aa07636b4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 19:40:19 +0300 Subject: [PATCH 4/7] Update workflows --- .github/workflows/code_quality.yml | 4 ++-- .github/workflows/code_sample_checker.yml | 4 ++-- .github/workflows/coverage_runner.yml | 10 ++++++++-- ...nce.yml => nightly_runner_maintenance.yml.disabled} | 0 ...r_master.yml => nightly_runner_master.yml.disabled} | 0 5 files changed, 12 insertions(+), 6 deletions(-) rename .github/workflows/{nightly_runner_maintenance.yml => nightly_runner_maintenance.yml.disabled} (100%) rename .github/workflows/{nightly_runner_master.yml => nightly_runner_master.yml.disabled} (100%) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 3b0c2a757..33d99216d 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -14,9 +14,9 @@ jobs: steps: - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 12 + node-version: lts - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies diff --git a/.github/workflows/code_sample_checker.yml b/.github/workflows/code_sample_checker.yml index 3556faf4d..1102bfa66 100644 --- a/.github/workflows/code_sample_checker.yml +++ b/.github/workflows/code_sample_checker.yml @@ -16,9 +16,9 @@ jobs: with: java-version: 17 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 10 + node-version: lts - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies and compile client diff --git a/.github/workflows/coverage_runner.yml b/.github/workflows/coverage_runner.yml index af340804d..abe0d669e 100644 --- a/.github/workflows/coverage_runner.yml +++ b/.github/workflows/coverage_runner.yml @@ -42,10 +42,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 17 + - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: 10 + node-version: lts - name: Checkout code for PR if: github.event_name == 'pull_request_target' @@ -79,6 +80,11 @@ jobs: npm install npm run compile + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 10 + - name: Run all tests env: HAZELCAST_ENTERPRISE_KEY: ${{ secrets.HAZELCAST_ENTERPRISE_KEY }} diff --git a/.github/workflows/nightly_runner_maintenance.yml b/.github/workflows/nightly_runner_maintenance.yml.disabled similarity index 100% rename from .github/workflows/nightly_runner_maintenance.yml rename to .github/workflows/nightly_runner_maintenance.yml.disabled diff --git a/.github/workflows/nightly_runner_master.yml b/.github/workflows/nightly_runner_master.yml.disabled similarity index 100% rename from .github/workflows/nightly_runner_master.yml rename to .github/workflows/nightly_runner_master.yml.disabled From 0e46b2a0a353680c11e126700a8d057b6675c7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 19:43:44 +0300 Subject: [PATCH 5/7] Use latest lts --- .github/workflows/code_quality.yml | 2 +- .github/workflows/code_sample_checker.yml | 2 +- .github/workflows/coverage_runner.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 33d99216d..d074f5d82 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: lts + node-version: lts/* - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies diff --git a/.github/workflows/code_sample_checker.yml b/.github/workflows/code_sample_checker.yml index 1102bfa66..84f77393f 100644 --- a/.github/workflows/code_sample_checker.yml +++ b/.github/workflows/code_sample_checker.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: lts + node-version: lts/* - name: Checkout code uses: actions/checkout@v2 - name: Install dependencies and compile client diff --git a/.github/workflows/coverage_runner.yml b/.github/workflows/coverage_runner.yml index abe0d669e..fad56785d 100644 --- a/.github/workflows/coverage_runner.yml +++ b/.github/workflows/coverage_runner.yml @@ -46,7 +46,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: lts + node-version: lts/* - name: Checkout code for PR if: github.event_name == 'pull_request_target' From da4122d6ddc9cecef985ab11b7de69ff934c56d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 19:50:49 +0300 Subject: [PATCH 6/7] Update server to 5.4.0 --- scripts/download-rc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/download-rc.js b/scripts/download-rc.js index ff4357ad5..c1fab6227 100644 --- a/scripts/download-rc.js +++ b/scripts/download-rc.js @@ -1,6 +1,6 @@ 'use strict'; -const HZ_VERSION = '5.4.0-SNAPSHOT'; -const HZ_TEST_VERSION = '5.4.0-SNAPSHOT'; +const HZ_VERSION = '5.4.0'; +const HZ_TEST_VERSION = '5.4.0'; const HAZELCAST_TEST_VERSION = HZ_TEST_VERSION; const HAZELCAST_VERSION = HZ_VERSION; const HAZELCAST_ENTERPRISE_VERSION = HZ_VERSION; From 9ce9cca586d44681cce90ade45728d0c9811ce09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Serkan=20=C3=96zel?= Date: Thu, 9 May 2024 21:48:36 +0300 Subject: [PATCH 7/7] Update lint rules --- .eslintrc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.eslintrc b/.eslintrc index 8e7ba87f5..bb3d8c263 100644 --- a/.eslintrc +++ b/.eslintrc @@ -94,8 +94,7 @@ }], "space-in-parens": "error", "curly": "error", - "@typescript-eslint/no-duplicate-enum-values": "off", - "@typescript-eslint/no-var-requires": "off" + "@typescript-eslint/no-duplicate-enum-values": "off" }, "parserOptions": { "ecmaVersion": 2018 @@ -123,7 +122,8 @@ "allowNamedFunctions": true }], "padded-blocks": ["error", "never"], - "@typescript-eslint/no-unused-vars": "off" + "@typescript-eslint/no-unused-vars": "off", + "@typescript-eslint/no-var-requires": "off" }, "parserOptions": { "ecmaVersion": 11, @@ -143,6 +143,9 @@ "files": ["scripts/**", "benchmark/**"], "parserOptions": { "sourceType": "commonjs" + }, + "rules": { + "@typescript-eslint/no-var-requires": "off" } }, { @@ -153,6 +156,9 @@ "parserOptions": { "ecmaVersion": 11, "sourceType": "commonjs" + }, + "rules": { + "@typescript-eslint/no-var-requires": "off" } } ]