Merge pull request #110 from victorperin/revert-107-refactor/simplify…

…-scanFromFile Revert "Refactor: simplify scan from file"
victorperin · Feb 2, 2020 · 2c3e601 · 2c3e601
2 parents 3996470 + e36cdfc
commit 2c3e601
Show file tree

Hide file tree

Showing 16 changed files with 4,485 additions and 4,176 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -5,7 +5,6 @@ plugins:
       editorconfig: .editorconfig
   eslint:
     enabled: true
-    channel: "eslint-6"
 
 exclude_patterns:
   - node_modules/*

diff --git a/.eslintrc → .eslintrc.json b/.eslintrc → .eslintrc.json
@@ -5,20 +5,18 @@
     "node": true,
     "jest": true
   },
-  "extends": [
-    "airbnb-base",
-    "prettier",
-    "plugin:node/recommended"
-  ],
-  "plugins": [
-    "prettier"
-  ],
+  "extends": ["airbnb-base", "prettier"],
+  "plugins": ["prettier", "editorconfig"],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
   "parserOptions": {
-    "ecmaVersion": 9,
-    "sourceType": "module"
+    "ecmaVersion": 2018
   },
   "rules": {
     "prettier/prettier": ["error"],
+    "editorconfig/editorconfig": "error",
     "no-console": "off",
     "comma-dangle": ["error", "always-multiline"],
     "import/prefer-default-export": "off"

diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 node_modules
 bin
 coverage
-.nyc_output
diff --git a/.prettierrc b/.prettierrc
@@ -2,6 +2,5 @@
   "printWidth": 100,
   "semi": false,
   "singleQuote": true,
-  "trailingComma": "all",
-  "endOfLine": "lf"
+  "trailingComma": "all"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,6 @@ before_script:
 
 script:
   - commitlint-travis
-  - if [ "$TRAVIS_OS_NAME" = "linux"   ]; then           npm run linter           ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux"   ]; then   xvfb-run npm run test:coverage   ; fi
   - if [ "$TRAVIS_OS_NAME" = "osx"     ]; then        npm run test:coverage       ; fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ]; then        npm run test:coverage       ; fi

diff --git a/jest.config.js b/jest.config.js
@@ -1,9 +1,8 @@
 module.exports = {
   clearMocks: true,
-  // collectCoverage: true,
-  // collectCoverageFrom: ['src/**'],
-  // coverageReporters: ['lcov', 'text'],
-  // coverageDirectory: 'coverage',
+  collectCoverage: true,
+  collectCoverageFrom: ['<rootDir>/src/**/*.js'],
+  coverageDirectory: 'coverage',
   testEnvironment: 'node',
   testMatch: ['<rootDir>/tests/**/*.test.js', '<rootDir>/src/**/*.test.js'],
   verbose: true,