Merge 0f7a40e into 09cc47a

icapps · Nov 5, 2018 · 85f2f30 · 85f2f30
2 parents 09cc47a + 0f7a40e
commit 85f2f30
Show file tree

Hide file tree

Showing 10 changed files with 8,796 additions and 4,630 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,6 @@ node_modules
 
 # NPM
 .npm
-package-lock.json
 
 # Yarn
 .yarnclean

diff --git a/.nvmrc b/.nvmrc
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,18 @@
 language: node_js
 
 node_js:
+  - "6"
   - "8"
+  - "10"
 
 sudo: false
 
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH="$HOME/.yarn/bin:$PATH"
-
 cache:
-  yarn: true
   directories:
     - "node_modules"
 
 script:
-  - yarn run test:coverage
+  - npm run test:coverage
 
 # Send coverage data to Coveralls
 after_script: "cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js"
diff --git a/.yarnrc b/.yarnrc
diff --git a/jest.config.js b/jest.config.js
@@ -17,7 +17,7 @@ module.exports = {
     "json"
   ],
   transform: {
-    "\\.(ts|tsx)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+    "\\.(ts|tsx)$": "ts-jest"
   },
   testRegex: "/tests/.*\\.(ts|tsx|js)$",
   coveragePathIgnorePatterns: [