feat(presets): add ESM preset (#723)

Related to #710
thymikee · Jan 11, 2021 · b0073b0 · b0073b0
1 parent a2166f8
commit b0073b0
Show file tree

Hide file tree

Showing 24 changed files with 157 additions and 92 deletions.
diff --git a/e2e/test-app-v10/jest-cjs-iso.config.js b/e2e/test-app-v10/jest-cjs-iso.config.js
@@ -1,9 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
+  preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-cjs.spec.json',

diff --git a/e2e/test-app-v10/jest-cjs-uniso.config.js b/e2e/test-app-v10/jest-cjs-uniso.config.js
@@ -1,13 +1,7 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-    }
-  },
+  preset: 'jest-preset-angular',
 };
diff --git a/e2e/test-app-v10/jest-esm-iso.config.js b/e2e/test-app-v10/jest-esm-iso.config.js
@@ -1,10 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
+  preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-esm.spec.json',
@@ -17,5 +16,4 @@ module.exports = {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v10/jest-esm-uniso.config.js b/e2e/test-app-v10/jest-esm-uniso.config.js
@@ -1,20 +1,11 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
-    }
-  },
+  preset: 'jest-preset-angular/presets/defaults-esm',
   moduleNameMapper: {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v10/jest.config.js b/e2e/test-app-v10/jest.config.js
@@ -1,6 +1,7 @@
+require('jest-preset-angular/ngcc-jest-processor');
+
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  preset: 'jest-preset-angular',
   moduleNameMapper: {
     '\\.(jpg|jpeg|png)$': '<rootDir>/src/__tests__/__mocks__/image.js',
   },

diff --git a/e2e/test-app-v11/jest-cjs-iso.config.js b/e2e/test-app-v11/jest-cjs-iso.config.js
@@ -1,9 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
+  preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-cjs.spec.json',

diff --git a/e2e/test-app-v11/jest-cjs-uniso.config.js b/e2e/test-app-v11/jest-cjs-uniso.config.js
@@ -1,13 +1,7 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-    }
-  },
+  preset: 'jest-preset-angular',
 };
diff --git a/e2e/test-app-v11/jest-esm-iso.config.js b/e2e/test-app-v11/jest-esm-iso.config.js
@@ -1,10 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
+  preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-esm.spec.json',
@@ -17,5 +16,4 @@ module.exports = {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v11/jest-esm-uniso.config.js b/e2e/test-app-v11/jest-esm-uniso.config.js
@@ -1,20 +1,11 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
-    }
-  },
+  preset: 'jest-preset-angular/presets/defaults-esm',
   moduleNameMapper: {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v11/jest.config.js b/e2e/test-app-v11/jest.config.js
@@ -1,6 +1,7 @@
+require('jest-preset-angular/ngcc-jest-processor');
+
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  preset: 'jest-preset-angular',
   moduleNameMapper: {
     '\\.(jpg|jpeg|png)$': '<rootDir>/src/__tests__/__mocks__/image.js',
   },

diff --git a/e2e/test-app-v9/jest-cjs-iso.config.js b/e2e/test-app-v9/jest-cjs-iso.config.js
@@ -1,9 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
+  preset: 'jest-preset-angular',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-cjs.spec.json',

diff --git a/e2e/test-app-v9/jest-cjs-uniso.config.js b/e2e/test-app-v9/jest-cjs-uniso.config.js
@@ -1,13 +1,7 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-cjs.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-    }
-  },
+  preset: 'jest-preset-angular',
 };
diff --git a/e2e/test-app-v9/jest-esm-iso.config.js b/e2e/test-app-v9/jest-esm-iso.config.js
@@ -1,10 +1,9 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
+  preset: 'jest-preset-angular/presets/defaults-esm',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig-esm.spec.json',
@@ -17,5 +16,4 @@ module.exports = {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v9/jest-esm-uniso.config.js b/e2e/test-app-v9/jest-esm-uniso.config.js
@@ -1,20 +1,11 @@
-require('jest-preset-angular/ngcc-jest-processor');
 const baseConfig = require('./jest.config');
 
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   ...baseConfig,
-  extensionsToTreatAsEsm: ['.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig-esm.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      useESM: true,
-    }
-  },
+  preset: 'jest-preset-angular/presets/defaults-esm',
   moduleNameMapper: {
     ...baseConfig.moduleNameMapper,
     'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
   },
-  transformIgnorePatterns: ['node_modules/(?!tslib)'],
 };
diff --git a/e2e/test-app-v9/jest.config.js b/e2e/test-app-v9/jest.config.js
@@ -1,6 +1,7 @@
+require('jest-preset-angular/ngcc-jest-processor');
+
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  preset: 'jest-preset-angular',
   moduleNameMapper: {
     '\\.(jpg|jpeg|png)$': '<rootDir>/src/__tests__/__mocks__/image.js',
   },

diff --git a/jest-preset.js b/jest-preset.js
@@ -1,23 +1 @@
-const snapshotSerializers = require('./build/serializers');
-
-module.exports = {
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-    },
-  },
-  testEnvironment: 'jsdom',
-  transform: {
-    '^.+\\.(ts|js|html)$': 'jest-preset-angular',
-  },
-  moduleFileExtensions: ['ts', 'html', 'js', 'json'],
-  moduleNameMapper: {
-    '^src/(.*)$': '<rootDir>/src/$1',
-    '^app/(.*)$': '<rootDir>/src/app/$1',
-    '^assets/(.*)$': '<rootDir>/src/assets/$1',
-    '^environments/(.*)$': '<rootDir>/src/environments/$1',
-  },
-  transformIgnorePatterns: ['node_modules/(?!@ngrx)'],
-  snapshotSerializers,
-};
+module.exports = require('./presets').defaults;
diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,5 @@
+require('./ngcc-jest-processor');
+
 /** @type {import('ts-jest/dist/types').ProjectConfigTsJest} */
 module.exports = {
   preset: 'ts-jest',

diff --git a/package.json b/package.json
@@ -23,9 +23,9 @@
     "build": "tsc -p tsconfig.build.json",
     "lint": "eslint --ext .js,.ts .",
     "lint:fix": "eslint --fix --ext .js,.ts .",
-    "pretest": "node ./ngcc-jest-processor.js",
-    "test-cjs:unit": "yarn pretest && jest -i",
-    "test-esm:unit": "yarn pretest && node --experimental-vm-modules ./node_modules/jest/bin/jest.js -i -c=jest-esm.config.js",
+    "test:unit": "yarn test-cjs:unit && yarn test-esm:unit",
+    "test-cjs:unit": "jest -i",
+    "test-esm:unit": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js -i -c=jest-esm.config.js",
     "test:e2e": "node scripts/e2e.js",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1"
   },

diff --git a/presets/defaults-esm/jest-preset.js b/presets/defaults-esm/jest-preset.js
@@ -0,0 +1 @@
+module.exports = require('..').defaultsESM;
diff --git a/presets/defaults/jest-preset.js b/presets/defaults/jest-preset.js
@@ -0,0 +1 @@
+module.exports = require('..').defaults;
diff --git a/presets/index.js b/presets/index.js
@@ -0,0 +1,47 @@
+const snapshotSerializers = require('../build/serializers');
+
+const basePreset = {
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+      stringifyContentPathRegex: '\\.html$',
+    },
+  },
+  testEnvironment: 'jsdom',
+  transform: {
+    '^.+\\.(ts|js|html)$': 'jest-preset-angular',
+  },
+  moduleFileExtensions: ['ts', 'html', 'js', 'json'],
+  moduleNameMapper: {
+    '^src/(.*)$': '<rootDir>/src/$1',
+    '^app/(.*)$': '<rootDir>/src/app/$1',
+    '^assets/(.*)$': '<rootDir>/src/assets/$1',
+    '^environments/(.*)$': '<rootDir>/src/environments/$1',
+  },
+  snapshotSerializers,
+}
+
+module.exports = {
+  get defaults() {
+    return basePreset;
+  },
+  get defaultsESM() {
+    return {
+      ...basePreset,
+      extensionsToTreatAsEsm: ['.ts'],
+      globals: {
+        'ts-jest': {
+          ...basePreset.globals['ts-jest'],
+          useESM: true,
+        },
+      },
+      moduleNameMapper: {
+        ...basePreset.moduleNameMapper,
+        'tslib': '<rootDir>/node_modules/tslib/tslib.es6.js',
+      },
+      transformIgnorePatterns: [
+        'node_modules/(?!tslib)',
+      ],
+    }
+  },
+}
diff --git a/scripts/e2e.js b/scripts/e2e.js
@@ -43,6 +43,7 @@ const executeTest = (projectRealPath) => {
   logger.log();
 
   copySync(join(cwd, 'jest-preset.js'), `${presetDir}/jest-preset.js`);
+  copySync(join(cwd, 'presets'), `${presetDir}/presets`);
   copySync(join(cwd, 'ngcc-jest-processor.js'), `${presetDir}/ngcc-jest-processor.js`);
   copySync(join(cwd, 'setup-jest.js'), `${presetDir}/setup-jest.js`);
   copySync(join(cwd, 'package.json'), `${presetDir}/package.json`);