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

chore(package): update to Jest 24 #1068

Merged
merged 5 commits into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/gulp/plugins/util/parseBuffer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parse } from 'babylon'
import { parse } from '@babel/parser'

const parseBuffer = buffer =>
parse(buffer.toString(), {
Expand Down
2 changes: 1 addition & 1 deletion build/gulp/plugins/util/parseDocSection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as _ from 'lodash'
import traverse from 'babel-traverse'
import traverse from '@babel/traverse'

import parseBuffer from './parseBuffer'

Expand Down
2 changes: 1 addition & 1 deletion build/gulp/tasks/bundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { paths } = config
const g = require('gulp-load-plugins')()
const { log, PluginError } = g.util

const packageName: string = argv.package || 'react'
const packageName = (argv.package as string) || 'react'

// ----------------------------------------
// Clean
Expand Down
2 changes: 1 addition & 1 deletion build/gulp/tasks/perf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ task('perf:build', cb => {

task('perf:run', async () => {
const measures: ProfilerMeasureCycle[] = []
const times = argv.times || DEFAULT_RUN_TIMES
const times = (argv.times as string) || DEFAULT_RUN_TIMES
const filter = argv.filter

let browser
Expand Down
2 changes: 1 addition & 1 deletion build/gulp/tasks/screener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const { paths } = config

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

// kill the server when done
sh(`screener-runner --conf ${paths.base('build/screener/screener.config.js')}`)
Expand Down
8 changes: 4 additions & 4 deletions build/jest/jest.config.common.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
const { jest: lernaAliases } = require('lerna-alias')

const setupTestFrameworkScriptFile = process.env.CI
? `${__dirname}/setup.strict.ts`
: `${__dirname}/setup.common.ts`
const setupFilesAfterEnv = [
process.env.CI ? `${__dirname}/setup.strict.ts` : `${__dirname}/setup.common.ts`,
]

module.exports = {
rootDir: `${__dirname}/../../`,
coverageDirectory: './coverage/',
coverageReporters: ['json', 'lcov'],
testRegex: '/test/.*-test\\.tsx?$',
moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
setupTestFrameworkScriptFile,
setupFilesAfterEnv,
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
},
Expand Down
6 changes: 4 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
const { rollup: lernaAlises } = require('lerna-alias')
const { rollup: lernaAliases } = require('lerna-alias')
const commonConfig = require('./build/jest/jest.config.common')

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

module.exports = {
coverageReporters: commonConfig.coverageReporters,
projects,
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@types/enzyme": "^3.9.0",
"@types/faker": "^4.1.3",
"@types/gulp-load-plugins": "^0.0.31",
"@types/jest": "^23.3.9",
"@types/jest-axe": "^2.2.2",
"@types/jest": "^24.0.11",
"@types/jest-axe": "^2.2.3",
"@types/lodash": "^4.14.118",
"@types/node": "^10.3.2",
"@types/puppeteer": "^1.11.1",
Expand Down Expand Up @@ -91,8 +91,8 @@
"gulp-util": "^3.0.8",
"html-webpack-plugin": "^3.2.0",
"husky": "^0.14.3",
"jest": "^23.6.0",
"jest-axe": "^3.1.0",
"jest": "^24.5.0",
"jest-axe": "^3.1.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"lerna": "^3.10.7",
"lerna-alias": "^3.0.3-0",
Expand Down Expand Up @@ -123,7 +123,7 @@
"syncpack": "^4.3.1",
"through2": "^2.0.3",
"tmp": "^0.0.33",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^5.3.0",
"ts-node": "^6.1.0",
"tsconfig-paths": "^3.7.0",
Expand Down
Loading