diff --git a/.prettierrc b/.prettierrc index b28a7fcb..6dc5529b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,7 +1,7 @@ { "tabWidth": 4, "singleQuote": true, - "printWidth": 120, + "printWidth": 100, "trailingComma": "none", "quoteProps": "preserve" } diff --git a/Gruntfile.js b/Gruntfile.js index 04c8b948..ec7ac606 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,7 +22,8 @@ module.exports = function(grunt) { const year = date.getFullYear(); const minElectronVersionForUpdate = '4.0.1'; const zipCommentPlaceholderPart = 'zip_comment_placeholder_that_will_be_replaced_with_hash'; - const zipCommentPlaceholder = zipCommentPlaceholderPart + '.'.repeat(512 - zipCommentPlaceholderPart.length); + const zipCommentPlaceholder = + zipCommentPlaceholderPart + '.'.repeat(512 - zipCommentPlaceholderPart.length); const electronVersion = pkg.dependencies.electron.replace(/^\D/, ''); grunt.initConfig({ @@ -124,7 +125,8 @@ module.exports = function(grunt) { }, 'desktop-darwin-installer': { cwd: 'package/osx/KeeWeb Installer.app', - dest: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app', + dest: + 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app', src: '**', expand: true, nonull: true, @@ -167,18 +169,30 @@ module.exports = function(grunt) { manifest: { options: { replacements: [ - { pattern: '# YYYY-MM-DD:v0.0.0', replacement: '# ' + dt + ':v' + pkg.version }, - { pattern: '# updmin:v0.0.0', replacement: '# updmin:v' + minElectronVersionForUpdate } + { + pattern: '# YYYY-MM-DD:v0.0.0', + replacement: '# ' + dt + ':v' + pkg.version + }, + { + pattern: '# updmin:v0.0.0', + replacement: '# updmin:v' + minElectronVersionForUpdate + } ] }, files: { 'dist/manifest.appcache': 'app/manifest.appcache' } }, 'manifest-html': { - options: { replacements: [{ pattern: ' - - - -
- - + + +