Merge branch 'update-packages-2'

.github/workflows/build-app-beta.yaml

@@ -23,10 +23,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: yarn adjustPackageJson
         run: |
           yarn adjustPackageJson

.github/workflows/build-app.yaml

@@ -27,10 +27,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: yarn adjustPackageJson
         run: |
           yarn adjustPackageJson

.github/workflows/build-docker.yaml

@@ -53,10 +53,10 @@ jobs:
             type=match,pattern=\d+.\d+.\d+,suffix=-alpine,enable=${{ !contains(github.ref_name, '-docker.') && !contains(github.ref_name, '-beta.') }}
             type=raw,value=alpine,enable=${{ !contains(github.ref_name, '-docker.') && !contains(github.ref_name, '-beta.') }}
 
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: yarn install
         run: |
           # yarn --version

.github/workflows/build-npm.yaml

@@ -30,10 +30,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v1
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Configure NPM token
         env:

app/package.json

@@ -114,13 +114,13 @@
   "devDependencies": {
     "copyfiles": "^2.2.0",
     "cross-env": "^6.0.3",
-    "electron": "17.4.10",
+    "electron": "30.0.2",
     "electron-builder": "23.1.0",
     "electron-builder-notarize": "^1.5.2"
   },
   "optionalDependencies": {
-    "better-sqlite3": "7.6.2",
+    "better-sqlite3": "9.6.0",
-    "msnodesqlv8": "^2.6.0",
+    "msnodesqlv8": "^4.2.1",
     "oracledb": "^5.5.0"
   }
 }

docker/Dockerfile

@@ -11,8 +11,8 @@ RUN apt-get update && apt-get install -y \
     make
 
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x jammy main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_18.x jammy main" | tee /etc/apt/sources.list.d/nodesource.list \
-  && echo "deb-src [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+  && echo "deb-src [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_18.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \
   && apt-get update && apt-get install -y nodejs \
   && rm -rf /var/lib/apt/lists/* \
   && npm install -g yarn

docker/Dockerfile-alpine

@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:18-alpine
 
 WORKDIR /home/dbgate-docker
 

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "5.2.8-beta.12",
+  "version": "5.2.8-beta.16",
   "name": "dbgate-all",
   "workspaces": [
     "packages/*",

packages/api/package.json

@@ -79,12 +79,12 @@
     "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",
     "typescript": "^4.4.3",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   },
   "optionalDependencies": {
-    "better-sqlite3": "7.6.2",
+    "better-sqlite3": "9.6.0",
-    "msnodesqlv8": "^2.6.0",
+    "msnodesqlv8": "^4.2.1",
     "oracledb": "^5.5.0"
   }
 }

packages/web/package.json

@@ -20,7 +20,7 @@
     "@rollup/plugin-typescript": "^8.2.5",
     "@tsconfig/svelte": "^1.0.0",
     "ace-builds": "^1.4.8",
-    "chart.js": "^3.6.0",
+    "chart.js": "^4.4.2",
     "chartjs-adapter-moment": "^1.0.0",
     "cross-env": "^7.0.3",
     "dbgate-datalib": "^5.0.0-alpha.1",

packages/web/src/elements/QueryDesignColumns.svelte

@@ -49,7 +49,9 @@
       if (index >= 0 && index + d >= 0 && index + d < current.columns?.length) {
         let columns = [...current.columns];
 
-        [columns[index], columns[index + d]] = [columns[index + d], columns[index]];
+        const tmp = columns[index + d];
+        columns[index + d] = columns[index];
+        columns[index] = tmp;
 
         return {
           ...current,

patches/svelte+3.43.0.patch

@@ -1,26 +0,0 @@
-diff --git a/node_modules/svelte/internal/index.js b/node_modules/svelte/internal/index.js
-index 1cce90d..6220522 100644
---- a/node_modules/svelte/internal/index.js
-+++ b/node_modules/svelte/internal/index.js
-@@ -374,7 +374,7 @@ function insert_hydration(target, node, anchor) {
-     }
- }
- function detach(node) {
--    node.parentNode.removeChild(node);
-+    if (node.parentNode) node.parentNode.removeChild(node);
- }
- function destroy_each(iterations, detaching) {
-     for (let i = 0; i < iterations.length; i += 1) {
-diff --git a/node_modules/svelte/internal/index.mjs b/node_modules/svelte/internal/index.mjs
-index 6650e85..b746187 100644
---- a/node_modules/svelte/internal/index.mjs
-+++ b/node_modules/svelte/internal/index.mjs
-@@ -370,7 +370,7 @@ function insert_hydration(target, node, anchor) {
-     }
- }
- function detach(node) {
--    node.parentNode.removeChild(node);
-+    if (node.parentNode) node.parentNode.removeChild(node);
- }
- function destroy_each(iterations, detaching) {
-     for (let i = 0; i < iterations.length; i += 1) {

plugins/dbgate-plugin-csv/package.json

@@ -35,7 +35,7 @@
     "csv": "^5.3.2",
     "dbgate-plugin-tools": "^1.0.7",
     "lodash": "^4.17.21",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   }
 }

plugins/dbgate-plugin-excel/package.json

@@ -35,7 +35,7 @@
     "lodash": "^4.17.21",
     "xlsx": "0.16.9",
     "dbgate-plugin-tools": "^1.0.7",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   }
 }

plugins/dbgate-plugin-mongo/package.json

@@ -33,11 +33,11 @@
   "devDependencies": {
     "dbgate-plugin-tools": "^1.0.7",
     "dbgate-query-splitter": "^4.9.3",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^5.1.4",
     "dbgate-tools": "^5.0.0-alpha.1",
     "is-promise": "^4.0.0",
-    "mongodb": "^4.7.0",
+    "mongodb": "^6.3.0",
-    "mongodb-client-encryption": "^2.1.0"
+    "mongodb-client-encryption": "^6.0.0"
   }
 }

plugins/dbgate-plugin-mongo/src/backend/Analyser.js

@@ -10,9 +10,24 @@ class Analyser extends DatabaseAnalyser {
     const collections = collectionsAndViews.filter((x) => x.type == 'collection');
     const views = collectionsAndViews.filter((x) => x.type == 'view');
 
-    const stats = await Promise.all(
+    let stats;
-      collections.filter((x) => x.type == 'collection').map((x) => this.pool.__getDatabase().collection(x.name).stats())
+    try {
+      stats = await Promise.all(
+        collections
+          .filter((x) => x.type == 'collection')
+          .map((x) =>
+            this.pool
+              .__getDatabase()
+              .collection(x.name)
+              .aggregate([{ $collStats: { count: {} } }])
+              .toArray()
+              .then((resp) => ({ name: x.name, count: resp[0].count }))
+          )
       );
+    } catch (e) {
+      // $collStats not supported
+      stats = {};
+    }
 
     const res = this.mergeAnalyseResult({
       collections: [

plugins/dbgate-plugin-mssql/package.json

@@ -33,10 +33,10 @@
   "devDependencies": {
     "dbgate-plugin-tools": "^1.0.7",
     "dbgate-query-splitter": "^4.9.3",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^5.1.4",
     "dbgate-tools": "^5.0.0-alpha.1",
-    "tedious": "^14.5.0",
+    "tedious": "^18.2.0",
     "async-lock": "^1.2.6"
   }
 }

plugins/dbgate-plugin-mysql/package.json

@@ -35,8 +35,8 @@
     "dbgate-plugin-tools": "^1.0.7",
     "dbgate-query-splitter": "^4.9.3",
     "dbgate-tools": "^5.0.0-alpha.1",
-    "mysql2": "^3.6.5",
+    "mysql2": "^3.9.7",
-    "webpack": "^5.89.0",
+    "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"
   }
 }

plugins/dbgate-plugin-oracle/package.json

@@ -34,7 +34,7 @@
     "dbgate-query-splitter": "^4.9.0",
     "dbgate-tools": "^5.0.0-alpha.1",
     "lodash": "^4.17.21",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   }
 }

plugins/dbgate-plugin-postgres/package.json

@@ -34,8 +34,8 @@
     "dbgate-query-splitter": "^4.9.3",
     "dbgate-tools": "^5.0.0-alpha.1",
     "lodash": "^4.17.21",
-    "pg": "^8.7.1",
+    "pg": "^8.11.5",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   }
 }

plugins/dbgate-plugin-redis/package.json

@@ -33,8 +33,8 @@
     "dbgate-query-splitter": "^4.9.3",
     "dbgate-tools": "^5.0.0-alpha.1",
     "lodash": "^4.17.21",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11",
+    "webpack-cli": "^5.1.4",
     "async": "^3.2.3",
     "ioredis": "^4.28.5",
     "node-redis-dump2": "^0.5.0"

plugins/dbgate-plugin-sqlite/package.json

@@ -34,8 +34,8 @@
       "dbgate-plugin-tools": "^1.0.4",
       "dbgate-query-splitter": "^4.9.3",
       "byline": "^5.0.0",
-      "webpack": "^4.42.0",
+      "webpack": "^5.91.0",
-      "webpack-cli": "^3.3.11"
+      "webpack-cli": "^5.1.4"
       }
   }
   

plugins/dbgate-plugin-xml/package.json

@@ -33,7 +33,7 @@
   "devDependencies": {
     "node-xml-stream-parser": "^1.0.12",
     "dbgate-plugin-tools": "^1.0.7",
-    "webpack": "^4.42.0",
+    "webpack": "^5.91.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^5.1.4"
   }
 }