feat: set minimum support TypeScript version at 4.3 (#3428)

ahnpnl · web-flow · commit 3dba4ecad361 · 2022-04-17T22:12:41.000+02:00
BREAKING CHANGE:
Minimum support TypeScript version is now 4.3 since Jest 28 requires it
diff --git a/e2e/__tests__/ast-transformers.test.ts b/e2e/__tests__/ast-transformers.test.ts
@@ -37,29 +37,16 @@ describe('transformer-options', () => {
 
 describe('hoist-jest', () => {
   const HOIST_JEST_DIR_NAME = 'hoist-jest'
-  const NON_TS_FACTORY_DIR_NAME = 'non-ts-factory'
-  const TS_FACTORY_DIR_NAME = 'ts-factory'
+  const DIR = path.join(__dirname, '..', AST_TRANSFORMERS_DIR_NAME, HOIST_JEST_DIR_NAME)
 
-  describe('non-ts-factory', () => {
-    const DIR = path.join(__dirname, '..', AST_TRANSFORMERS_DIR_NAME, HOIST_JEST_DIR_NAME, NON_TS_FACTORY_DIR_NAME)
-
-    beforeAll(() => {
-      runNpmInstall(DIR)
-      execa.sync('npm', ['install', '--no-package-lock', '--no-shrinkwrap', '--no-save', tsJestBundle], {
-        cwd: DIR,
-      })
+  beforeAll(() => {
+    runNpmInstall(DIR)
+    execa.sync('npm', ['install', '--no-package-lock', '--no-shrinkwrap', '--no-save', tsJestBundle], {
+      cwd: DIR,
     })
-
-    executeTest(`${AST_TRANSFORMERS_DIR_NAME}/${HOIST_JEST_DIR_NAME}/${NON_TS_FACTORY_DIR_NAME}`)
   })
 
-  describe('ts-factory', () => {
-    beforeAll(() => {
-      runNpmInstall(path.join(__dirname, '..', AST_TRANSFORMERS_DIR_NAME, HOIST_JEST_DIR_NAME, TS_FACTORY_DIR_NAME))
-    })
-
-    executeTest(`${AST_TRANSFORMERS_DIR_NAME}/${HOIST_JEST_DIR_NAME}/${TS_FACTORY_DIR_NAME}`)
-  })
+  executeTest(`${AST_TRANSFORMERS_DIR_NAME}/${HOIST_JEST_DIR_NAME}`)
 })
 
 describe('transformer-in-ts', () => {
diff --git a/e2e/ast-transformers/hoist-jest/jest-isolated.config.js b/e2e/ast-transformers/hoist-jest/jest-isolated.config.js
@@ -1,4 +1,4 @@
-/** @type {import('../../../../dist').InitialOptionsTsJest} */
+/** @type {import('../../../dist').InitialOptionsTsJest} */
 module.exports = {
   automock: true,
   globals: {
@@ -9,11 +9,10 @@ module.exports = {
       },
     },
   },
-  roots: ['<rootDir>', '<rootDir>/../__tests__'],
   moduleNameMapper: {
     react$: '<rootDir>/node_modules/react',
   },
   transform: {
-    '^.+.[tj]sx?$': 'ts-jest',
+    '^.+.[tj]sx?$': '<rootDir>/../../../dist/index.js',
   },
 }
diff --git a/e2e/ast-transformers/hoist-jest/non-ts-factory/package-lock.json b/e2e/ast-transformers/hoist-jest/non-ts-factory/package-lock.json
diff --git a/e2e/ast-transformers/hoist-jest/non-ts-factory/package.json b/e2e/ast-transformers/hoist-jest/non-ts-factory/package.json
diff --git a/e2e/ast-transformers/hoist-jest/package-lock.json b/e2e/ast-transformers/hoist-jest/package-lock.json
diff --git a/e2e/ast-transformers/hoist-jest/package.json b/e2e/ast-transformers/hoist-jest/package.json
@@ -12,12 +12,11 @@
         }
       }
     },
-    "roots": ["<rootDir>", "<rootDir>/../__tests__"],
     "moduleNameMapper": {
       "react$": "<rootDir>/node_modules/react"
     },
     "transform": {
-      "^.+\\.[tj]sx?$": "<rootDir>/../../../../dist/index.js"
+      "^.+\\.[tj]sx?$": "<rootDir>/../../../dist/index.js"
     }
   }
 }
diff --git a/e2e/ast-transformers/hoist-jest/ts-factory/jest-isolated.config.js b/e2e/ast-transformers/hoist-jest/ts-factory/jest-isolated.config.js
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "@types/jest": "^27.0.0",
     "babel-jest": ">=27.0.0 <28",
     "jest": "^27.0.0",
-    "typescript": ">=3.8 <5.0"
+    "typescript": ">=4.3"
   },
   "peerDependenciesMeta": {
     "@babel/core": {
diff --git a/src/config/__snapshots__/config-set.spec.ts.snap b/src/config/__snapshots__/config-set.spec.ts.snap
@@ -60,7 +60,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -74,7 +74,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],
@@ -93,7 +93,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],
@@ -118,7 +118,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -138,7 +138,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
   ],
 }
@@ -152,7 +152,7 @@ Object {
     Object {
       "factory": [Function],
       "name": "hoist-jest",
-      "version": 3,
+      "version": 4,
     },
     Object {
       "factory": [Function],
diff --git a/src/transformers/hoist-jest.spec.ts b/src/transformers/hoist-jest.spec.ts
@@ -168,7 +168,7 @@ const printer = ts.createPrinter()
 describe('hoist-jest', () => {
   test('should have correct transformer name and version', () => {
     expect(name).toBe('hoist-jest')
-    expect(version).toBe(3)
+    expect(version).toBe(4)
   })
 
   test('should hoist correctly when not using @jest/globals', () => {
diff --git a/src/transformers/hoist-jest.ts b/src/transformers/hoist-jest.ts
@@ -8,7 +8,7 @@ import type { TsCompilerInstance } from '../types'
  * Remember to increase the version whenever transformer's content is changed. This is to inform Jest to not reuse
  * the previous cache which contains old transformer's content
  */
-export const version = 3
+export const version = 4
 // Used for constructing cache key
 export const name = 'hoist-jest'
 
@@ -21,7 +21,6 @@ const JEST_GLOBAL_NAME = 'jest'
 export function factory({ configSet }: TsCompilerInstance) {
   const logger = configSet.logger.child({ namespace: name })
   const ts = configSet.compilerModule
-  const tsFactory = ts.factory ? ts.factory : ts
   const importNamesOfJestObj: string[] = []
 
   const isJestGlobalImport = (node: _ts.Node): node is _ts.ImportDeclaration => {
@@ -87,6 +86,7 @@ export function factory({ configSet }: TsCompilerInstance) {
     if (statements.length <= 1) {
       return statements
     }
+
     const pivot = statements[0]
     const leftPart: _ts.Statement[] = []
     const rightPart: _ts.Statement[] = []
@@ -109,11 +109,11 @@ export function factory({ configSet }: TsCompilerInstance) {
       const resultNode = ts.visitEachChild(node, visitor, ctx)
       // Since we use `visitEachChild`, we go upwards tree so all children node elements are checked first
       if (ts.isBlock(resultNode) && canHoistInBlockScope(resultNode)) {
-        const newNodeArrayStatements = tsFactory.createNodeArray(
+        const newNodeArrayStatements = ts.factory.createNodeArray(
           sortStatements(resultNode.statements as unknown as _ts.Statement[]),
         )
 
-        return tsFactory.updateBlock(resultNode, newNodeArrayStatements)
+        return ts.factory.updateBlock(resultNode, newNodeArrayStatements)
       } else {
         if (ts.isSourceFile(resultNode)) {
           resultNode.statements.forEach((stmt) => {
@@ -141,30 +141,20 @@ export function factory({ configSet }: TsCompilerInstance) {
               }
             }
           })
-          const newNodeArrayStatements = tsFactory.createNodeArray(
+          const newNodeArrayStatements = ts.factory.createNodeArray(
             sortStatements(resultNode.statements as unknown as _ts.Statement[]),
           )
           importNamesOfJestObj.length = 0
 
-          return ts.factory
-            ? ts.factory.updateSourceFile(
-                resultNode,
-                newNodeArrayStatements,
-                resultNode.isDeclarationFile,
-                resultNode.referencedFiles,
-                resultNode.typeReferenceDirectives,
-                resultNode.hasNoDefaultLib,
-                resultNode.libReferenceDirectives,
-              )
-            : ts.updateSourceFileNode(
-                resultNode,
-                newNodeArrayStatements,
-                resultNode.isDeclarationFile,
-                resultNode.referencedFiles,
-                resultNode.typeReferenceDirectives,
-                resultNode.hasNoDefaultLib,
-                resultNode.libReferenceDirectives,
-              )
+          return ts.factory.updateSourceFile(
+            resultNode,
+            newNodeArrayStatements,
+            resultNode.isDeclarationFile,
+            resultNode.referencedFiles,
+            resultNode.typeReferenceDirectives,
+            resultNode.hasNoDefaultLib,
+            resultNode.libReferenceDirectives,
+          )
         }
 
         return resultNode
diff --git a/src/utils/version-checkers.spec.ts b/src/utils/version-checkers.spec.ts
@@ -16,22 +16,21 @@ const pv = jest.mocked(_pv)
 describeChecker(VersionCheckers.jest, 'jest', ['27.0.0'], [undefined, '23.6.0', '24.1.0', '28.0.0'])
 describeChecker(VersionCheckers.babelJest, 'babel-jest', ['27.0.0'], [undefined, '23.6.0', '24.1.0', '28.0.0'])
 describeChecker(VersionCheckers.babelCore, '@babel/core', ['7.0.0'], [undefined, '6.0.0', '8.0.0'])
-describeChecker(VersionCheckers.typescript, 'typescript', ['3.8.0', '3.8.3'], [undefined, '3.3.0', '5.0.0'])
+describeChecker(VersionCheckers.typescript, 'typescript', ['4.3.0', '4.3.5'], [undefined, '4.2.0', '5.0.0'])
 
 function describeChecker(
   checker: VersionChecker,
   moduleName: string,
   supportedVersions: string[],
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  unsupportedVersions: any[],
+  unsupportedVersions: Array<string | undefined>,
 ) {
   // eslint-disable-next-line jest/valid-title
   describe(moduleName, () => {
     beforeEach(() => {
       checker.forget()
     })
 
-    unsupportedVersions.forEach((testVersion: string) => {
+    unsupportedVersions.forEach((testVersion) => {
       describe(`unsupported version (${testVersion})`, () => {
         beforeEach(() => {
           pv.getPackageVersion.mockImplementation((name) => (name === moduleName ? testVersion : undefined))
diff --git a/src/utils/version-checkers.ts b/src/utils/version-checkers.ts
@@ -13,7 +13,7 @@ const logger = rootLogger.child({ namespace: 'versions' })
  */
 const enum ExpectedVersions {
   Jest = '>=27.0.0 <28',
-  TypeScript = '>=3.8 <5',
+  TypeScript = '>=4.3 <5',
   BabelJest = '>=27.0.0 <28',
   BabelCore = '>=7.0.0-beta.0 <8',
 }

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,11 @@`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`},`
`15`		`- "roots": ["<rootDir>", "<rootDir>/../__tests__"],`
`16`	`15`	`"moduleNameMapper": {`
`17`	`16`	`"react$": "<rootDir>/node_modules/react"`
`18`	`17`	`},`
`19`	`18`	`"transform": {`
`20`		`- "^.+\\.[tj]sx?$": "<rootDir>/../../../../dist/index.js"`
	`19`	`+ "^.+\\.[tj]sx?$": "<rootDir>/../../../dist/index.js"`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`	`}`