[chore] resolve typecheck & test conflicts

Author: paularmstrong

.travis.yml

@@ -3,8 +3,8 @@ node_js:
   - "8"
 script:
   - npm run lint:ci
-  - npm run flow -- check
   - npm run test:ci
   - npm run build
+  - npm run typecheck
 after_success:
   - npm run test:coverage

husky.config.js

@@ -5,6 +5,6 @@ module.exports = {
     'post-checkout': `if [[ $HUSKY_GIT_PARAMS =~ 1$ ]]; then ${runYarnLock}; fi`,
     'post-merge': runYarnLock,
     'post-rebase': 'yarn install',
-    'pre-commit': 'yarn flow check && yarn lint-staged'
+    'pre-commit': 'yarn typecheck && yarn lint-staged'
   }
 };

jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  testMatch: ['**/__tests__/**/*.test.js']
+};

package.json

@@ -29,11 +29,12 @@
   "typings": "index.d.ts",
   "sideEffects": false,
   "scripts": {
-    "build": "npm run clean && npm-run-all --parallel build:*",
+    "build": "npm run clean && run-p build:*",
     "build:development": "NODE_ENV=development rollup -c",
     "build:production": "NODE_ENV=production rollup -c",
     "clean": "rimraf dist",
     "flow": "flow",
+    "flow:ci": "flow check",
     "lint": "yarn lint:cmd --fix",
     "lint:ci": "yarn lint:cmd",
     "lint:cmd": "eslint . --ext '.js,.json,.snap' --cache",
@@ -42,7 +43,9 @@
     "prepublishOnly": "npm run build",
     "test": "jest",
     "test:ci": "jest --ci",
-    "test:coverage": "npm run test -- --coverage && cat ./coverage/lcov.info | coveralls"
+    "test:coverage": "npm run test -- --coverage && cat ./coverage/lcov.info | coveralls",
+    "tsc:ci": "tsc --noEmit typescript-tests/*",
+    "typecheck": "run-p flow:ci tsc:ci"
   },
   "author": "Paul Armstrong",
   "contributors": [
@@ -76,8 +79,7 @@
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-filesize": "^6.1.0",
     "rollup-plugin-terser": "^5.0.0",
-    "typescript": "^3.4.5",
-    "typescript-definition-tester": "^0.0.6"
+    "typescript": "^3.4.5"
   },
   "dependencies": {}
 }

src/__tests__/typescript.test.js

@@ -1,4 +1,4 @@
-import { denormalize, normalize, schema } from '../../../index';
+import { denormalize, normalize, schema } from '../index'
 
 const data = [{ id: '123', name: 'Jim' }, { id: '456', name: 'Jane' }];
 const userSchema = new schema.Entity('users');

src/__tests__/typescript/array.ts typescript-tests/array.tssrc/__tests__/typescript/array.ts renamed to typescript-tests/array.ts

@@ -1,4 +1,4 @@
-import { denormalize, normalize, schema } from '../../../index';
+import { denormalize, normalize, schema } from '../index'
 
 const data = [{ id: 1, type: 'admin' }, { id: 2, type: 'user' }];
 const userSchema = new schema.Entity('users');

src/__tests__/typescript/array_schema.ts typescript-tests/array_schema.tssrc/__tests__/typescript/array_schema.ts renamed to typescript-tests/array_schema.ts

@@ -1,4 +1,4 @@
-import { denormalize, normalize, schema } from '../../../index';
+import { denormalize, normalize, schema } from '../index'
 
 type User = {
   id_str: string;

src/__tests__/typescript/entity.ts typescript-tests/entity.tssrc/__tests__/typescript/entity.ts renamed to typescript-tests/entity.ts

@@ -1,4 +1,4 @@
-import { normalize, schema } from '../../../index';
+import { normalize, schema } from '../index'
 
 const user = new schema.Entity('users');
 

src/__tests__/typescript/github.ts typescript-tests/github.tssrc/__tests__/typescript/github.ts renamed to typescript-tests/github.ts

@@ -1,4 +1,4 @@
-import { normalize, schema } from '../../../index';
+import { normalize, schema } from '../index'
 
 const data = {
   /* ...*/