Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

Commit 27ef22f

Browse files
authored
chore(package): update to Jest 24 (#1068)
* chore(package): update to Jest 24 * fix TS warnings * update coverage config * update coverage config * fix typo
1 parent 9a1166f commit 27ef22f

File tree

9 files changed

+897
-772
lines changed

9 files changed

+897
-772
lines changed

build/gulp/plugins/util/parseBuffer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { parse } from 'babylon'
1+
import { parse } from '@babel/parser'
22

33
const parseBuffer = buffer =>
44
parse(buffer.toString(), {

build/gulp/plugins/util/parseDocSection.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as _ from 'lodash'
2-
import traverse from 'babel-traverse'
2+
import traverse from '@babel/traverse'
33

44
import parseBuffer from './parseBuffer'
55

build/gulp/tasks/bundle.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const { paths } = config
1111
const g = require('gulp-load-plugins')()
1212
const { log, PluginError } = g.util
1313

14-
const packageName: string = argv.package || 'react'
14+
const packageName = (argv.package as string) || 'react'
1515

1616
// ----------------------------------------
1717
// Clean

build/gulp/tasks/perf.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ task('perf:build', cb => {
8282

8383
task('perf:run', async () => {
8484
const measures: ProfilerMeasureCycle[] = []
85-
const times = argv.times || DEFAULT_RUN_TIMES
85+
const times = (argv.times as string) || DEFAULT_RUN_TIMES
8686
const filter = argv.filter
8787

8888
let browser

build/gulp/tasks/screener.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const { paths } = config
1212

1313
task('screener:runner', cb => {
1414
// screener-runner doesn't allow to pass custom options
15-
if (argv.filter) process.env.SCREENER_FILTER = argv.filter
15+
if (argv.filter) process.env.SCREENER_FILTER = argv.filter as string
1616

1717
// kill the server when done
1818
sh(`screener-runner --conf ${paths.base('build/screener/screener.config.js')}`)

build/jest/jest.config.common.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const { jest: lernaAliases } = require('lerna-alias')
22

3-
const setupTestFrameworkScriptFile = process.env.CI
4-
? `${__dirname}/setup.strict.ts`
5-
: `${__dirname}/setup.common.ts`
3+
const setupFilesAfterEnv = [
4+
process.env.CI ? `${__dirname}/setup.strict.ts` : `${__dirname}/setup.common.ts`,
5+
]
66

77
module.exports = {
88
rootDir: `${__dirname}/../../`,
99
coverageDirectory: './coverage/',
1010
coverageReporters: ['json', 'lcov'],
1111
testRegex: '/test/.*-test\\.tsx?$',
1212
moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
13-
setupTestFrameworkScriptFile,
13+
setupFilesAfterEnv,
1414
transform: {
1515
'^.+\\.(ts|tsx)$': 'ts-jest',
1616
},

jest.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
const { rollup: lernaAlises } = require('lerna-alias')
1+
const { rollup: lernaAliases } = require('lerna-alias')
2+
const commonConfig = require('./build/jest/jest.config.common')
23

34
// packages/react/src -> packages/react,
45
// as lernaAliases append 'src' by default
5-
const stardustPackages = lernaAlises({ sourceDirectory: false })
6+
const stardustPackages = lernaAliases({ sourceDirectory: false })
67
const projects = Object.keys(stardustPackages).map(packageName => stardustPackages[packageName])
78

89
module.exports = {
10+
coverageReporters: commonConfig.coverageReporters,
911
projects,
1012
}

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
"@types/enzyme": "^3.9.0",
5454
"@types/faker": "^4.1.3",
5555
"@types/gulp-load-plugins": "^0.0.31",
56-
"@types/jest": "^23.3.9",
57-
"@types/jest-axe": "^2.2.2",
56+
"@types/jest": "^24.0.11",
57+
"@types/jest-axe": "^2.2.3",
5858
"@types/lodash": "^4.14.118",
5959
"@types/node": "^10.3.2",
6060
"@types/puppeteer": "^1.11.1",
@@ -91,8 +91,8 @@
9191
"gulp-util": "^3.0.8",
9292
"html-webpack-plugin": "^3.2.0",
9393
"husky": "^0.14.3",
94-
"jest": "^23.6.0",
95-
"jest-axe": "^3.1.0",
94+
"jest": "^24.5.0",
95+
"jest-axe": "^3.1.1",
9696
"json-stable-stringify-without-jsonify": "^1.0.1",
9797
"lerna": "^3.10.7",
9898
"lerna-alias": "^3.0.3-0",
@@ -123,7 +123,7 @@
123123
"syncpack": "^4.3.1",
124124
"through2": "^2.0.3",
125125
"tmp": "^0.0.33",
126-
"ts-jest": "^23.10.4",
126+
"ts-jest": "^24.0.0",
127127
"ts-loader": "^5.3.0",
128128
"ts-node": "^6.1.0",
129129
"tsconfig-paths": "^3.7.0",

0 commit comments

Comments
 (0)