Update Gruntfile.js (#378)

* Update Gruntfile.js

* Update package.json
This commit is contained in:
maxkadushkin 2020-04-07 13:52:53 +03:00 committed by GitHub
parent 41cde55b5c
commit 98b2897594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View file

@ -12,13 +12,18 @@ module.exports = function(grunt) {
' * Version: <%= pkg.version %> (build:<%= pkg.build %>)\n' + ' * Version: <%= pkg.version %> (build:<%= pkg.build %>)\n' +
' */\n'; ' */\n';
let iconv_lite, encoding = process.env.SYSTEM_ENCODING;
grunt.log.writeln('platform: ' + process.platform.green); grunt.log.writeln('platform: ' + process.platform.green);
let iconv_lite, encoding = process.env.SYSTEM_ENCODING || 'win1251';
if (process.platform == 'win32') { if (process.platform == 'win32') {
const cmdencoding = require('child_process').execSync('chcp'); const cmdencoding = require('child_process').execSync('chcp');
grunt.log.writeln(cmdencoding); grunt.log.writeln(cmdencoding);
if ( cmdencoding.includes('866') ) { if ( !encoding ) {
if ( cmdencoding.includes('866') ) encoding = '1251'; else
if ( cmdencoding.includes('437') ) encoding = '1252'; else
if ( cmdencoding.includes('65001') ) encoding = 'utf8';
}
if ( !!encoding && !/utf-?8/i.test(encoding) ) {
iconv_lite = require('iconv-lite'); iconv_lite = require('iconv-lite');
} }
} }

View file

@ -22,7 +22,7 @@
"grunt-svgmin": "^6.0.0", "grunt-svgmin": "^6.0.0",
"grunt-text-replace": "0.3.11", "grunt-text-replace": "0.3.11",
"iconsprite": "file:sprites", "iconsprite": "file:sprites",
"iconv": "^2.3.5", "iconv-lite": "^0.5.1",
"less-plugin-clean-css": "1.5.0", "less-plugin-clean-css": "1.5.0",
"lodash": "^4.0.0", "lodash": "^4.0.0",
"mocha": "^6.2.2", "mocha": "^6.2.2",