jest-preset-angular 14.3.2 → 14.3.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [14.3.3](https://github.com/thymikee/jest-preset-angular/compare/v14.3.2...v14.3.3) (2024-11-22)
+
+
+### Features
+
+* feat: support configuring zoneless test env for CJS ([7a270b1](https://github.com/thymikee/jest-preset-angular/commit/7a270b1))
+
+
+
 ## [14.3.2](https://github.com/thymikee/jest-preset-angular/compare/v14.3.1...v14.3.2) (2024-11-20)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-preset-angular",
-  "version": "14.3.2",
+  "version": "14.3.3",
   "description": "Jest preset configuration for Angular projects",
   "license": "MIT",
   "engines": {

package/setup-env/{utils.mjs → utils.js}

@@ -1,13 +1,13 @@
-import { TextDecoder, TextEncoder } from 'util';
+const { TextDecoder, TextEncoder } = require('util');
 
-export const polyfillEncoder = () => {
+const polyfillEncoder = () => {
     if (typeof globalThis.TextEncoder === 'undefined') {
         globalThis.TextEncoder = TextEncoder;
         globalThis.TextDecoder = TextDecoder;
     }
 };
 
-export const resolveTestEnvOptions = (options) => {
+const resolveTestEnvOptions = (options) => {
     const globalTestEnvOptions = globalThis.ngJest?.testEnvironmentOptions;
     if (globalTestEnvOptions) {
         console.warn(
@@ -17,3 +17,8 @@ export const resolveTestEnvOptions = (options) => {
 
     return globalTestEnvOptions ?? options;
 };
+
+module.exports = {
+    polyfillEncoder,
+    resolveTestEnvOptions,
+};

package/setup-env/zone/index.js

@@ -1,38 +1,20 @@
 require('zone.js');
 require('zone.js/testing');
 
-const { TextEncoder, TextDecoder } = require('util');
-
 const { getTestBed } = require('@angular/core/testing');
 const {
     BrowserDynamicTestingModule,
     platformBrowserDynamicTesting,
 } = require('@angular/platform-browser-dynamic/testing');
 
-const polyfillEncoder = () => {
-    if (typeof globalThis.TextEncoder === 'undefined') {
-        globalThis.TextEncoder = TextEncoder;
-        globalThis.TextDecoder = TextDecoder;
-    }
-};
-
-const resolveTestEnvOptions = (options) => {
-    const globalTestEnvOptions = globalThis.ngJest?.testEnvironmentOptions;
-    if (globalTestEnvOptions) {
-        console.warn(
-            'Setting testEnvironmentOptions via globalThis.ngJest is deprecated. Please provide testEnvironmentOptions via function argument',
-        );
-    }
-
-    return globalTestEnvOptions ?? options;
-};
+const { polyfillEncoder, resolveTestEnvOptions } = require('../utils');
 
 const setupZoneTestEnv = (options) => {
     polyfillEncoder();
     const testEnvironmentOptions = resolveTestEnvOptions(options);
 
     getTestBed().initTestEnvironment(
-        BrowserDynamicTestingModule,
+        [BrowserDynamicTestingModule],
         platformBrowserDynamicTesting(),
         testEnvironmentOptions,
     );

package/setup-env/zone/index.mjs

@@ -4,15 +4,19 @@ import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
-import { polyfillEncoder, resolveTestEnvOptions } from '../utils.mjs';
+import { polyfillEncoder, resolveTestEnvOptions } from '../utils';
 
-export const setupZoneTestEnv = (options) => {
+const setupZoneTestEnv = (options) => {
     polyfillEncoder();
     const testEnvironmentOptions = resolveTestEnvOptions(options);
 
     getTestBed().initTestEnvironment(
-        BrowserDynamicTestingModule,
+        [BrowserDynamicTestingModule],
         platformBrowserDynamicTesting(),
         testEnvironmentOptions,
     );
 };
+
+export {
+  	setupZoneTestEnv,
+}

package/setup-env/zoneless/index.js

@@ -1,8 +1,48 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const setupZonelessTestEnv = (_options) => {
+const { provideExperimentalZonelessChangeDetection, NgModule, ErrorHandler } = require('@angular/core');
+const { getTestBed } = require('@angular/core/testing');
+const {
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting,
+} = require('@angular/platform-browser-dynamic/testing');
+
+const { polyfillEncoder, resolveTestEnvOptions } = require('../utils');
+
+const provideZonelessConfig = () => {
+    class TestModule {}
+    NgModule({
+        providers: [
+            provideExperimentalZonelessChangeDetection(),
+            {
+                provide: ErrorHandler,
+                useValue: {
+                    handleError: (e) => {
+                        throw e;
+                    },
+                },
+            },
+        ],
+    })(TestModule);
+
+    return TestModule;
+};
+
+const setupZonelessTestEnv = (options) => {
+    polyfillEncoder();
+    if (typeof provideExperimentalZonelessChangeDetection !== 'undefined') {
+        const testEnvironmentOptions = resolveTestEnvOptions(options);
+
+        getTestBed().initTestEnvironment(
+            [BrowserDynamicTestingModule, provideZonelessConfig()],
+            platformBrowserDynamicTesting(),
+            testEnvironmentOptions,
+        );
+
+        return;
+    }
+
     throw Error(
-        'Zoneless testing environment only works when running Jest in ESM mode with Jest 29. ' +
-            'Jest 30+ will support to work with CommonJS mode.',
+        'Cannot find provideExperimentalZonelessChangeDetection() to setup zoneless testing environment. ' +
+            'Please use setupZoneTestEnv() from jest-preset-angular/setup-env/setup-zone-env.mjs instead.',
     );
 };
 

package/setup-env/zoneless/index.mjs

@@ -2,29 +2,34 @@ import { ErrorHandler, NgModule, provideExperimentalZonelessChangeDetection } fr
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
-import { polyfillEncoder, resolveTestEnvOptions } from '../utils.mjs';
+import { polyfillEncoder, resolveTestEnvOptions } from '../utils';
 
-export const setupZonelessTestEnv = (options) => {
-    if (typeof provideExperimentalZonelessChangeDetection !== 'undefined') {
-        polyfillEncoder();
-        const testEnvironmentOptions = resolveTestEnvOptions(options);
-        @NgModule({
-            providers: [
-                provideExperimentalZonelessChangeDetection(),
-                {
-                    provide: ErrorHandler,
-                    useValue: {
-                        handleError: (e) => {
-                            throw e;
-                        },
+const provideZonelessConfig = () => {
+    class TestModule {}
+    NgModule({
+        providers: [
+            provideExperimentalZonelessChangeDetection(),
+            {
+                provide: ErrorHandler,
+                useValue: {
+                    handleError: (e) => {
+                        throw e;
                     },
                 },
-            ],
-        })
-        export class TestModule {}
+            },
+        ],
+    })(TestModule);
+
+    return TestModule;
+};
+
+const setupZonelessTestEnv = (options) => {
+    polyfillEncoder();
+    if (typeof provideExperimentalZonelessChangeDetection !== 'undefined') {
+        const testEnvironmentOptions = resolveTestEnvOptions(options);
 
         getTestBed().initTestEnvironment(
-            [BrowserDynamicTestingModule, TestModule],
+            [BrowserDynamicTestingModule, provideZonelessConfig()],
             platformBrowserDynamicTesting(),
             testEnvironmentOptions,
         );
@@ -34,6 +39,10 @@ export const setupZonelessTestEnv = (options) => {
 
     throw Error(
         'Cannot find provideExperimentalZonelessChangeDetection() to setup zoneless testing environment. ' +
-            'Please use setupZoneTestEnv() from jest-preset-angular/setup-env/setup-zone-env.mjs instead.',
+        'Please use setupZoneTestEnv() from jest-preset-angular/setup-env/setup-zone-env.mjs instead.',
     );
 };
+
+export {
+  setupZonelessTestEnv
+}

package/setup-jest.js

@@ -25,4 +25,8 @@ if (typeof globalThis.TextEncoder === 'undefined') {
 
 const testEnvironmentOptions = globalThis.ngJest?.testEnvironmentOptions ?? Object.create(null);
 
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), testEnvironmentOptions);
+getTestBed().initTestEnvironment(
+    [BrowserDynamicTestingModule],
+    platformBrowserDynamicTesting(),
+    testEnvironmentOptions,
+);

package/setup-jest.mjs

@@ -22,4 +22,4 @@ if (typeof globalThis.TextEncoder === 'undefined') {
 
 const testEnvironmentOptions = globalThis.ngJest?.testEnvironmentOptions ?? Object.create(null);
 
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), testEnvironmentOptions);
+getTestBed().initTestEnvironment([BrowserDynamicTestingModule], platformBrowserDynamicTesting(), testEnvironmentOptions);