pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/launch-controller-ref1

Browse Source
This commit is contained in:
Konstantin Kireyev
2024-07-11 18:04:15 +05:00
committed by GitHub
parent 91cb36b346 90101fa67b
commit 046b40a26d
8976 changed files with 467217 additions and 176759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/Gruntfile.js
View File

@ -1,5 +1,5 @@
/*
* (c) Copyright Ascensio System SIA 2010-2023
* (c) Copyright Ascensio System SIA 2010-2024
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
@ -302,6 +302,7 @@ module.exports = function(grunt) {
params: {
overrides: {
cleanupIds: false,
removeHiddenElems: false, // plugin ver 3.2.0 deletes <symbol> as non rendering element
}
},
},
@ -316,6 +317,11 @@ module.exports = function(grunt) {
files: packageFile['apps-common'].svgicons.common
}
},
inline: {
dist: {
src: packageFile['apps-common'].copy.indexhtml.dest + '/*.html'
}
}
}
});
doRegisterTask('socketio');
@ -455,6 +461,9 @@ module.exports = function(grunt) {
},
inline: {
options: {
uglify: true
},
dist: {
src: '<%= pkg.main.copy.indexhtml[0].dest %>/*.html'
}
@ -467,6 +476,7 @@ module.exports = function(grunt) {
params: {
overrides: {
cleanupIds: false,
removeHiddenElems: false, // plugin ver 3.2.0 deletes <symbol> as non rendering element
}
},
},
@ -771,7 +781,7 @@ module.exports = function(grunt) {
var copyTask = grunt.option('desktop')? "copy": "copy:script";
grunt.registerTask('deploy-api', ['api-init', 'clean', copyTask, 'replace:writeVersion']);
grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'inline', 'imagemin', 'svgmin']);
grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]);
grunt.registerTask('deploy-socketio', ['socketio-init', 'clean', 'copy']);

2
build/appforms.js
View File

@ -1,5 +1,5 @@
/*
* (c) Copyright Ascensio System SIA 2010-2023
* (c) Copyright Ascensio System SIA 2010-2024
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)

36
build/common.json
View File

@ -43,7 +43,7 @@
{
"expand": true,
"cwd": "../../sdkjs/slide/themes/",
"src": "**/**",
"src": "**/*.*",
"dest": "../deploy/sdkjs/slide/themes/"
},
{
@ -100,9 +100,17 @@
"src": [
"**/*.{png,jpg,gif,html,css}",
"!*_/**",
"!**/src/**"
"!**/src/**",
"search/js/**/*.js"
],
"dest": "../deploy/web-apps/apps/common/main/resources/help/"
},
"indexhtml": {
"expand": true,
"cwd": "../apps/common",
"src": "*.html.deploy",
"ext": ".html",
"dest": "../deploy/web-apps/apps/common"
}
},
"imagemin": {
@ -129,27 +137,6 @@
]
}
},
"bootstrap": {
"clean": [
"../deploy/web-apps/vendor/bootstrap"
],
"copy": {
"script": {
"src": "../vendor/bootstrap/dist/js/bootstrap.min.js",
"dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js"
},
"font": {
"expand": true,
"cwd": "../vendor/bootstrap/dist/fonts/",
"src": "*",
"dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/"
},
"css": {
"src": "../vendor/bootstrap/dist/css/bootstrap.min.css",
"dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css"
}
}
},
"jquery": {
"clean": [
"../deploy/web-apps/vendor/jquery"
@ -278,11 +265,10 @@
"deploy-megapixel",
"deploy-jquery",
"deploy-underscore",
"deploy-bootstrap",
"deploy-iscroll",
"deploy-fetch",
"deploy-es6-promise",
"deploy-common-embed"
]
}
}
}

6
build/documenteditor.json
View File

@ -26,7 +26,6 @@
"underscore": "../vendor/underscore/underscore",
"backbone": "../vendor/backbone/backbone",
"text": "../vendor/requirejs-text/text",
"bootstrap": "../vendor/bootstrap/dist/js/bootstrap",
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
@ -55,11 +54,6 @@
],
"exports": "Backbone"
},
"bootstrap": {
"deps": [
"jquery"
]
},
"perfectscrollbar": {
"deps": [
"jmousewheel"

15137
build/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
build/package.json
View File

@ -36,11 +36,11 @@
"trim-newlines": "3.0.1",
"mkdirp": "0.5.6",
"less-plugin-clean-css@1.5.1": {
"clean-css": "4.1.11"
"clean-css": "5.3.3"
}
},
"devDependencies": {
"chai": "^4.3.7",
"chai": "^5.1.0",
"grunt-mocha": "^1.2.0",
"mocha": "^10.2.0"
}

2
build/plugins/grunt-inline/package.json
View File

@ -22,7 +22,7 @@
"node": ">=0.8.0"
},
"devDependencies": {
"grunt-contrib-nodeunit": "^4.0.0",
"grunt-contrib-nodeunit": "^5.0.0",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-htmlmin": "^3.1.0",
"grunt": "^1.4.0"

10
build/plugins/grunt-inline/tasks/inline.js
View File

@ -135,7 +135,15 @@ module.exports = function(grunt) {
let c = rawstr;
if ( options.uglify ) {
const uglstr = UglifyJS.minify(rawstr);
const opts = {
output: {
comments: false,
beautify: false,
},
mangle: false,
compress: false,
};
const uglstr = UglifyJS.minify(rawstr, opts);
if ( uglstr.error == undefined )
c = uglstr.code;
else grunt.log.error("uglify error " + uglstr.code);

6
build/presentationeditor.json
View File

@ -26,7 +26,6 @@
"underscore": "../vendor/underscore/underscore",
"backbone": "../vendor/backbone/backbone",
"text": "../vendor/requirejs-text/text",
"bootstrap": "../vendor/bootstrap/dist/js/bootstrap",
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
@ -55,11 +54,6 @@
],
"exports": "Backbone"
},
"bootstrap": {
"deps": [
"jquery"
]
},
"perfectscrollbar": {
"deps": [
"jmousewheel"

6
build/spreadsheeteditor.json
View File

@ -26,7 +26,6 @@
"underscore": "../vendor/underscore/underscore",
"backbone": "../vendor/backbone/backbone",
"text": "../vendor/requirejs-text/text",
"bootstrap": "../vendor/bootstrap/dist/js/bootstrap",
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:",
@ -55,11 +54,6 @@
],
"exports": "Backbone"
},
"bootstrap": {
"deps": [
"jquery"
]
},
"perfectscrollbar": {
"deps": [
"jmousewheel"

2
build/sprites/Gruntfile.js
View File

@ -1,5 +1,5 @@
/*
* (c) Copyright Ascensio System SIA 2010-2023
* (c) Copyright Ascensio System SIA 2010-2024
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)