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 'hotfix/v6.3.1' into release/v6.4.0

Browse Source
This commit is contained in:
Maxim Kadushkin
2021-07-04 23:44:01 +03:00
parent 6309b12861 7218ed9e2a
commit 6641e9419c
151 changed files with 477 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/Gruntfile.js
View File

@ -66,6 +66,9 @@ module.exports = function(grunt) {
}, {
from: /\{\{HELP_URL\}\}/g,
to: _encode(process.env.HELP_URL) || 'https://helpcenter.onlyoffice.com'
}, {
from: /\{\{DEFAULT_LANG\}\}/g,
to: _encode(process.env.DEFAULT_LANG) || 'en'
}];
var helpreplacements = [
@ -143,12 +146,22 @@ module.exports = function(grunt) {
if (_.isObject(target) && _.isObject(source)) {
for (const key in source) {
if (_.isObject(source[key])) {
if (!target[key]) Object.assign(target, { [key]: {} });
else if (_.isArray(source[key])) target[key].push(...source[key]);
else _merge(target[key], source[key]);
let targetkey = key;
if ( key[0] == '!' ) {
targetkey = key.substring(1);
if ( _.isArray(target[targetkey]) || _.isObject(target[targetkey]) )
target[targetkey] = undefined;
}
if (_.isObject(source[key]) && target[targetkey]) {
// if (!target[targetkey]) Object.assign(target, { [targetkey]: {} });
// else
if (_.isArray(source[key])) target[targetkey].push(...source[key]);
else _merge(target[targetkey], source[key]);
} else {
Object.assign(target, { [key]: source[key] });
Object.assign(target, { [targetkey]: source[key] });
}
}
}
@ -273,10 +286,10 @@ module.exports = function(grunt) {
force: true
},
prebuild: {
src: packageFile['main']['clean']
src: packageFile.main.clean.prebuild
},
postbuild: {
src: packageFile.main.svgicons.clean
src: [...packageFile.main.svgicons.clean, ...packageFile.main.clean.postbuild]
}
},

9
build/documenteditor.json
View File

@ -5,9 +5,12 @@
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
"clean": [
"../deploy/web-apps/apps/documenteditor/main"
],
"clean": {
"prebuild": [
"../deploy/web-apps/apps/documenteditor/main"
],
"postbuild": []
},
"js": {
"requirejs": {
"options": {

9
build/presentationeditor.json
View File

@ -5,9 +5,12 @@
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
"clean": [
"../deploy/web-apps/apps/presentationeditor/main"
],
"clean": {
"prebuild": [
"../deploy/web-apps/apps/presentationeditor/main"
],
"postbuild": []
},
"js": {
"requirejs": {
"options": {

9
build/spreadsheeteditor.json
View File

@ -5,9 +5,12 @@
"homepage": "http://www.onlyoffice.com",
"private": true,
"main": {
"clean": [
"../deploy/web-apps/apps/spreadsheeteditor/main"
],
"clean": {
"prebuild": [
"../deploy/web-apps/apps/spreadsheeteditor/main"
],
"postbuild": []
},
"js": {
"requirejs": {
"options": {