diff --git a/.eslintrc b/.eslintrc
index 8b48b14f..cbccbe41 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,6 @@
{
- "extends": "standard",
+ "extends": ["standard", "plugin:prettier/recommended"],
"rules": {
- "indent": ["error", 4, { "SwitchCase": 1 }],
"semi": ["error", "always"],
"one-var": "off",
"space-before-function-paren": "off",
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..b28a7fcb
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,7 @@
+{
+ "tabWidth": 4,
+ "singleQuote": true,
+ "printWidth": 120,
+ "trailingComma": "none",
+ "quoteProps": "preserve"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index adb2e29e..04c8b948 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -144,7 +144,7 @@ module.exports = function(grunt) {
eslint: {
app: ['app/scripts/**/*.js'],
desktop: ['desktop/**/*.js', '!desktop/node_modules/**'],
- grunt: ['Gruntfile.js', 'grunt/**/*.js']
+ grunt: ['Gruntfile.js', 'build/**/*.js']
},
inline: {
app: {
@@ -182,12 +182,21 @@ module.exports = function(grunt) {
files: { 'tmp/desktop/app/index.html': 'dist/index.html' }
},
'desktop-public-key': {
- options: { replacements: [{ pattern: '\'@@PUBLIC_KEY_CONTENT\'', replacement:
- '`' + fs.readFileSync('app/resources/public-key.pem', {encoding: 'utf8'}).trim() + '`' }] },
+ options: {
+ replacements: [
+ {
+ pattern: "'@@PUBLIC_KEY_CONTENT'",
+ replacement:
+ '`' + fs.readFileSync('app/resources/public-key.pem', { encoding: 'utf8' }).trim() + '`'
+ }
+ ]
+ },
files: { 'tmp/desktop/app/main.js': 'desktop/main.js' }
},
'cordova-html': {
- options: { replacements: [{ pattern: '