From 99d3112062ea0f95b6f40768560052b983327df2 Mon Sep 17 00:00:00 2001 From: ahnpnl Date: Tue, 31 Dec 2024 09:50:34 +0100 Subject: [PATCH] refactor: deprecate `defaultTransformerOptions` in `presets` --- .../apps/app1/jest-isolated.config.ts | 16 +++++----------- .../libs/user/jest-isolated.config.ts | 12 +++--------- examples/example-app-v17/jest-isolated.config.ts | 12 +++--------- examples/example-app-v18/jest-isolated.config.ts | 12 +++--------- examples/example-app-v19/jest-isolated.config.ts | 12 +++--------- .../packages/angular-app/jest-isolated.config.ts | 12 +++--------- .../packages/user/jest-isolated.config.ts | 12 +++--------- presets/index.js | 15 +++++++++++---- 8 files changed, 34 insertions(+), 69 deletions(-) diff --git a/examples/example-app-monorepo/apps/app1/jest-isolated.config.ts b/examples/example-app-monorepo/apps/app1/jest-isolated.config.ts index cfde54a067..10fe1d2047 100644 --- a/examples/example-app-monorepo/apps/app1/jest-isolated.config.ts +++ b/examples/example-app-monorepo/apps/app1/jest-isolated.config.ts @@ -1,17 +1,11 @@ +import type { Config } from 'jest'; import presets from 'jest-preset-angular/presets'; -import type { JestConfigWithTsJest } from 'ts-jest'; import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, -} satisfies JestConfigWithTsJest; + ...presets.createCjsPreset({ + isolatedModules: true, + }), +} satisfies Config; diff --git a/examples/example-app-monorepo/libs/user/jest-isolated.config.ts b/examples/example-app-monorepo/libs/user/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-monorepo/libs/user/jest-isolated.config.ts +++ b/examples/example-app-monorepo/libs/user/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/examples/example-app-v17/jest-isolated.config.ts b/examples/example-app-v17/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-v17/jest-isolated.config.ts +++ b/examples/example-app-v17/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/examples/example-app-v18/jest-isolated.config.ts b/examples/example-app-v18/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-v18/jest-isolated.config.ts +++ b/examples/example-app-v18/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/examples/example-app-v19/jest-isolated.config.ts b/examples/example-app-v19/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-v19/jest-isolated.config.ts +++ b/examples/example-app-v19/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/examples/example-app-yarn-workspace/packages/angular-app/jest-isolated.config.ts b/examples/example-app-yarn-workspace/packages/angular-app/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-yarn-workspace/packages/angular-app/jest-isolated.config.ts +++ b/examples/example-app-yarn-workspace/packages/angular-app/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/examples/example-app-yarn-workspace/packages/user/jest-isolated.config.ts b/examples/example-app-yarn-workspace/packages/user/jest-isolated.config.ts index cfde54a067..42a364746b 100644 --- a/examples/example-app-yarn-workspace/packages/user/jest-isolated.config.ts +++ b/examples/example-app-yarn-workspace/packages/user/jest-isolated.config.ts @@ -5,13 +5,7 @@ import jestCfg from './jest.config'; export default { ...jestCfg, - transform: { - '^.+\\.(ts|js|mjs|html|svg)$': [ - 'jest-preset-angular', - { - ...presets.defaultTransformerOptions, - isolatedModules: true, - }, - ], - }, + ...presets.createCjsPreset({ + isolatedModules: true, + }), } satisfies JestConfigWithTsJest; diff --git a/presets/index.js b/presets/index.js index 97155d176a..4830338b2c 100644 --- a/presets/index.js +++ b/presets/index.js @@ -3,7 +3,7 @@ const ngJestPresets = require('../build/presets'); module.exports = { get defaults() { console.warn(` - This preset is DEPRECATED and will be removed in the future. + This preset is DEPRECATED and will be removed in the next major release. Please use "createCjsPreset" function instead. See documentation at https://thymikee.github.io/jest-preset-angular/docs/getting-started/presets#createcjspresetoptions `); @@ -11,13 +11,20 @@ module.exports = { }, get defaultsESM() { console.warn(` - This preset is DEPRECATED and will be removed in the future. - Please use "createCjsPreset" function instead. See documentation at https://thymikee.github.io/jest-preset-angular/docs/getting-started/presets#createesmpresetoptions + This preset is DEPRECATED and will be removed in the next major release. + Please use "createEsmPreset" function instead. See documentation at https://thymikee.github.io/jest-preset-angular/docs/getting-started/presets#createesmpresetoptions `); return ngJestPresets.defaultEsmPreset; }, - defaultTransformerOptions: ngJestPresets.defaultTransformerOptions, + get defaultTransformerOptions() { + console.warn(` + These options are DEPRECATED and will be removed in the next major release. + Please use "createCjsPreset" or "createEsmPreset" function instead. See documentation at https://thymikee.github.io/jest-preset-angular/docs/getting-started/presets + `); + + return ngJestPresets.defaultTransformerOptions; + }, createCjsPreset: ngJestPresets.createCjsPreset, createEsmPreset: ngJestPresets.createEsmPreset, };