diff --git a/nx-dev/data-access-documents/jest.config.ts b/nx-dev/data-access-documents/jest.config.ts index e0497a36f5..0c46235548 100644 --- a/nx-dev/data-access-documents/jest.config.ts +++ b/nx-dev/data-access-documents/jest.config.ts @@ -1,7 +1,4 @@ -const nxPreset = require('@nrwl/jest/preset').default; export default { - ...nxPreset, - setupFilesAfterEnv: ['/src/test-setup.ts'], displayName: 'nx-dev-data-access-documents', globals: { 'ts-jest': { @@ -13,4 +10,5 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/data-access-documents', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/data-access-documents/src/test-setup.ts b/nx-dev/data-access-documents/src/test-setup.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nx-dev/data-access-packages/jest.config.ts b/nx-dev/data-access-packages/jest.config.ts index 2aadab82a8..d1705987d0 100644 --- a/nx-dev/data-access-packages/jest.config.ts +++ b/nx-dev/data-access-packages/jest.config.ts @@ -1,7 +1,4 @@ -const nxPreset = require('@nrwl/jest/preset').default; export default { - ...nxPreset, - setupFilesAfterEnv: ['/src/test-setup.ts'], displayName: 'nx-dev-data-access-packages', globals: { 'ts-jest': { @@ -13,4 +10,5 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/data-access-packages', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/data-access-packages/src/test-setup.ts b/nx-dev/data-access-packages/src/test-setup.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nx-dev/feature-analytics/jest.config.ts b/nx-dev/feature-analytics/jest.config.ts index a942aa952c..85e96fd530 100644 --- a/nx-dev/feature-analytics/jest.config.ts +++ b/nx-dev/feature-analytics/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-feature-analytics', - transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, diff --git a/nx-dev/feature-doc-viewer/jest.config.ts b/nx-dev/feature-doc-viewer/jest.config.ts index a692f86a3d..aec19ce43f 100644 --- a/nx-dev/feature-doc-viewer/jest.config.ts +++ b/nx-dev/feature-doc-viewer/jest.config.ts @@ -1,11 +1,9 @@ -const nxPreset = require('@nrwl/jest/preset').default; export default { - ...nxPreset, displayName: 'nx-dev-feature-doc-viewer', transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/feature-doc-viewer', - setupFilesAfterEnv: ['/src/test-setup.ts'], + preset: '../../jest.preset.js', }; diff --git a/nx-dev/feature-doc-viewer/src/test-setup.ts b/nx-dev/feature-doc-viewer/src/test-setup.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nx-dev/feature-package-schema-viewer/jest.config.ts b/nx-dev/feature-package-schema-viewer/jest.config.ts index ee031c6339..eb187dfcf5 100644 --- a/nx-dev/feature-package-schema-viewer/jest.config.ts +++ b/nx-dev/feature-package-schema-viewer/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-feature-package-schema-viewer', - globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json', diff --git a/nx-dev/feature-search/jest.config.ts b/nx-dev/feature-search/jest.config.ts index 15c3b13394..0f9fc02da4 100644 --- a/nx-dev/feature-search/jest.config.ts +++ b/nx-dev/feature-search/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-feature-search', - transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, diff --git a/nx-dev/models-document/jest.config.ts b/nx-dev/models-document/jest.config.ts index 027628796b..32bdc57294 100644 --- a/nx-dev/models-document/jest.config.ts +++ b/nx-dev/models-document/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-models-document', - globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json', diff --git a/nx-dev/models-menu/jest.config.ts b/nx-dev/models-menu/jest.config.ts index 16d6997e48..a3851768a8 100644 --- a/nx-dev/models-menu/jest.config.ts +++ b/nx-dev/models-menu/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-models-menu', - globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json', diff --git a/nx-dev/models-package/jest.config.ts b/nx-dev/models-package/jest.config.ts index b59f3f9373..a68597256a 100644 --- a/nx-dev/models-package/jest.config.ts +++ b/nx-dev/models-package/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-models-package', - globals: { 'ts-jest': { tsconfig: '/tsconfig.spec.json', diff --git a/nx-dev/nx-dev/jest.config.ts b/nx-dev/nx-dev/jest.config.ts index 0aec0a0d78..1b74067136 100644 --- a/nx-dev/nx-dev/jest.config.ts +++ b/nx-dev/nx-dev/jest.config.ts @@ -1,5 +1,6 @@ -const nxPreset = require('@nrwl/jest/preset').default; -export default { +const nxPreset = require('@nrwl/jest/preset'); + +module.exports = { ...nxPreset, displayName: 'nx-dev', transform: { diff --git a/nx-dev/ui-commands/jest.config.ts b/nx-dev/ui-commands/jest.config.ts index 1077039600..149e2b653b 100644 --- a/nx-dev/ui-commands/jest.config.ts +++ b/nx-dev/ui-commands/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-ui-commands', - transform: { '^.+\\.[tj]sx?$': 'babel-jest', }, diff --git a/nx-dev/ui-common/jest.config.ts b/nx-dev/ui-common/jest.config.ts index 29506e0a20..6a52aca17e 100644 --- a/nx-dev/ui-common/jest.config.ts +++ b/nx-dev/ui-common/jest.config.ts @@ -1,10 +1,9 @@ -const nxPreset = require('@nrwl/jest/preset').default; export default { - ...nxPreset, displayName: 'nx-dev-ui-common', transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: '../../coverage/nx-dev/ui-common', + preset: '../../jest.preset.js', }; diff --git a/nx-dev/ui-community/jest.config.ts b/nx-dev/ui-community/jest.config.ts index 8341466421..9f70290e9f 100644 --- a/nx-dev/ui-community/jest.config.ts +++ b/nx-dev/ui-community/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-ui-community', - transform: { '^.+\\.[tj]sx?$': 'babel-jest', }, diff --git a/nx-dev/ui-conference/jest.config.ts b/nx-dev/ui-conference/jest.config.ts index cb3c2e8c9f..724c8998db 100644 --- a/nx-dev/ui-conference/jest.config.ts +++ b/nx-dev/ui-conference/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-ui-conference', - transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, diff --git a/nx-dev/ui-home/jest.config.ts b/nx-dev/ui-home/jest.config.ts index f8fbac9add..f9c2910d77 100644 --- a/nx-dev/ui-home/jest.config.ts +++ b/nx-dev/ui-home/jest.config.ts @@ -1,6 +1,5 @@ export default { displayName: 'nx-dev-ui-home', - transform: { '^.+\\.[tj]sx?$': 'babel-jest', }, diff --git a/nx-dev/ui-member-card/jest.config.ts b/nx-dev/ui-member-card/jest.config.ts index 8c304e4f92..9f27272409 100644 --- a/nx-dev/ui-member-card/jest.config.ts +++ b/nx-dev/ui-member-card/jest.config.ts @@ -1,9 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset').default; - export default { - ...nxPreset, displayName: 'nx-dev-ui-member-card', - transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], }, diff --git a/nx-dev/ui-sponsor-card/jest.config.ts b/nx-dev/ui-sponsor-card/jest.config.ts index ec0c816834..e7939eb21b 100644 --- a/nx-dev/ui-sponsor-card/jest.config.ts +++ b/nx-dev/ui-sponsor-card/jest.config.ts @@ -1,9 +1,5 @@ -const nxPreset = require('@nrwl/jest/preset').default; - export default { - ...nxPreset, displayName: 'nx-dev-ui-sponsor-card', - transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }], },