pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dependabot/npm_and_yarn/build/decode-uri-component-0.2.2

Browse Source
This commit is contained in:
maxkadushkin
2022-12-11 15:46:55 +03:00
committed by GitHub
parent e5d0605c19 3ddbc065e9
commit 4b4afed287
936 changed files with 40162 additions and 9286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Gruntfile.js
View File

@ -281,7 +281,7 @@ module.exports = function(grunt) {
},
}
});
doRegisterTask('sockjs');
doRegisterTask('socketio');
doRegisterTask('xregexp');
doRegisterTask('megapixel');
doRegisterTask('jquery');
@ -673,7 +673,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]);
grunt.registerTask('deploy-sockjs', ['sockjs-init', 'clean', 'copy']);
grunt.registerTask('deploy-socketio', ['socketio-init', 'clean', 'copy']);
grunt.registerTask('deploy-xregexp', ['xregexp-init', 'clean', 'copy']);
grunt.registerTask('deploy-megapixel', ['megapixel-init', 'clean', 'copy']);
grunt.registerTask('deploy-jquery', ['jquery-init', 'clean', 'copy']);

4
build/appforms.json
View File

@ -32,7 +32,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"socketio": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -85,7 +85,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs"
"socketio"
]
},
"gateway": {

2
build/bower.json
View File

@ -10,7 +10,7 @@
"requirejs-text": "~2.0.5",
"less": "~1.5.0",
"bootstrap": "~3.0.3",
"sockjs": "~0.3.2",
"socketio": "~4.5.3",
"perfect-scrollbar": "latest"
}
}

10
build/common.json
View File

@ -180,14 +180,14 @@
}
}
},
"sockjs": {
"socketio": {
"clean": [
"../deploy/web-apps/vendor/sockjs"
"../deploy/web-apps/vendor/socketio"
],
"copy": {
"script": {
"src": "../vendor/sockjs/sockjs.min.js",
"dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
"src": "../vendor/socketio/socket.io.min.js",
"dest": "../deploy/web-apps/vendor/socketio/socket.io.min.js"
}
}
},
@ -272,7 +272,7 @@
"deploy-api",
"deploy-apps-common",
"deploy-sdk",
"deploy-sockjs",
"deploy-socketio",
"deploy-xregexp",
"deploy-requirejs",
"deploy-megapixel",

4
build/documenteditor.json
View File

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"socketio": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs"
"socketio"
]
},
"gateway": {

878
build/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
build/package.json
View File

@ -5,7 +5,7 @@
"private": true,
"dependencies": {
"grunt": "^1.5.3",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-clean": "^2.0.1",
"grunt-contrib-concat": "^2.0.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^4.0.0",
@ -13,7 +13,7 @@
"grunt-contrib-imagemin": "^4.0.0",
"grunt-contrib-less": "^3.0.0",
"grunt-contrib-requirejs": "^1.0.0",
"grunt-contrib-uglify": "^5.0.1",
"grunt-contrib-uglify": "^5.2.2",
"grunt-exec": "^3.0.0",
"grunt-inline": "file:plugins/grunt-inline",
"grunt-json-minify": "^1.1.0",
@ -25,12 +25,12 @@
"iconv-lite": "^0.6.3",
"less-plugin-clean-css": "1.5.1",
"lodash": "^4.17.21",
"terser": "^5.12.1",
"terser": "^5.15.1",
"vinyl-fs": "^3.0.3"
},
"devDependencies": {
"chai": "1.9.1",
"grunt-mocha": "^1.0.0",
"mocha": "^9.2.0"
"chai": "^4.3.6",
"grunt-mocha": "^1.2.0",
"mocha": "^9.2.2"
}
}

4
build/presentationeditor.json
View File

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"socketio": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs"
"socketio"
]
},
"gateway": {

4
build/spreadsheeteditor.json
View File

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
"sockjs": "empty:",
"socketio": "empty:",
"coapisettings": "empty:",
"allfonts": "empty:",
"sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings",
"allfonts",
"xregexp",
"sockjs"
"socketio"
]
},
"gateway": {

12
build/sprites/package-lock.json generated
View File

@ -425,9 +425,9 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"node_modules/jpeg-js": {
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz",
"integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
},
"node_modules/jsbn": {
"version": "0.1.1",
@ -1377,9 +1377,9 @@
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
"jpeg-js": {
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz",
"integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
"integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
},
"jsbn": {
"version": "0.1.1",