chore(deps): Bump eslint, typescript-eslint to support TypeScript 5.2 (…

…#7449)
cube-js · Nov 23, 2023 · cbb2186 · cbb2186
1 parent 7826780
commit cbb2186
Show file tree

Hide file tree

Showing 7 changed files with 277 additions and 124 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -44,7 +44,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
       fail-fast: false
 
     steps:

diff --git a/.github/workflows/rust-cubesql.yml b/.github/workflows/rust-cubesql.yml
@@ -128,15 +128,14 @@ jobs:
     name: Build Linux GNU ${{ matrix.node-version }}.x ${{ matrix.target }} with Python ${{ matrix.python-version }}
     strategy:
       matrix:
-        node-version: [14, 16, 18]
+        # Current used version + 1 LTS
+        node-version: [16, 18]
         python-version: ["3.9", "3.10", "3.11", "fallback"]
         target: ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         # minimize number of jobs
         exclude:
           - node-version: 18
             target: "aarch64-unknown-linux-gnu"
-          - node-version: 14
-            target: "aarch64-unknown-linux-gnu"
           - python-version: 3.10
             target: "aarch64-unknown-linux-gnu"
       fail-fast: false

diff --git a/packages/cubejs-backend-native/js/index.ts b/packages/cubejs-backend-native/js/index.ts
@@ -388,30 +388,30 @@ export interface JinjaEngine {
 }
 
 export class NativeInstance {
-    protected native: any | null = null;
-
-    protected getNative(): any {
-      if (this.native) {
-        return this.native;
-      }
-
-      this.native = loadNative();
+  protected native: any | null = null;
 
+  protected getNative(): any {
+    if (this.native) {
       return this.native;
     }
 
-    public newJinjaEngine(options: JinjaEngineOptions): JinjaEngine {
-      return this.getNative().newJinjaEngine(options);
-    }
+    this.native = loadNative();
 
-    public loadPythonContext(fileName: string, content: unknown): Promise<PythonCtx> {
-      if (isFallbackBuild()) {
-        throw new Error(
-          'Python (loadPythonContext) is not supported because you are using the fallback build of native extension. Read more: ' +
-          'https://github.com/cube-js/cube/blob/master/packages/cubejs-backend-native/README.md#supported-architectures-and-platforms'
-        );
-      }
+    return this.native;
+  }
+
+  public newJinjaEngine(options: JinjaEngineOptions): JinjaEngine {
+    return this.getNative().newJinjaEngine(options);
+  }
 
-      return this.getNative().pythonLoadModel(fileName, content);
+  public loadPythonContext(fileName: string, content: unknown): Promise<PythonCtx> {
+    if (isFallbackBuild()) {
+      throw new Error(
+        'Python (loadPythonContext) is not supported because you are using the fallback build of native extension. Read more: ' +
+          'https://github.com/cube-js/cube/blob/master/packages/cubejs-backend-native/README.md#supported-architectures-and-platforms'
+      );
     }
+
+    return this.getNative().pythonLoadModel(fileName, content);
+  }
 }
diff --git a/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts b/packages/cubejs-databricks-jdbc-driver/src/DatabricksDriver.ts
@@ -3,7 +3,7 @@
  * @license Apache-2.0
  * @fileoverview The `DatabricksDriver` and related types declaration.
  */
-
+/* eslint-disable camelcase */
 import {
   getEnv,
   assertDataSource,

diff --git a/packages/cubejs-linter/package.json b/packages/cubejs-linter/package.json
@@ -16,9 +16,9 @@
     "eslint": ">=7.21"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.59",
-    "@typescript-eslint/parser": "^5.59",
-    "eslint": "^7.21.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "eslint": "^8.54.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^9.2.0"

diff --git a/packages/cubejs-query-orchestrator/src/orchestrator/QueryStream.ts b/packages/cubejs-query-orchestrator/src/orchestrator/QueryStream.ts
@@ -8,7 +8,7 @@ export class QueryStream extends stream.Transform {
 
   public queryKey: string;
 
-  public streams: Map<string, QueryStream>;
+  public streams: Map<string, stream.Stream>;
 
   public aliasNameToMember: { [alias: string]: string };
 
@@ -23,7 +23,7 @@ export class QueryStream extends stream.Transform {
     aliasNameToMember,
   }: {
     key: string;
-    streams: Map<string, QueryStream>;
+    streams: Map<string, stream.Stream>;
     aliasNameToMember: { [alias: string]: string } | null;
   }) {
     super({