diff --git a/jest/config.js b/jest/config.js index 45146c37f..1ebcdc1c8 100644 --- a/jest/config.js +++ b/jest/config.js @@ -1,9 +1,15 @@ module.exports = { - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], + moduleFileExtensions: ['ts', 'js'], transform: { - '^.+\\.(js|jsx|ts|tsx)$': 'babel-jest', + '^.+\\.(js|ts)$': 'babel-jest', }, - verbose: true, + verbose: false, collectCoverage: true, + collectCoverageFrom: [ + "src/**/*.ts", + "!**/node_modules/**", + "!**/partials/**", + "!**/fixture/**", + ], coveragePathIgnorePatterns: ['node_modules', 'fixtures'], }; diff --git a/packages/loaders/jest.config.js b/packages/loaders/jest.config.js index 91554a23b..ae0866389 100644 --- a/packages/loaders/jest.config.js +++ b/packages/loaders/jest.config.js @@ -1,6 +1,4 @@ const config = require('../../jest/config'); -module.exports = Object.assign({}, config, { - collectCoverage: false -}); +module.exports = Object.assign({}, config, {}); diff --git a/packages/logger/jest.config.js b/packages/logger/jest.config.js index 91554a23b..ae0866389 100644 --- a/packages/logger/jest.config.js +++ b/packages/logger/jest.config.js @@ -1,6 +1,4 @@ const config = require('../../jest/config'); -module.exports = Object.assign({}, config, { - collectCoverage: false -}); +module.exports = Object.assign({}, config, {}); diff --git a/packages/server/jest.config.js b/packages/server/jest.config.js index 4a38b60b3..898e22759 100644 --- a/packages/server/jest.config.js +++ b/packages/server/jest.config.js @@ -1,8 +1,6 @@ const config = require('../../jest/config'); module.exports = Object.assign({}, config, { - setupFilesAfterEnv: ['./jest.setup.js'], - // FIXME: coverage fails here - collectCoverage: false + setupFilesAfterEnv: ['./jest.setup.js'] }); diff --git a/packages/store/jest.config.js b/packages/store/jest.config.js index 61d0f61e0..d09544575 100644 --- a/packages/store/jest.config.js +++ b/packages/store/jest.config.js @@ -2,6 +2,6 @@ const config = require('../../jest/config'); module.exports = Object.assign({}, config, { // FIXME: coverage fails here - collectCoverage: false + collectCoverage: true }); diff --git a/packages/utils/jest.config.js b/packages/utils/jest.config.js index fcdb9d940..7da7d2da8 100644 --- a/packages/utils/jest.config.js +++ b/packages/utils/jest.config.js @@ -1,5 +1,3 @@ const config = require('../../jest/config'); -module.exports = Object.assign({}, config, { - collectCoverage: false -}); +module.exports = Object.assign({}, config, {}); diff --git a/packages/web/jest.config.js b/packages/web/jest.config.js index 9c48852a3..ae0866389 100644 --- a/packages/web/jest.config.js +++ b/packages/web/jest.config.js @@ -1,9 +1,4 @@ -module.exports = { - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - transform: { - '^.+\\.(js|jsx|ts|tsx)$': 'babel-jest', - }, - verbose: true, - collectCoverage: false, - coveragePathIgnorePatterns: ['node_modules', 'fixtures'], -}; +const config = require('../../jest/config'); + +module.exports = Object.assign({}, config, {}); + diff --git a/packages/web/package.json b/packages/web/package.json index 5acd37683..cca83e41d 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -21,6 +21,7 @@ "scripts": { "clean": "rimraf ./build", "type-check": "tsc --noEmit", + "test": "cross-env NODE_ENV=test BABEL_ENV=test jest", "build:types": "tsc --emitDeclarationOnly --declaration true", "build:js": "cross-env BABEL_ENV=registry babel src/ --out-dir build/ --copy-files --extensions \".ts,.tsx\" --source-maps", "build": "npm run build:js && npm run build:types"