Merge branch 'master' into relative

Author: tleunen

.circleci/config.yml

@@ -0,0 +1,45 @@
+version: 2
+jobs:
+  test_with_node_6:
+    docker:
+      - image: circleci/node:6
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: npm install
+      - run:
+          name: Test
+          command: npm test
+  test_with_node_8:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: npm install
+      - run:
+          name: Test
+          command: npm test
+  test_with_node_9:
+    docker:
+      - image: circleci/node:9
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: npm install
+      - run:
+          name: Test
+          command: npm run test:coverage
+      - run:
+          name: Deploy coverage
+          command: bash <(curl -s https://codecov.io/bash)
+workflows:
+  version: 2
+  test_all:
+    jobs:
+      - test_with_node_6
+      - test_with_node_8
+      - test_with_node_9

.editorconfig

@@ -1,6 +1,9 @@
+root = true
+
 [*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
 indent_style = space
 indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.eslintrc.js

@@ -1,10 +1,6 @@
-'use strict';
-
 module.exports = {
   root: true,
-  extends: [
-    'airbnb-base',
-  ],
+  extends: ['airbnb-base', 'prettier'],
   rules: {
     'no-param-reassign': [2, { props: false }],
   },

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.prettierrc.yml

@@ -0,0 +1,3 @@
+singleQuote: true
+printWidth: 100
+trailingComma: es5

appveyor.yml

@@ -1,8 +1,8 @@
 environment:
   matrix:
     - nodejs_version: '6'
-    - nodejs_version: '7'
     - nodejs_version: '8'
+    - nodejs_version: '9'
 install:
   - ps: Install-Product node $env:nodejs_version
   - set CI=true
@@ -18,4 +18,4 @@ clone_depth: 1
 test_script:
   - node --version
   - npm --version
-  - npm run test:suite
+  - npm run test

circle.yml

@@ -10,9 +10,7 @@
   "engines": {
     "node": ">= 6.0.0"
   },
-  "files": [
-    "lib"
-  ],
+  "files": ["lib"],
   "author": {
     "name": "Tommy Leunen",
     "email": "tommy.leunen@gmail.com",
@@ -42,40 +40,39 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-jest": "^21.2.0",
+    "babel-jest": "^22.4.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "common-tags": "^1.4.0",
-    "eslint": "^4.9.0",
-    "eslint-config-airbnb-base": "^11.3.2",
-    "eslint-plugin-import": "^2.8.0",
-    "jest": "^21.2.1",
+    "eslint": "^4.19.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-import": "^2.9.0",
+    "husky": "^0.14.3",
+    "jest": "^22.4.2",
+    "lint-staged": "^7.0.0",
+    "prettier-eslint-cli": "^4.7.1",
     "standard-version": "^4.2.0"
   },
   "scripts": {
     "lint": "eslint src test",
     "compile": "babel src --out-dir lib",
     "pretest": "npm run lint",
-    "test": "jest --coverage",
-    "test:suite": "jest",
+    "test": "jest",
+    "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "prepublish": "npm run compile",
-    "release": "standard-version"
+    "release": "standard-version",
+    "precommit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{json,md}": ["prettier-eslint --write", "git add"],
+    "*.{js}": ["prettier-eslint --write", "eslint --fix", "git add"]
   },
   "jest": {
     "testRegex": "/test/.*\\.test\\.js$",
-    "collectCoverageFrom": [
-      "src/**/*.js",
-      "!src/log.js"
-    ]
-  },
-  "greenkeeper": {
-    "ignore": [
-      "babel-jest",
-      "eslint",
-      "eslint-plugin-import"
-    ]
+    "collectCoverageFrom": ["src/**/*.js", "!src/log.js"]
   }
 }

package.json

@@ -1,8 +1,6 @@
 import path from 'path';
-
 import resolve from 'resolve';
 
-
 export function nodeResolvePath(modulePath, basedir, extensions) {
   try {
     return resolve.sync(modulePath, { basedir, extensions });
@@ -29,7 +27,7 @@ export function toLocalPath(modulePath) {
 
 export function stripExtension(modulePath, stripExtensions) {
   let name = path.basename(modulePath);
-  stripExtensions.some((extension) => {
+  stripExtensions.some(extension => {
     if (name.endsWith(extension)) {
       name = name.slice(0, name.length - extension.length);
       return true;