Skip to content

Commit 7f14eff

Browse files
authored
chore: Fix jest deprecation warnings (#2748)
1 parent 5a42c26 commit 7f14eff

File tree

3 files changed

+17
-28
lines changed

3 files changed

+17
-28
lines changed

jest.integ.config.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ const os = require('os');
66
module.exports = {
77
verbose: true,
88
testEnvironment: 'node',
9-
globals: {
10-
'ts-jest': {
11-
tsconfig: 'tsconfig.integ.json',
12-
},
9+
transform: {
10+
'^.+\\.tsx?$': [
11+
'ts-jest',
12+
{
13+
tsconfig: 'tsconfig.integ.json',
14+
},
15+
],
1316
},
1417
reporters: ['default', 'github-actions'],
1518
testTimeout: 60_000, // 1min
@@ -19,5 +22,4 @@ module.exports = {
1922
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'integ', 'setup.integ.js')],
2023
moduleFileExtensions: ['js', 'ts'],
2124
testRegex: '(/(__integ__|__a11y__)/.*(\\.|/)test)\\.[jt]sx?$',
22-
preset: 'ts-jest',
2325
};

jest.motion.config.js

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33
const path = require('path');
4-
const os = require('os');
4+
const integConfig = require('./jest.integ.config');
55

66
module.exports = {
7-
verbose: true,
8-
testEnvironment: 'node',
9-
globals: {
10-
'ts-jest': {
11-
tsconfig: 'tsconfig.integ.json',
12-
},
13-
},
14-
reporters: ['default', 'github-actions'],
15-
testTimeout: 60_000, // 1min
16-
maxWorkers: os.cpus().length * (process.env.GITHUB_ACTION ? 3 : 1),
17-
globalSetup: '<rootDir>/build-tools/integ/global-setup.js',
18-
globalTeardown: '<rootDir>/build-tools/integ/global-teardown.js',
7+
...integConfig,
198
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'integ', 'setup.motion.js')],
20-
moduleFileExtensions: ['js', 'ts'],
219
testRegex: '(/(__motion__)/.*(\\.|/)test)\\.[jt]sx?$',
22-
preset: 'ts-jest',
2310
};

jest.unit.config.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33
const path = require('path');
4-
const merge = require('lodash/merge');
5-
const tsPreset = require('ts-jest/jest-preset');
64
const cloudscapePreset = require('@cloudscape-design/jest-preset/jest-preset');
5+
const mergePresets = require('@cloudscape-design/jest-preset/merge');
76

8-
module.exports = merge({}, tsPreset, cloudscapePreset, {
7+
module.exports = mergePresets(cloudscapePreset, {
98
verbose: true,
109
testEnvironment: 'jsdom',
1110
reporters: ['default', 'github-actions'],
@@ -31,16 +30,17 @@ module.exports = merge({}, tsPreset, cloudscapePreset, {
3130
statements: 90,
3231
},
3332
},
34-
globals: {
35-
'ts-jest': {
36-
tsconfig: 'tsconfig.unit.json',
37-
},
38-
},
3933
transform: {
4034
'(?!node_modules).*/lib/(components|design-tokens)/.*\\.js$': require.resolve(
4135
'@cloudscape-design/jest-preset/js-transformer'
4236
),
4337
'(?!node_modules).*/lib/components/.*\\.css$': require.resolve('@cloudscape-design/jest-preset/css-transformer'),
38+
'^.+\\.tsx?$': [
39+
'ts-jest',
40+
{
41+
tsconfig: 'tsconfig.unit.json',
42+
},
43+
],
4444
},
4545
setupFilesAfterEnv: [path.join(__dirname, 'build-tools', 'jest', 'setup.js')],
4646
testRegex: '(/__tests__/.*(\\.|/)test)\\.[jt]sx?$',

0 commit comments

Comments
 (0)