From 5b15d398719f7db7ad5eb43cf2c2f9fae748ca04 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Fri, 26 Apr 2019 12:58:43 -0400
Subject: [PATCH] Shuffle some test coverage setting around

---
 jest.config.js | 12 +++---------
 package.json   | 13 +++++--------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 5cd41a30a..c4a90b460 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,19 +1,13 @@
 module.exports = {
   verbose: true,
-  testPathIgnorePatterns: [
-    '<rootDir>/node_modules/',
-    '<rootDir>/public/',
-    '<rootDir>/extensions/',
-  ],
+  testPathIgnorePatterns: ['!**/node_modules/**'],
   testMatch: ['<rootDir>/src/**/*.test.js'],
   //
   collectCoverage: false,
   collectCoverageFrom: [
-    '**/*.{js,jsx}',
+    '<rootDir>/src/**/*.{js,jsx}',
+    '!<rootDir>/src/**/*.test.js',
     '!**/node_modules/**',
-    '!<rootDir>/public/**',
-    '!<rootDir>/extensions/**',
-    '!<rootDir>/dist/**',
   ],
   reporters: ['default', 'jest-junit'],
   //
diff --git a/package.json b/package.json
index 90aad047b..517236cf1 100644
--- a/package.json
+++ b/package.json
@@ -15,20 +15,17 @@
     "npm": ">=5"
   },
   "scripts": {
+    "dev": "yarn run prep && cross-env PORT=5000 react-scripts start",
+    "dev:debug": "cross-env PORT=5000 react-scripts start",
     "build": "yarn run prep && node --max-old-space-size=4096 node_modules/rollup/bin/rollup -c",
-    "prepublishOnly": "yarn run build",
     "lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}",
-    "prepare": "yarn run build",
-    "predeploy": "cd example && npm install && yarn run build",
     "test": "jest",
     "test:ci": "jest --ci --runInBand --collectCoverage --reporters=default --reporters=jest-junit && codecov",
-    "copy:webworkers": "cpx 'node_modules/cornerstone-wado-image-loader/dist/*.min.js*' public",
     "staticDeploy": "./generateStaticSite.sh",
+    "predeploy": "cd example && npm install && yarn run build",
+    "preBuild": "yarn run version && yarn run copy:webworkers",
     "version": "node -p -e \"'export default \\'' + require('./package.json').version + '\\';'\" > src/version.js",
-    "details": "yarn run version",
-    "prep": "yarn run details && yarn run copy:webworkers",
-    "start": "yarn run prep && cross-env PORT=5000 react-scripts start",
-    "start:debug": "cross-env PORT=5000 react-scripts start"
+    "copy:webworkers": "cpx 'node_modules/cornerstone-wado-image-loader/dist/*.min.js*' public"
   },
   "peerDependencies": {
     "react": "^15.0.0 || ^16.0.0",