Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #446 from ONLYOFFICE/feature/pr-fix-bug-45991

Browse source 
[deploy] fix bug 45991
This commit is contained in:
Julia Radzhabova 2020-07-31 10:09:20 +03:00 committed by GitHub
parent 7f94838c92 58952fcc9a
commit 94b63a8981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/Gruntfile.js
View file

@ -352,19 +352,14 @@ module.exports = function(grunt) {
help: { help: {
files: packageFile['main']['copy']['help'] files: packageFile['main']['copy']['help']
}, },
'index-page': { indexhtml: {
files: packageFile['main']['copy']['index-page'] files: packageFile['main']['copy']['indexhtml']
} }
}, },
inline: { inline: {
'index-page': { dist: {
src: packageFile.main.copy['index-page'][0].dest, src: '<%= pkg.main.copy.indexhtml[0].dest %>/*.html'
dest: packageFile.main.copy['index-page'][0].dest
},
'old-loader-page': {
src: packageFile.main.copy['index-page'][1].dest,
dest: packageFile.main.copy['index-page'][1].dest
} }
}, },
@ -594,7 +589,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']); grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']);
grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less', grunt.registerTask('deploy-app-main', ['prebuild-icons-sprite', 'main-app-init', 'clean:prebuild', 'imagemin', 'less',
'requirejs', 'concat', 'copy', 'svgmin', 'inline:index-page', 'inline:old-loader-page', 'json-minify', 'requirejs', 'concat', 'copy', 'svgmin', 'inline', 'json-minify',
'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']); 'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']);
grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', 'cssmin', 'copy:template-backup', grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', 'cssmin', 'copy:template-backup',

17
build/documenteditor.json
View file

@ -1,7 +1,7 @@
{ {
"name": "documenteditor", "name": "documenteditor",
"version": "4.3.0", "version": "4.3.0",
"build": 1148, "build": 1149,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"main": { "main": {
@ -172,14 +172,15 @@
"dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/help/"
} }
], ],
"index-page": [ "indexhtml": [
{ {
"src": "../apps/documenteditor/main/index.html.deploy", "expand": true,
"dest": "../deploy/web-apps/apps/documenteditor/main/index.html" "cwd": "../apps/documenteditor/main",
}, "src": [
{ "*.html.deploy"
"src": "../apps/documenteditor/main/index_loader.html.deploy", ],
"dest": "../deploy/web-apps/apps/documenteditor/main/index_loader.html" "ext": ".html",
"dest": "../deploy/web-apps/apps/documenteditor/main"
} }
] ]
}, },

18
build/presentationeditor.json
View file

@ -1,7 +1,7 @@
{ {
"name": "presentationeditor", "name": "presentationeditor",
"version": "4.3.0", "version": "4.3.0",
"build": 782, "build": 790,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"main": { "main": {
@ -166,14 +166,16 @@
"dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/help/"
} }
], ],
"index-page": [ "indexhtml": [
{ {
"src": "../apps/presentationeditor/main/index.html.deploy", "expand": true,
"dest": "../deploy/web-apps/apps/presentationeditor/main/index.html" "cwd": "../apps/presentationeditor/main",
}, "src": [
{ "*.html.deploy",
"src": "../apps/presentationeditor/main/index_loader.html.deploy", "!*.reporter.html.deploy"
"dest": "../deploy/web-apps/apps/presentationeditor/main/index_loader.html" ],
"ext": ".html",
"dest": "../deploy/web-apps/apps/presentationeditor/main/"
} }
] ]
}, },

21
build/spreadsheeteditor.json
View file

@ -1,7 +1,7 @@
{ {
"name": "spreadsheeteditor", "name": "spreadsheeteditor",
"version": "4.3.0", "version": "4.3.0",
"build": 886, "build": 903,
"homepage": "http://www.onlyoffice.com", "homepage": "http://www.onlyoffice.com",
"private": true, "private": true,
"main": { "main": {
@ -180,18 +180,15 @@
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/help/"
} }
], ],
"index-page": [ "indexhtml": [
{ {
"src": "../apps/spreadsheeteditor/main/index.html.deploy", "expand": true,
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index.html" "cwd": "../apps/spreadsheeteditor/main",
}, "src": [
{ "*.html.deploy"
"src": "../apps/spreadsheeteditor/main/index_loader.html.deploy", ],
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index_loader.html" "ext": ".html",
}, "dest": "../deploy/web-apps/apps/spreadsheeteditor/main"
{
"src": "../apps/spreadsheeteditor/main/index_internal.html.deploy",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/main/index_internal.html"
} }
] ]
}, },