Merge branch 'develop' into feature/pdfeditor

build/Gruntfile.js

@@ -298,10 +298,16 @@ module.exports = function(grunt) {
             svgmin: {
                 options: {
                     plugins: [{
-                        cleanupIDs: false
+                        name: 'preset-default',
+                        params: {
+                            overrides: {
+                                cleanupIds: false,
+                            }
+                        },
                     },
                     {
-                        convertPathData: {
+                        name: 'convertPathData',
+                        params: {
                             floatPrecision: 4
                         }
                     }]
@@ -454,10 +460,16 @@ module.exports = function(grunt) {
             svgmin: {
                 options: {
                     plugins: [{
-                        cleanupIDs: false
+                        name: 'preset-default',
+                        params: {
+                            overrides: {
+                                cleanupIds: false,
+                            }
+                        },
                     },
                     {
-                        convertPathData: {
+                        name: 'convertPathData',
+                        params: {
                             floatPrecision: 4
                         }
                     }]

build/package.json

@@ -4,11 +4,11 @@
   "homepage": "http://www.onlyoffice.com",
   "private": true,
   "dependencies": {
-    "grunt": "^1.5.3",
+    "grunt": "^1.6.1",
     "grunt-contrib-clean": "^2.0.1",
     "grunt-contrib-concat": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-cssmin": "^4.0.0",
+    "grunt-contrib-cssmin": "^5.0.0",
     "grunt-contrib-htmlmin": "^3.1.0",
     "grunt-contrib-imagemin": "^4.0.0",
     "grunt-contrib-less": "^3.0.0",
@@ -19,19 +19,19 @@
     "grunt-json-minify": "^1.1.0",
     "grunt-spritesmith": "^6.9.0",
     "grunt-svg-sprite": "^2.0.2",
-    "grunt-svgmin": "^6.0.1",
+    "grunt-svgmin": "^7.0.0",
     "grunt-terser": "^2.0.0",
     "grunt-text-replace": "0.4.0",
     "iconsprite": "file:sprites",
     "iconv-lite": "^0.6.3",
     "less-plugin-clean-css": "1.5.1",
     "lodash": "^4.17.21",
-    "terser": "^5.15.1",
+    "terser": "^5.17.3",
     "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "grunt-mocha": "^1.2.0",
-    "mocha": "^9.2.2"
+    "mocha": "^10.2.0"
   }
 }