Skip to content

Commit 483d938

Browse files
authored
Merge pull request #734 from tailwindcss/dependabot/npm_and_yarn/next/jest-24.3.1
Bump jest from 23.6.0 to 24.3.1
2 parents c9c9724 + 7811a28 commit 483d938

File tree

3 files changed

+1658
-2090
lines changed

3 files changed

+1658
-2090
lines changed

.eslintrc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
"jest": true
44
},
55
"parserOptions": {
6-
"ecmaVersion": 6,
7-
"sourceType": "module",
8-
"ecmaFeatures": {
9-
"experimentalObjectRestSpread": true
10-
}
6+
"ecmaVersion": 2018,
7+
"sourceType": "module"
118
},
129
"extends": ["eslint-config-postcss", "prettier"],
1310
"plugins": ["prettier"],

package.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,17 @@
2424
"test": "jest && eslint ."
2525
},
2626
"devDependencies": {
27-
"babel-cli": "^6.6.5",
28-
"babel-core": "^6.7.2",
29-
"babel-jest": "^23.6.0",
30-
"babel-preset-env": "^1.0.0",
31-
"babel-preset-react": "^6.24.1",
32-
"babel-preset-stage-2": "^6.24.1",
33-
"babel-preset-stage-3": "^6.24.1",
27+
"@babel/cli": "^7.0.0",
28+
"@babel/core": "^7.0.0",
29+
"@babel/node": "^7.0.0",
30+
"@babel/preset-env": "^7.0.0",
31+
"babel-jest": "^23.4.2",
3432
"clean-css": "^4.1.9",
3533
"eslint": "^5.15.1",
3634
"eslint-config-postcss": "^2.0.2",
3735
"eslint-config-prettier": "^4.1.0",
3836
"eslint-plugin-prettier": "^2.3.1",
39-
"jest": "^23.6.0",
37+
"jest": "^24.3.1",
4038
"prettier": "^1.7.4",
4139
"rimraf": "^2.6.3"
4240
},
@@ -63,20 +61,19 @@
6361
"babel": {
6462
"presets": [
6563
[
66-
"env",
64+
"@babel/preset-env",
6765
{
6866
"targets": {
6967
"node": "6.9.0"
7068
}
7169
}
72-
],
73-
"stage-2",
74-
"stage-3",
75-
"react"
70+
]
7671
]
7772
},
7873
"jest": {
79-
"setupTestFrameworkScriptFile": "<rootDir>/jest/customMatchers.js",
74+
"setupFilesAfterEnv": [
75+
"<rootDir>/jest/customMatchers.js"
76+
],
8077
"testPathIgnorePatterns": [
8178
"<rootDir>/__tests__/fixtures/"
8279
]

0 commit comments

Comments
 (0)