style: simplify eslint and prettier config

.eslintrc.json

@@ -1,11 +1,23 @@
 {
-  "extends": ["okonet/node"],
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    },
+    "sourceType": "script"
+  },
+  "env": {
+    "es6": true,
+    "node": true
+  },
+  "extends": ["eslint:recommended", "prettier"],
+  "plugins": ["node", "import", "prettier"],
   "rules": {
     "no-console": "off",
     "node/no-unsupported-features/node-builtins": "off",
     "node/no-unsupported-features/es-syntax": ["error", { "version": ">=10.13.0" }],
     "node/no-unsupported-features/es-builtins": ["error", { "version": ">=10.13.0" }],
-    "prettier/prettier": "off",
-    "require-atomic-updates": "off"
+    "prettier/prettier": "error"
   }
 }

.lintstagedrc.json

@@ -1,4 +1,4 @@
 {
-  "*.{js,json,md}": "prettier --write",
-  "*.js": "npm run lint:base -- --fix"
+  "*.js": "eslint --fix",
+  "*.{json,md}": "prettier --write"
 }

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "printWidth": 100,
+  "singleQuote": true,
+  "semi": false
+}

bin/lint-staged.js

@@ -15,8 +15,8 @@ const pkg = require('../package.json')
 require('please-upgrade-node')(
   Object.assign({}, pkg, {
     engines: {
-      node: '>=10.13.0' // First LTS release of 'Dubnium'
-    }
+      node: '>=10.13.0', // First LTS release of 'Dubnium'
+    },
   })
 )
 
@@ -81,7 +81,7 @@ const options = {
   quiet: !!cmdline.quiet,
   relative: !!cmdline.relative,
   shell: !!cmdline.shell,
-  verbose: !!cmdline.verbose
+  verbose: !!cmdline.verbose,
 }
 
 debug('Options parsed from command-line:', options)

lib/execGit.js

@@ -9,7 +9,7 @@ module.exports = async function execGit(cmd, options = {}) {
     const { stdout } = await execa('git', [].concat(cmd), {
       ...options,
       all: true,
-      cwd: options.cwd || process.cwd()
+      cwd: options.cwd || process.cwd(),
     })
     return stdout
   } catch ({ all }) {

lib/file.js

@@ -59,5 +59,5 @@ const writeFile = async (filename, buffer) => {
 module.exports = {
   readFile,
   unlink,
-  writeFile
+  writeFile,
 }

lib/generateTasks.js

@@ -21,7 +21,7 @@ module.exports = function generateTasks({
   cwd = process.cwd(),
   gitDir,
   files,
-  relative = false
+  relative = false,
 }) {
   debug('Generating linter tasks')
 
@@ -46,7 +46,7 @@ module.exports = function generateTasks({
         // If pattern doesn't look like a path, enable `matchBase` to
         // match against filenames in every directory. This makes `*.js`
         // match both `test.js` and `subdirectory/test.js`.
-        matchBase: !pattern.includes('/')
+        matchBase: !pattern.includes('/'),
       }
     ).map((file) => normalize(relative ? file : path.resolve(cwd, file)))
 

lib/gitWorkflow.js

@@ -13,7 +13,7 @@ const {
   GetBackupStashError,
   HideUnstagedChangesError,
   RestoreMergeStatusError,
-  RestoreUnstagedChangesError
+  RestoreUnstagedChangesError,
 } = require('./symbols')
 
 const MERGE_HEAD = 'MERGE_HEAD'
@@ -52,7 +52,7 @@ const GIT_DIFF_ARGS = [
   '--no-ext-diff', // disable external diff tools for consistent behaviour
   '--src-prefix=a/', // force prefix for consistent behaviour
   '--dst-prefix=b/', // force prefix for consistent behaviour
-  '--patch' // output a patch that can be applied
+  '--patch', // output a patch that can be applied
 ]
 const GIT_APPLY_ARGS = ['-v', '--whitespace=nowarn', '--recount', '--unidiff-zero']
 
@@ -125,7 +125,7 @@ class GitWorkflow {
     await Promise.all([
       readFile(this.mergeHeadFilename).then((buffer) => (this.mergeHeadBuffer = buffer)),
       readFile(this.mergeModeFilename).then((buffer) => (this.mergeModeBuffer = buffer)),
-      readFile(this.mergeMsgFilename).then((buffer) => (this.mergeMsgBuffer = buffer))
+      readFile(this.mergeMsgFilename).then((buffer) => (this.mergeMsgBuffer = buffer)),
     ])
     debug('Done backing up merge state!')
   }
@@ -139,7 +139,7 @@ class GitWorkflow {
       await Promise.all([
         this.mergeHeadBuffer && writeFile(this.mergeHeadFilename, this.mergeHeadBuffer),
         this.mergeModeBuffer && writeFile(this.mergeModeFilename, this.mergeModeBuffer),
-        this.mergeMsgBuffer && writeFile(this.mergeMsgFilename, this.mergeMsgBuffer)
+        this.mergeMsgBuffer && writeFile(this.mergeMsgFilename, this.mergeMsgBuffer),
       ])
       debug('Done restoring merge state!')
     } catch (error) {
@@ -252,7 +252,7 @@ class GitWorkflow {
     const matchedFileChunks = chunkFiles({
       baseDir: this.gitDir,
       files,
-      maxArgLength: this.maxArgLength
+      maxArgLength: this.maxArgLength,
     })
 
     // These additions per chunk are run "serially" to prevent race conditions.

lib/index.js

@@ -30,8 +30,8 @@ function loadConfig(configPath) {
       '.lintstagedrc.yaml',
       '.lintstagedrc.yml',
       '.lintstagedrc.js',
-      'lint-staged.config.js'
-    ]
+      'lint-staged.config.js',
+    ],
   })
 
   return configPath ? explorer.load(resolveConfig(configPath)) : explorer.search()
@@ -73,7 +73,7 @@ module.exports = async function lintStaged(
     relative = false,
     shell = false,
     stash = true,
-    verbose = false
+    verbose = false,
   } = {},
   logger = console
 ) {
@@ -116,7 +116,7 @@ module.exports = async function lintStaged(
           relative,
           shell,
           stash,
-          verbose
+          verbose,
         },
         logger
       )

lib/makeCmdTasks.js

@@ -50,7 +50,7 @@ module.exports = async function makeCmdTasks({ commands, files, gitDir, shell, v
       cmdTasks.push({
         title,
         command,
-        task: resolveTaskFn({ command, files, gitDir, isFn, shell, verbose })
+        task: resolveTaskFn({ command, files, gitDir, isFn, shell, verbose }),
       })
     }
   }

lib/messages.js

@@ -50,5 +50,5 @@ module.exports = {
   SKIPPED_GIT_ERROR,
   GIT_ERROR,
   PREVENTED_EMPTY_COMMIT,
-  RESTORE_STASH_EXAMPLE
+  RESTORE_STASH_EXAMPLE,
 }

lib/resolveTaskFn.js

@@ -80,7 +80,7 @@ module.exports = function resolveTaskFn({
   isFn,
   relative,
   shell = false,
-  verbose = false
+  verbose = false,
 }) {
   const [cmd, ...args] = parseArgsStringToArgv(command)
   debug('cmd:', cmd)

lib/runAll.js

@@ -19,7 +19,7 @@ const {
   NO_STAGED_FILES,
   NO_TASKS,
   SKIPPED_GIT_ERROR,
-  skippingBackup
+  skippingBackup,
 } = require('./messages')
 const resolveGitRepo = require('./resolveGitRepo')
 const {
@@ -30,7 +30,7 @@ const {
   hasPartiallyStagedFiles,
   restoreOriginalStateEnabled,
   restoreOriginalStateSkipped,
-  restoreUnstagedChangesSkipped
+  restoreUnstagedChangesSkipped,
 } = require('./state')
 const { GitRepoError, GetStagedFilesError, GitError } = require('./symbols')
 
@@ -66,7 +66,7 @@ const runAll = async (
     relative = false,
     shell = false,
     stash = true,
-    verbose = false
+    verbose = false,
   },
   logger = console
 ) => {
@@ -119,7 +119,7 @@ const runAll = async (
     ctx,
     dateFormat: false,
     exitOnError: false,
-    renderer: getRenderer({ debug, quiet })
+    renderer: getRenderer({ debug, quiet }),
   }
 
   const listrTasks = []
@@ -137,7 +137,7 @@ const runAll = async (
         files: task.fileList,
         gitDir,
         shell,
-        verbose
+        verbose,
       })
 
       // Add files from task to match set
@@ -155,15 +155,15 @@ const runAll = async (
             // and we want to abort on errors
             ...listrOptions,
             concurrent: false,
-            exitOnError: true
+            exitOnError: true,
           }),
         skip: () => {
           // Skip task when no files matched
           if (task.fileList.length === 0) {
             return `No staged files match ${task.pattern}`
           }
           return false
-        }
+        },
       })
     }
 
@@ -178,7 +178,7 @@ const runAll = async (
         // Skip chunk when no every task is skipped (due to no matches)
         if (chunkListrTasks.every((task) => task.skip())) return 'No tasks to run.'
         return false
-      }
+      },
     })
   }
 
@@ -199,37 +199,37 @@ const runAll = async (
     [
       {
         title: 'Preparing...',
-        task: (ctx) => git.prepare(ctx)
+        task: (ctx) => git.prepare(ctx),
       },
       {
         title: 'Hiding unstaged changes to partially staged files...',
         task: (ctx) => git.hideUnstagedChanges(ctx),
-        enabled: hasPartiallyStagedFiles
+        enabled: hasPartiallyStagedFiles,
       },
       ...listrTasks,
       {
         title: 'Applying modifications...',
         task: (ctx) => git.applyModifications(ctx),
-        skip: applyModificationsSkipped
+        skip: applyModificationsSkipped,
       },
       {
         title: 'Restoring unstaged changes to partially staged files...',
         task: (ctx) => git.restoreUnstagedChanges(ctx),
         enabled: hasPartiallyStagedFiles,
-        skip: restoreUnstagedChangesSkipped
+        skip: restoreUnstagedChangesSkipped,
       },
       {
         title: 'Reverting to original state because of errors...',
         task: (ctx) => git.restoreOriginalState(ctx),
         enabled: restoreOriginalStateEnabled,
-        skip: restoreOriginalStateSkipped
+        skip: restoreOriginalStateSkipped,
       },
       {
         title: 'Cleaning up...',
         task: (ctx) => git.cleanup(ctx),
         enabled: cleanupEnabled,
-        skip: cleanupSkipped
-      }
+        skip: cleanupSkipped,
+      },
     ],
     listrOptions
   )

lib/state.js

@@ -6,14 +6,14 @@ const {
   TaskError,
   RestoreOriginalStateError,
   GitError,
-  RestoreUnstagedChangesError
+  RestoreUnstagedChangesError,
 } = require('./symbols')
 
 const getInitialState = () => ({
   hasPartiallyStagedFiles: null,
   shouldBackup: null,
   errors: new Set([]),
-  output: []
+  output: [],
 })
 
 const hasPartiallyStagedFiles = (ctx) => ctx.hasPartiallyStagedFiles
@@ -84,5 +84,5 @@ module.exports = {
   restoreOriginalStateEnabled,
   restoreOriginalStateSkipped,
   cleanupEnabled,
-  cleanupSkipped
+  cleanupSkipped,
 }

lib/symbols.js

@@ -21,5 +21,5 @@ module.exports = {
   RestoreMergeStatusError,
   RestoreOriginalStateError,
   RestoreUnstagedChangesError,
-  TaskError
+  TaskError,
 }

lib/validateConfig.js

@@ -15,7 +15,7 @@ const TEST_DEPRECATED_KEYS = new Map([
   ['ignore', (key) => Array.isArray(key)],
   ['subTaskConcurrency', (key) => typeof key === 'number'],
   ['renderer', (key) => typeof key === 'string'],
-  ['relative', (key) => typeof key === 'boolean']
+  ['relative', (key) => typeof key === 'boolean'],
 ])
 
 const formatError = (helpMsg) => `● Validation Error:

package.json

@@ -21,9 +21,7 @@
   ],
   "scripts": {
     "cz": "git-cz",
-    "lint:base": "eslint --rule \"prettier/prettier: 2\"",
-    "lint": "npm run lint:base -- .",
-    "lint:fix": "npm run lint -- --fix",
+    "lint": "eslint .",
     "pretest": "npm run lint",
     "test": "jest --coverage",
     "test:watch": "jest --watch"
@@ -52,18 +50,14 @@
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.9.5",
     "@babel/preset-env": "^7.9.5",
-    "babel-eslint": "^10.1.0",
+    "babel-eslint": "10.1.0",
     "babel-jest": "^25.3.0",
     "consolemock": "^1.1.0",
     "eslint": "^6.8.0",
-    "eslint-config-okonet": "^7.0.2",
     "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-flowtype": "^4.7.0",
     "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-react": "^7.19.0",
     "fs-extra": "^9.0.0",
     "husky": "^4.2.5",
     "jest": "^25.3.0",

test/__mocks__/advanced-config.js

@@ -1,4 +1,4 @@
 module.exports = {
   '*.css': (filenames) => `echo ${filenames.join(' ')}`,
-  '*.js': (filenames) => filenames.map((filename) => `echo ${filename}`)
+  '*.js': (filenames) => filenames.map((filename) => `echo ${filename}`),
 }