From 8395c4d4812bf4eb5a83d5916f442b169bb25f34 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 18 Jan 2022 11:22:44 +0300 Subject: [PATCH 1/2] [build] refactoring --- build/Gruntfile.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 3df6b23d0..9073b9d5e 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -33,7 +33,7 @@ module.exports = function(grunt) { return !!string && !!iconv_lite ? iconv_lite.encode(string,encoding) : string; }; - var jsreplacements = [ + global.jsreplacements = [ { from: /\{\{SUPPORT_EMAIL\}\}/g, to: _encode(process.env.SUPPORT_EMAIL) || 'support@onlyoffice.com' @@ -355,12 +355,12 @@ module.exports = function(grunt) { replacements: [{ from: /\{\{PRODUCT_VERSION\}\}/g, to: packageFile.version - }] + }, ...global.jsreplacements] }, prepareHelp: { src: ['<%= pkg.main.copy.help[0].dest %>/ru/**/*.htm*'], overwrite: true, - replacements: [] + replacements: [...helpreplacements] } }, @@ -427,10 +427,10 @@ module.exports = function(grunt) { } }); - var replace = grunt.config.get('replace'); - replace.writeVersion.replacements.push(...jsreplacements); - replace.prepareHelp.replacements.push(...helpreplacements); - grunt.config.set('replace', replace); + // var replace = grunt.config.get('replace'); + // replace.writeVersion.replacements.push(...global.jsreplacements); + // replace.prepareHelp.replacements.push(...helpreplacements); + // grunt.config.set('replace', replace); }); grunt.registerTask('deploy-reporter', function(){ From 3b3f0ef29723b29817c53a01449bd665d9fb59a7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 18 Jan 2022 11:23:41 +0300 Subject: [PATCH 2/2] [forms] replace inlined variables --- build/appforms.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/build/appforms.js b/build/appforms.js index f12e37e56..7d0238af6 100644 --- a/build/appforms.js +++ b/build/appforms.js @@ -65,6 +65,17 @@ module.exports = (grunt) => { } }, + replace: { + varsEnviroment: { + src: ['<%= pkg.forms.js.requirejs.options.out %>'], + overwrite: true, + replacements: [{ + from: /\{\{PRODUCT_VERSION\}\}/g, + to: packageFile.version + }, ...global.jsreplacements] + }, + }, + inline: { dist: { src: packageFile.forms.inline.src @@ -76,5 +87,5 @@ module.exports = (grunt) => { grunt.registerTask('deploy-app-forms', ['forms-app-init', 'clean:prebuild', /*'imagemin',*/ 'less', 'requirejs', 'concat', 'copy', 'inline', /*'json-minify',*/ - /*'replace:writeVersion',*/ /*'replace:prepareHelp',*/ 'clean:postbuild']); + 'replace:varsEnviroment', /*'replace:prepareHelp',*/ 'clean:postbuild']); } \ No newline at end of file