From 2928bb75ba165c0ce0ab028e23b338100d9c32aa Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 7 Dec 2020 14:48:05 +0100 Subject: [PATCH] chore: run prettier using eslint --- .eslintrc.js | 5 +++-- packages/jest-haste-map/src/watchers/common.js | 10 +++++----- .../src/__tests__/script_transformer.test.ts | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index be7d6014b453..fa4fe611c242 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -245,7 +245,7 @@ module.exports = { '**/__tests__/**', '**/__performance_tests__/**', 'packages/diff-sequences/perf/index.js', - 'packages/pretty-format/perf/test.js' + 'packages/pretty-format/perf/test.js', ], rules: { 'import/no-unresolved': 'off', @@ -258,7 +258,7 @@ module.exports = { parserOptions: { sourceType: 'module', }, - plugins: ['markdown', 'import', 'jest'], + plugins: ['markdown', 'import', 'jest', 'prettier'], rules: { 'accessor-pairs': ['warn', {setWithoutGet: true}], 'block-scoped-var': 'off', @@ -442,6 +442,7 @@ module.exports = { 'prefer-arrow-callback': ['error', {allowNamedFunctions: true}], 'prefer-const': 'error', 'prefer-template': 'off', + 'prettier/prettier': 'error', quotes: [ 'error', 'single', diff --git a/packages/jest-haste-map/src/watchers/common.js b/packages/jest-haste-map/src/watchers/common.js index d2c27cbc134f..514e94aa49a2 100644 --- a/packages/jest-haste-map/src/watchers/common.js +++ b/packages/jest-haste-map/src/watchers/common.js @@ -27,7 +27,7 @@ exports.ALL_EVENT = 'all'; * @public */ -exports.assignOptions = function(watcher, opts) { +exports.assignOptions = function (watcher, opts) { opts = opts || {}; watcher.globs = opts.glob || []; watcher.dot = opts.dot || false; @@ -56,12 +56,12 @@ exports.assignOptions = function(watcher, opts) { * @public */ -exports.isFileIncluded = function(globs, dot, doIgnore, relativePath) { +exports.isFileIncluded = function (globs, dot, doIgnore, relativePath) { if (doIgnore(relativePath)) { return false; } return globs.length - ? micromatch.some(relativePath, globs, { dot }) + ? micromatch.some(relativePath, globs, {dot}) : dot || micromatch.some(relativePath, '**/*'); }; @@ -76,13 +76,13 @@ exports.isFileIncluded = function(globs, dot, doIgnore, relativePath) { * @public */ -exports.recReaddir = function( +exports.recReaddir = function ( dir, dirCallback, fileCallback, endCallback, errorCallback, - ignored + ignored, ) { walker(dir) .filterDir(currentDir => !anymatch(ignored, currentDir)) diff --git a/packages/jest-transform/src/__tests__/script_transformer.test.ts b/packages/jest-transform/src/__tests__/script_transformer.test.ts index 7be705772ae0..ceaf7203ee42 100644 --- a/packages/jest-transform/src/__tests__/script_transformer.test.ts +++ b/packages/jest-transform/src/__tests__/script_transformer.test.ts @@ -779,8 +779,8 @@ describe('ScriptTransformer', () => { scriptTransformer.transform(fileName2, getCoverageOptions()); - expect(testPreprocessor.getCacheKey.mock.calls[0][2].cacheFS).toBeDefined() - expect(testPreprocessor.process.mock.calls[0][2].cacheFS).toBeDefined() + expect(testPreprocessor.getCacheKey.mock.calls[0][2].cacheFS).toBeDefined(); + expect(testPreprocessor.process.mock.calls[0][2].cacheFS).toBeDefined(); expect(fs.readFileSync).toHaveBeenCalledTimes(1); expect(fs.readFileSync).toBeCalledWith(fileName1, 'utf8'); });