From c4882b600f132c323b3b90a96c5363cc9bc21d68 Mon Sep 17 00:00:00 2001 From: Jai Bhagat Date: Tue, 28 Dec 2021 09:33:58 -0500 Subject: [PATCH] ui: match eslintrc with ember-new-output --- ui/.eslintrc.js | 43 ++++++++++++++----------------------------- ui/.prettierignore | 21 +++++++++++++++++++++ ui/.prettierrc.js | 5 +++++ 3 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 ui/.prettierignore create mode 100644 ui/.prettierrc.js diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index 99a0745c2..b952b5182 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -2,17 +2,6 @@ module.exports = { root: true, - globals: { - server: true, - }, - env: { - browser: true, - es6: true, - }, - extends: [ - 'eslint:recommended', - 'plugin:ember/recommended', - ], parser: 'babel-eslint', parserOptions: { ecmaVersion: 2018, @@ -21,20 +10,15 @@ module.exports = { legacyDecorators: true, }, }, - plugins: [ - 'ember' - ], + globals: { + server: true, + }, + env: { + browser: true, + }, + plugins: ['ember'], + extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'], rules: { - indent: ['error', 2, { SwitchCase: 1 }], - 'linebreak-style': ['error', 'unix'], - quotes: ['error', 'single', 'avoid-escape'], - semi: ['error', 'always'], - 'no-constant-condition': [ - 'error', - { - checkLoops: false, - }, - ], 'ember/classic-decorator-hooks': 'error', 'ember/classic-decorator-no-classic-methods': 'error', 'ember/no-get': 'off', @@ -45,13 +29,14 @@ module.exports = { { files: [ '.eslintrc.js', + '.prettierrc.js', '.template-lintrc.js', 'ember-cli-build.js', 'testem.js', 'blueprints/*/index.js', 'config/**/*.js', - 'server/**/*.js', 'lib/*/index.js', + 'server/**/*.js', ], parserOptions: { sourceType: 'script', @@ -62,13 +47,13 @@ module.exports = { }, plugins: ['node'], rules: { - 'node/no-unpublished-require': 'off' + // this can be removed once the following is fixed + // https://github.com/mysticatea/eslint-plugin-node/issues/77 + 'node/no-unpublished-require': 'off', }, }, { - files: [ - 'stories/**/*.js' - ], + files: ['stories/**/*.js'], parserOptions: { sourceType: 'module', }, diff --git a/ui/.prettierignore b/ui/.prettierignore new file mode 100644 index 000000000..922165552 --- /dev/null +++ b/ui/.prettierignore @@ -0,0 +1,21 @@ +# unconventional js +/blueprints/*/files/ +/vendor/ + +# compiled output +/dist/ +/tmp/ + +# dependencies +/bower_components/ +/node_modules/ + +# misc +/coverage/ +!.* +.eslintcache + +# ember-try +/.node_modules.ember-try/ +/bower.json.ember-try +/package.json.ember-try diff --git a/ui/.prettierrc.js b/ui/.prettierrc.js new file mode 100644 index 000000000..534e6d35a --- /dev/null +++ b/ui/.prettierrc.js @@ -0,0 +1,5 @@ +'use strict'; + +module.exports = { + singleQuote: true, +};