fix: define export path for jest-preset (#896)

thymikee · Mar 23, 2021 · 218b217 · 218b217
1 parent ee76e0a
commit 218b217
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/e2e/test-app-v10/jest-cjs-iso.config.js b/e2e/test-app-v10/jest-cjs-iso.config.js
@@ -1,13 +1,13 @@
 const baseConfig = require('./jest.config');
+const defaultPreset = require('jest-preset-angular/jest-preset');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
+      ...defaultPreset.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/e2e/test-app-v10/jest-esm-iso.config.js b/e2e/test-app-v10/jest-esm-iso.config.js
@@ -1,14 +1,13 @@
 const baseConfig = require('./jest.config');
+const basePreset = require('jest-preset-angular/presets');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
+      ...basePreset.defaultsESM.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/e2e/test-app-v11/jest-cjs-iso.config.js b/e2e/test-app-v11/jest-cjs-iso.config.js
@@ -1,13 +1,13 @@
 const baseConfig = require('./jest.config');
+const defaultPreset = require('jest-preset-angular/jest-preset');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
+      ...defaultPreset.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/e2e/test-app-v11/jest-esm-iso.config.js b/e2e/test-app-v11/jest-esm-iso.config.js
@@ -1,14 +1,13 @@
 const baseConfig = require('./jest.config');
+const basePreset = require('jest-preset-angular/presets');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
+      ...basePreset.defaultsESM.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/e2e/test-app-v9/jest-cjs-iso.config.js b/e2e/test-app-v9/jest-cjs-iso.config.js
@@ -1,13 +1,13 @@
 const baseConfig = require('./jest.config');
+const defaultPreset = require('jest-preset-angular/jest-preset');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
+      ...defaultPreset.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/e2e/test-app-v9/jest-esm-iso.config.js b/e2e/test-app-v9/jest-esm-iso.config.js
@@ -1,14 +1,13 @@
 const baseConfig = require('./jest.config');
+const basePreset = require('jest-preset-angular/presets');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
   preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
+      ...basePreset.defaultsESM.globals['ts-jest'],
       isolatedModules: true,
     }
   },

diff --git a/package.json b/package.json
@@ -6,7 +6,8 @@
   "main": "build/index.js",
   "exports": {
     ".": "./dist/index.js",
-    "./presets": "./jest-preset.js",
+    "./presets": "./presets/index.js",
+    "./jest-preset": "./jest-preset.js",
     "./setup-jest": "./setup-jest.js",
     "./ngcc-jest-processor": "./ngcc-jest-processor.js",
     "./package.json": "./package.json"