ts: clean up tsconfigs

package.json

@@ -12,12 +12,14 @@
         "stylelint": "stylelint -f unix 'src/**/*.scss'",
         "lint:all": "run-p -ln eslint stylelint",
         "prettier:fix": "prettier --check --write './*.js'",
-        "test:watch": "jest --watch",
-        "test": "jest",
+        "jest:watch": "jest --watch",
+        "jest": "jest",
         "testcafe:prod": "E2E_MODE=prod testcafe --app 'npm run app:serve'",
         "testcafe:live": "E2E_MODE=dev testcafe chrome --live",
         "pre-commit": "run-p -ln lint:all",
-        "pre-push": "run-p -ln lint:all app:build test"
+        "pre-push": "run-s -ln pre-push:stage-1 pre-push:stage-2",
+        "pre-push:stage-1": "run-p -ln lint:all app:build",
+        "pre-push:stage-2": "run-p -ln testcafe:prod"
     },
     "husky": {
         "hooks": {

src/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig.base.json",
+    "extends": "../tsconfig.json",
     "compilerOptions": {
         "baseUrl": "./",
         "checkJs": false,                       /* Report errors in .js files. */

testcafe/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../tsconfig.base.json",
+    "extends": "../tsconfig.json",
     "compilerOptions": {
         "outDir": "../build/testcafe",
         "types": ["node"]

tsconfig.base.json → tsconfig.json

@@ -37,7 +37,7 @@
         "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
         "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
         /* Module Resolution Options */
-        // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+        "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
         // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
         // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
         // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */