Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies, linting, server upgrade & workflows #1523

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"node": true,
"es2017": true
},
"extends": "eslint:recommended",
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"rules": {
"arrow-spacing": [
"warn",
Expand Down Expand Up @@ -93,7 +93,8 @@
]
}],
"space-in-parens": "error",
"curly": "error"
"curly": "error",
"@typescript-eslint/no-duplicate-enum-values": "off"
},
"parserOptions": {
"ecmaVersion": 2018
Expand All @@ -120,10 +121,13 @@
"mocha/prefer-arrow-callback": ["error", {
"allowNamedFunctions": true
}],
"padded-blocks": ["error", "never"]
"padded-blocks": ["error", "never"],
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-var-requires": "off"
},
"parserOptions": {
"ecmaVersion": 11
"ecmaVersion": 11,
"sourceType": "commonjs"
}
},
{
Expand All @@ -134,6 +138,28 @@
"parserOptions": {
"ecmaVersion": 11
}
},
{
"files": ["scripts/**", "benchmark/**"],
"parserOptions": {
"sourceType": "commonjs"
},
"rules": {
"@typescript-eslint/no-var-requires": "off"
}
},
{
"files": ["code_samples/**/*"],
"env": {
"es2020": true
},
"parserOptions": {
"ecmaVersion": 11,
"sourceType": "commonjs"
},
"rules": {
"@typescript-eslint/no-var-requires": "off"
}
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code_sample_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/coverage_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions code_samples/paging_predicate_sample/main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>5.1.3</version>
<version>5.4.0</version>
</dependency>
</dependencies>
</project>
</project>
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "~8.56.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"
Expand Down
4 changes: 2 additions & 2 deletions scripts/download-rc.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/serialization/Portable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this comment?

STRING = 9,
PORTABLE_ARRAY = 10,
BYTE_ARRAY = 11,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.eslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"include": [
"src/**/*.ts",
"test/**/*.ts"
]
],
}
Loading