From bd748e4097b22557abe98a508ff5e0604340ce7f Mon Sep 17 00:00:00 2001 From: ievgenii vdovenko Date: Thu, 11 Dec 2025 12:16:49 +0100 Subject: [PATCH] resolves merge conflicts --- Gruntfile.js | 2 +- grunt_config.json | 41 ++++++++++++++++++++++++++++++++++++++++- package-lock.json | 18 ++++++++++++------ 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b4e04c60..0c3aa451 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,5 +18,5 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-webpack'); - grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'terser:dist', 'concat:ext', 'uglify:ext']); + grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist', 'concat:ext', 'terser:dist', 'terser:ext']); }; diff --git a/grunt_config.json b/grunt_config.json index 2ee41c68..6fa84270 100644 --- a/grunt_config.json +++ b/grunt_config.json @@ -152,11 +152,50 @@ }, "files": { "<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/scripts.js" - } + }, "src": "<%= dirs.js.dest %>/scripts.js", "dest": "<%= dirs.js.dest %>/scripts.min.js" }, "ext": { + "options": { + "compress": { + "ecma": 6, + "arrows": false, + "collapse_vars": false, + "comparisons": false, + "computed_props": false, + "hoist_funs": false, + "hoist_props": false, + "hoist_vars": false, + "inline": false, + "loops": false, + "negate_iife": false, + "properties": false, + "reduce_funcs": false, + "reduce_vars": false, + "switches": false, + "toplevel": false, + "typeofs": false, + "booleans": true, + "if_return": true, + "sequences": true, + "unused": true, + "conditionals": true, + "dead_code": true, + "evaluate": true + }, + "mangle": { + "keep_classnames": true, + "keep_fnames": false, + "reserved": ["noChange", "nothing"] + }, + "output": { + "ecma": 6 + } + }, + "files": { + "<%= dirs.js.dest %>/scripts.min.js": "<%= dirs.js.dest %>/codemirror-dist.js" + }, "src": "<%= dirs.js.dest %>/codemirror-dist.js", "dest": "<%= dirs.js.dest %>/codemirror-dist.min.js" } diff --git a/package-lock.json b/package-lock.json index 8a0cda70..925dca1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,6 +60,7 @@ "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", "@jridgewell/trace-mapping": "^0.3.24" @@ -71,6 +72,7 @@ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=6.0.0" } @@ -81,6 +83,7 @@ "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25" @@ -91,7 +94,8 @@ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", @@ -99,6 +103,7 @@ "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -352,6 +357,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -365,7 +371,6 @@ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -776,7 +781,6 @@ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "babel-code-frame": "^6.26.0", "babel-generator": "^6.26.0", @@ -4430,7 +4434,6 @@ "integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "dateformat": "~4.6.2", "eventemitter2": "~0.4.13", @@ -10451,6 +10454,7 @@ "integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==", "dev": true, "license": "BSD-2-Clause", + "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.15.0", @@ -10766,7 +10770,8 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/terser/node_modules/source-map": { "version": "0.6.1", @@ -10774,6 +10779,7 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, "license": "BSD-3-Clause", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -10784,6 +10790,7 @@ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -11937,7 +11944,6 @@ "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0",