Skip to content

Commit 04a65e6

Browse files
author
Leadbetter
committed
fixing jest/webpack issues
1 parent b1ce3e7 commit 04a65e6

File tree

4 files changed

+2986
-2698
lines changed

4 files changed

+2986
-2698
lines changed

package-lock.json

Lines changed: 43 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"babel-cli": "^6.26.0",
1818
"babel-core": "^6.26.0",
19-
"babel-jest": "^23.4.2",
19+
"babel-jest": "^23.6.0",
2020
"babel-loader": "^7.1.4",
2121
"babel-preset-env": "^1.7.0",
2222
"babel-preset-react": "^6.24.1",
@@ -25,8 +25,9 @@
2525
"enzyme": "^3.4.1",
2626
"enzyme-adapter-react-16": "^1.2.0",
2727
"file-loader": "^1.1.11",
28-
"html-webpack-plugin": "^3.2.0",
29-
"jest": "^23.5.0",
28+
"html-webpack-plugin": "^4.0.0-beta.5",
29+
"isomorphic-fetch": "^2.2.1",
30+
"jest": "^23.6.0",
3031
"style-loader": "^0.21.0",
3132
"webpack": "^4.6.0",
3233
"webpack-cli": "^3.1.0",
@@ -37,10 +38,19 @@
3738
"react": "^16.3.2",
3839
"react-dom": "^16.3.2"
3940
},
41+
"babel": {
42+
"presets": [
43+
"env",
44+
"react"
45+
]
46+
},
4047
"jest": {
4148
"setupFiles": [
4249
"<rootDir>/test/jestsetup.js"
4350
],
51+
"transform": {
52+
"^.+\\.js?$": "babel-jest"
53+
},
4454
"moduleNameMapper": {
4555
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
4656
"\\.(css|less)$": "<rootDir>/__mocks__/styleMock.js"

webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ module.exports = (_env,argv)=> {
7676
test: /\.(js|jsx)$/,
7777
exclude: /(node_modules|bower_components)/,
7878
loader: 'babel-loader',
79-
options: { presets: ['env', 'react'] }
8079
},
8180
{
8281
test: /\.css$/,

0 commit comments

Comments
 (0)