refactor(devs-infra): remove NgJestConfig and its related deps (#973)

thymikee · Jul 22, 2021 · ce7fc60 · ce7fc60
1 parent 0359d03
commit ce7fc60
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 5,585 deletions.
diff --git a/package.json b/package.json
@@ -46,18 +46,10 @@
     "ts-jest": "^27.0.0"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": ">=0.901.12",
     "@angular/core": ">=9.0.0",
-    "@angular/platform-browser-dynamic": ">=9.0.0",
-    "webpack": "^4.0.0 || ^5.30.0"
-  },
-  "peerDependenciesMeta": {
-    "webpack": {
-      "optional": true
-    }
+    "@angular/platform-browser-dynamic": ">=9.0.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1102.14",
     "@angular/common": "^11.2.14",
     "@angular/compiler": "^11.2.14",
     "@angular/compiler-cli": "^11.2.14",

diff --git a/src/__tests__/downlevel-ctor.spec.ts b/src/__tests__/downlevel-ctor.spec.ts
@@ -2,9 +2,9 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 
 import { SOURCE_MAPPING_PREFIX } from 'ts-jest/dist/compiler/compiler-utils';
+import { ConfigSet } from 'ts-jest/dist/config/config-set';
 
 import { NgJestCompiler } from '../compiler/ng-jest-compiler';
-import { NgJestConfig } from '../config/ng-jest-config';
 import { constructorDownlevelCtor } from '../transformers/downlevel-ctor';
 
 import { jestCfgStub } from './__helpers__/test-constants';
@@ -28,7 +28,7 @@ const baseJestCfg = {
 };
 
 test.each([true, false])('should add ctor param to class constructor', (useESM) => {
-  const ngJestConfig = new NgJestConfig({
+  const ngJestConfig = new ConfigSet({
     ...baseJestCfg,
     globals: {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

diff --git a/src/__tests__/ng-jest-compiler.spec.ts b/src/__tests__/ng-jest-compiler.spec.ts
@@ -2,9 +2,9 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 
 import { jest } from '@jest/globals';
+import { ConfigSet } from 'ts-jest/dist/config/config-set';
 
 import { NgJestCompiler } from '../compiler/ng-jest-compiler';
-import { NgJestConfig } from '../config/ng-jest-config';
 
 import { jestCfgStub } from './__helpers__/test-constants';
 import { mockFolder } from './__helpers__/test-helpers';
@@ -33,7 +33,7 @@ describe('NgJestCompiler', () => {
     test.each([true, false])(
       'should transform codes with useESM %p using hoisting, replace resources and downlevel ctor transformers',
       (useESM) => {
-        const ngJestConfig = new NgJestConfig({
+        const ngJestConfig = new ConfigSet({
           ...baseJestCfg,
           globals: {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

diff --git a/src/__tests__/replace-resources.spec.ts b/src/__tests__/replace-resources.spec.ts
@@ -2,9 +2,9 @@ import { readFileSync } from 'fs';
 import { join } from 'path';
 
 import { SOURCE_MAPPING_PREFIX } from 'ts-jest/dist/compiler/compiler-utils';
+import { ConfigSet } from 'ts-jest/dist/config/config-set';
 
 import { NgJestCompiler } from '../compiler/ng-jest-compiler';
-import { NgJestConfig } from '../config/ng-jest-config';
 import { replaceResources } from '../transformers/replace-resources';
 
 import { jestCfgStub } from './__helpers__/test-constants';
@@ -34,7 +34,7 @@ const baseJestCfg = {
 test.each([true, false])(
   'should keep styles/template and transform styleUrls/templateUrl to proper syntax for CommonJS/ESM',
   (useESM) => {
-    const ngJestConfig = new NgJestConfig({
+    const ngJestConfig = new ConfigSet({
       ...baseJestCfg,
       globals: {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment

diff --git a/src/config/ng-jest-config.ts b/src/config/ng-jest-config.ts