test: update case

artusjs · Dec 26, 2023 · 5780843 · 5780843
1 parent b88807b
commit 5780843
Show file tree

Hide file tree

Showing 13 changed files with 201 additions and 195 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,10 +1,8 @@
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
   transform: {
-    '^.+\\.jsx?$': 'babel-jest',
     '^.+\\.tsx?$': 'ts-jest',
   },
-  preset: 'ts-jest',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   testEnvironment: 'node',
   testPathIgnorePatterns: [

diff --git a/package.json b/package.json
@@ -44,19 +44,20 @@
     "@artus/eslint-config-artus": "0.0.1",
     "@artus/tsconfig": "1.0.1",
     "@babel/core": "^7.18.6",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^29.5.11",
     "@types/js-yaml": "^4.0.5",
     "@types/koa": "^2.13.4",
     "@types/minimatch": "^3.0.5",
+    "@types/node": "^20.10.5",
     "axios": "^0.26.1",
-    "babel-jest": "^27.5.1",
+    "babel-jest": "^29.7.0",
     "egg-ci": "^2.1.0",
     "eslint": "^8.19.0",
     "eslint-plugin-import": "^2.26.0",
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "koa": "^2.13.4",
     "reflect-metadata": "^0.1.13",
-    "ts-jest": "^27.1.3",
+    "ts-jest": "^29.1.1",
     "typescript": "^4.8.0"
   },
   "dependencies": {
@@ -71,4 +72,4 @@
   "ci": {
     "version": "16, 18"
   }
-}
+}
diff --git a/src/utils/compatible_require.ts b/src/utils/compatible_require.ts
@@ -1,4 +1,5 @@
 import assert from 'assert';
+import * as tslib from 'tslib';
 
 /**
  * compatible esModule require
@@ -8,11 +9,17 @@ export default async function compatibleRequire(path: string, origin = false): P
   if (path.endsWith('.json')) {
     return require(path);
   }
-  let requiredModule = await import(path);
 
-  assert(requiredModule, `module '${path}' exports is undefined`);
-
-  requiredModule = requiredModule.__esModule ? requiredModule.default ?? requiredModule : requiredModule;
+  let requiredModule;
+  try {
+    /* eslint-disable-next-line @typescript-eslint/no-var-requires */
+    requiredModule = tslib.__importStar(require(path));
+    assert(requiredModule, `module '${path}' exports is undefined`);
+  } catch {
+    requiredModule = await import(path);
+    assert(requiredModule, `module '${path}' exports is undefined`);
+    requiredModule = requiredModule.__esModule ? requiredModule.default ?? requiredModule : requiredModule;
+  }
 
   return origin ? requiredModule : (requiredModule.default || requiredModule);
 }