@o3r/testing 13.5.0-prerelease.24 → 13.5.0-prerelease.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/testing",
-  "version": "13.5.0-prerelease.24",
+  "version": "13.5.0-prerelease.26",
   "publishConfig": {
     "access": "public"
   },
@@ -99,10 +99,10 @@
     "@material/slider": "^14.0.0",
     "@ngrx/store": "^20.0.0",
     "@ngx-translate/core": "^15.0.0 || ~16.0.4",
-    "@o3r/core": "~13.5.0-prerelease.24",
-    "@o3r/eslint-config": "~13.5.0-prerelease.24",
-    "@o3r/localization": "~13.5.0-prerelease.24",
-    "@o3r/schematics": "~13.5.0-prerelease.24",
+    "@o3r/core": "~13.5.0-prerelease.26",
+    "@o3r/eslint-config": "~13.5.0-prerelease.26",
+    "@o3r/localization": "~13.5.0-prerelease.26",
+    "@o3r/schematics": "~13.5.0-prerelease.26",
     "@playwright/test": "^1.49.0",
     "@schematics/angular": "^20.0.0",
     "eslint": "~9.39.0",
@@ -170,7 +170,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "~13.5.0-prerelease.24",
+    "@o3r/schematics": "~13.5.0-prerelease.26",
     "esbuild": "~0.25.1",
     "module-from-string": "^3.2.0",
     "tslib": "^2.6.2"
@@ -197,16 +197,16 @@
     "@ngx-translate/core": "~16.0.4",
     "@nx/eslint-plugin": "~21.6.0",
     "@nx/jest": "~21.6.0",
-    "@o3r/build-helpers": "~13.5.0-prerelease.24",
-    "@o3r/core": "~13.5.0-prerelease.24",
-    "@o3r/eslint-plugin": "~13.5.0-prerelease.24",
-    "@o3r/localization": "~13.5.0-prerelease.24",
-    "@o3r/test-helpers": "~13.5.0-prerelease.24",
+    "@o3r/build-helpers": "~13.5.0-prerelease.26",
+    "@o3r/core": "~13.5.0-prerelease.26",
+    "@o3r/eslint-plugin": "~13.5.0-prerelease.26",
+    "@o3r/localization": "~13.5.0-prerelease.26",
+    "@o3r/test-helpers": "~13.5.0-prerelease.26",
     "@playwright/test": "~1.57.0",
     "@schematics/angular": "~20.3.11",
     "@stylistic/eslint-plugin": "~5.6.0",
     "@swc/helpers": "~0.5.17",
-    "@types/jest": "~29.5.2",
+    "@types/jest": "~30.0.0",
     "@types/node": "~22.18.0",
     "@types/pixelmatch": "^5.2.3",
     "@types/pngjs": "^6.0.0",
@@ -226,11 +226,12 @@
     "eslint-plugin-unused-imports": "~4.3.0",
     "globals": "^16.0.0",
     "isomorphic-fetch": "~3.0.0",
-    "jest": "~29.7.0",
-    "jest-environment-jsdom": "~29.7.0",
+    "jest": "~30.2.0",
+    "jest-environment-jsdom": "~30.2.0",
     "jest-junit": "~16.0.0",
-    "jest-preset-angular": "~14.6.0",
-    "jest-util": "~29.7.0",
+    "jest-preset-angular": "~16.0.0",
+    "jest-util": "~30.2.0",
+    "jsdom": "^26.1.0",
     "jsonc-eslint-parser": "~2.4.0",
     "nx": "~21.6.0",
     "pixelmatch": "^7.0.0",
@@ -246,7 +247,13 @@
   },
   "generatorDependencies": {
     "@angular-builders/jest": "~20.0.0",
-    "rimraf": "^6.0.1"
+    "@types/jest": "~30.0.0",
+    "jest": "~30.2.0",
+    "jest-environment-jsdom": "~30.2.0",
+    "jest-preset-angular": "~16.0.0",
+    "jest-util": "~30.2.0",
+    "rimraf": "^6.0.1",
+    "ts-jest": "~29.4.0"
   },
   "schematics": "./collection.json",
   "ng-update": {

package/schematics/ng-add/jest/templates/workspace/jest.config.ut.js.template

@@ -25,6 +25,12 @@ module.exports.getJestProjectConfig = (rootDir, isAngularSetup) => {
   );
   moduleNameMapper['^@o3r/testing/core$'] = [require.resolve('@o3r/testing/core/angular')];
   moduleNameMapper['^@o3r/testing/core/(.*)'] = [join(require.resolve('@o3r/testing/core/angular'), '$1')];
+  let angularConfig = {};
+  if (isAngularSetup) {
+    const { createCjsPreset } = require('jest-preset-angular/presets');
+    angularConfig = createCjsPreset();
+  }
+
   return {
     preset: 'ts-jest',
     setupFilesAfterEnv: ['<rootDir>/testing/setup-jest.ts'],
@@ -56,20 +62,7 @@ module.exports.getJestProjectConfig = (rootDir, isAngularSetup) => {
       customExportConditions: ['require', 'node']
     },
     workerIdleMemoryLimit: '700MB',
-    ...isAngularSetup ? {
-      preset: 'jest-preset-angular',
-      transform: {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        '^.+\\.tsx?$': [
-          'jest-preset-angular',
-          {
-            tsconfig: '<rootDir>/tsconfig.spec.json',
-            stringifyContentPathRegex: '\\.html$'
-          }
-        ]
-      },
-      globalSetup: 'jest-preset-angular/global-setup',
-    } : {}
+    ...angularConfig
   };
 };