Skip to content

Commit

Permalink
fix(jest): fix jest babel config
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphaël Benitte authored and Raphaël Benitte committed Mar 21, 2019
1 parent f6d6480 commit da5edb0
Show file tree
Hide file tree
Showing 9 changed files with 1,035 additions and 781 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: node_js
node_js:
- '8'
- '10'
script:
- make init --no-print-directory
- make fmt-check --no-print-directory
- make packages-lint --no-print-directory
- make packages-tslint --no-print-directory
- make packages-test --no-print-directory
- make website-build --no-print-directory
- make storybook-build --no-print-directory
- make examples-build --no-print-directory
- make init
- make fmt-check
- make packages-lint
- make packages-tslint
- make packages-test
- make website-build
- make storybook-build
- make examples-build
27 changes: 9 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
MAKEFLAGS += --no-print-directory

SOURCES = packages

.PHONY: help bootstrap init packages-build packages-publish clean-all website-install website website-build website-deploy storybook storybook-build storybook-deploy deploy-all examples-install
Expand Down Expand Up @@ -136,33 +138,22 @@ packages-tslint: ##@1 packages run tslint on all packages
./packages/scatterplot/index.d.ts \
./packages/waffle/index.d.ts

package-test-cover-%: ##@1 packages run tests for a package with code coverage
@yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/${*}/tests

package-test-%: ##@1 packages run tests for a package
@./node_modules/.bin/jest \
--setupFiles=./setupTests.js \
--setupTestFrameworkScriptFile=raf/polyfill \
--env=jsdom \
--verbose \
./packages/${*}/tests
@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests

package-update-test-%: ##@1 packages run tests for a package and update its snapshots
@./node_modules/.bin/jest \
--setupFiles=./setupTests.js \
--setupTestFrameworkScriptFile=raf/polyfill \
--env=jsdom \
./packages/${*}/tests \
-u
@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests -u

packages-test: ##@1 packages run tests for all packages
@echo "${YELLOW}Running test suites for all packages${RESET}"
@./node_modules/.bin/jest \
--setupFiles=./setupTests.js \
--setupTestFrameworkScriptFile=raf/polyfill \
--env=jsdom \
./packages/*/tests
@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/*/tests

packages-test-cover: ##@1 packages run tests for all packages with code coverage
@echo "${YELLOW}Running test suites for all packages${RESET}"
@./node_modules/.bin/jest --coverage --setupTestFrameworkScriptFile=raf/polyfill ./packages/*/tests
@yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/*/tests

packages-build: ##@1 packages build all packages
@echo "${YELLOW}Building all packages${RESET}"
Expand Down
3 changes: 3 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
presets: ['@nivo/babel-preset']
}
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nivo",
"version": "0.31.0",
"version": "0.52.0",
"private": true,
"licenses": [
{
Expand All @@ -21,7 +21,7 @@
"@babel/core": "^7.4.0",
"@ekino/config": "^0.3.0",
"@nivo/babel-preset": "^0.52.0",
"@nivo/generators": "^0.48.0",
"@nivo/generators": "^0.52.0",
"@storybook/addon-actions": "^5.0.3",
"@storybook/addon-info": "^5.0.3",
"@storybook/addon-knobs": "^5.0.3",
Expand All @@ -32,15 +32,16 @@
"@storybook/theming": "^5.0.3",
"@types/react": "^16.3.16",
"babel-eslint": "^8.2.1",
"babel-jest": "^24.5.0",
"babel-loader": "^8.0.5",
"chalk": "^2.3.0",
"clog-cli": "^1.0.0",
"enzyme": "^3.4.4",
"enzyme-adapter-react-16": "^1.2.0",
"eslint": "^5.4.0",
"eslint-plugin-react": "^7.6.0",
"eslint": "^5.13.3",
"eslint-plugin-react": "^7.12.4",
"gh-pages": "^1.0.0",
"jest": "^23.5.0",
"jest": "^24.5.0",
"jsdom": "^12.0.0",
"lerna": "^3.1.4",
"lodash": "^4.17.4",
Expand Down
3 changes: 0 additions & 3 deletions packages/.babelrc

This file was deleted.

12 changes: 3 additions & 9 deletions packages/babel-preset/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,9 @@ module.exports = () => {
}

if (env === 'test') {
plugins.push.apply(plugins, [
require.resolve('babel-plugin-istanbul'),
[
require.resolve('babel-plugin-transform-es2015-modules-commonjs'),
{
loose: true,
},
],
])
// it seems we have nothing specifig to do here
// but it's kept as a reminder that config
// can be overridden for 'test' env.
}

return {
Expand Down
1 change: 0 additions & 1 deletion packages/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ module.exports = {
verbose: true,
testEnvironment: 'jsdom',
setupFiles: [path.resolve(path.join(__dirname, 'jest.setup.js'))],
setupFilesAfterEnv: ['raf/polyfill']
}
4 changes: 0 additions & 4 deletions setupTests.js

This file was deleted.

Loading

0 comments on commit da5edb0

Please sign in to comment.