Merge branch 'dev' into oauth-fixes

Author: aq-ikhwa-tech

client/package.json

@@ -33,7 +33,7 @@
     "@types/qrcode.react": "^1.0.2",
     "@types/react-grid-layout": "^1.3.0",
     "@types/react-helmet": "^6.1.5",
-    "@types/react-resizable": "^1.7.4",
+    "@types/react-resizable": "^3.0.5",
     "@types/react-router-dom": "^5.3.2",
     "@types/shelljs": "^0.8.11",
     "@types/styled-components": "^5.1.19",

client/packages/lowcoder/package.json

@@ -44,7 +44,7 @@
     "antd-img-crop": "^4.12.2",
     "axios": "^0.21.1",
     "buffer": "^6.0.3",
-    "clsx": "^1.2.1",
+    "clsx": "^2.0.0",
     "cnchar": "^3.2.4",
     "copy-to-clipboard": "^3.3.3",
     "core-js": "^3.25.2",

client/yarn.lock

@@ -6,9 +6,9 @@ __metadata:
   cacheKey: 8
 
 "@adobe/css-tools@npm:^4.0.1":
-  version: 4.2.0
-  resolution: "@adobe/css-tools@npm:4.2.0"
-  checksum: dc5cc92ba3d562e7ffddb79d6d222c7e00b65f255fd2725b3d71490ff268844be322f917415d8c4ab39eca646343b632058db8bd5b1d646193fcc94d1d3e420b
+  version: 4.3.1
+  resolution: "@adobe/css-tools@npm:4.3.1"
+  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
   languageName: node
   linkType: hard
 
@@ -4244,12 +4244,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-resizable@npm:^1.7.4":
-  version: 1.7.4
-  resolution: "@types/react-resizable@npm:1.7.4"
+"@types/react-resizable@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "@types/react-resizable@npm:3.0.5"
   dependencies:
     "@types/react": "*"
-  checksum: d665bb2ddf830b9f841be21204cee119602b3d983537a94ccbad40deb7cd602e04742e3e013009bbb27c2d0fe72441b29ed48bc75f7e482cfb25eaf45f281dc9
+  checksum: d7ead4fb5d30136ae8664f978dd7b4ccef1a4c6acd44e3676ebfa31b261f3b5194330ae9747b9a5d381f5befe0f56043803560ded323b665eb0e46430a0e6bb9
   languageName: node
   linkType: hard
 
@@ -6255,13 +6255,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^1.0.4, clsx@npm:^1.1.1, clsx@npm:^1.2.1":
+"clsx@npm:^1.0.4, clsx@npm:^1.1.1":
   version: 1.2.1
   resolution: "clsx@npm:1.2.1"
   checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
   languageName: node
   linkType: hard
 
+"clsx@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "clsx@npm:2.0.0"
+  checksum: a2cfb2351b254611acf92faa0daf15220f4cd648bdf96ce369d729813b85336993871a4bf6978ddea2b81b5a130478339c20d9d0b5c6fc287e5147f0c059276e
+  languageName: node
+  linkType: hard
+
 "cnchar-types@npm:^3.2.4":
   version: 3.2.4
   resolution: "cnchar-types@npm:3.2.4"
@@ -11994,7 +12001,7 @@ __metadata:
     antd-img-crop: ^4.12.2
     axios: ^0.21.1
     buffer: ^6.0.3
-    clsx: ^1.2.1
+    clsx: ^2.0.0
     cnchar: ^3.2.4
     copy-to-clipboard: ^3.3.3
     core-js: ^3.25.2
@@ -17517,7 +17524,7 @@ __metadata:
     "@types/qrcode.react": ^1.0.2
     "@types/react-grid-layout": ^1.3.0
     "@types/react-helmet": ^6.1.5
-    "@types/react-resizable": ^1.7.4
+    "@types/react-resizable": ^3.0.5
     "@types/react-router-dom": ^5.3.2
     "@types/shelljs": ^0.8.11
     "@types/styled-components": ^5.1.19

server/api-service/pom.xml

@@ -175,7 +175,7 @@
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit</artifactId>
-                <version>6.5.0.202303070854-r</version>
+                <version>6.7.0.202309050840-r</version>
             </dependency>
 
             <dependency>