From 8bae63e6bcb734aaed5be657be00346676422376 Mon Sep 17 00:00:00 2001 From: JerrysShan <1670303003@qq.com> Date: Thu, 4 Jan 2024 11:52:16 +0800 Subject: [PATCH 1/2] fix: require ts type error not throw --- src/utils/compatible_require.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/utils/compatible_require.ts b/src/utils/compatible_require.ts index c33337b..eb09946 100644 --- a/src/utils/compatible_require.ts +++ b/src/utils/compatible_require.ts @@ -15,10 +15,14 @@ export default async function compatibleRequire(path: string, origin = false): P /* 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; + } catch (err) { + if (err.code === 'ERR_REQUIRE_ESM') { + requiredModule = await import(path); + assert(requiredModule, `module '${path}' exports is undefined`); + requiredModule = requiredModule.__esModule ? requiredModule.default ?? requiredModule : requiredModule; + } else { + throw err; + } } return origin ? requiredModule : (requiredModule.default || requiredModule); From dda009918da3cd1fcaf609ca1a7d9a226f0f6aa9 Mon Sep 17 00:00:00 2001 From: JerrysShan <1670303003@qq.com> Date: Thu, 4 Jan 2024 12:20:53 +0800 Subject: [PATCH 2/2] chore: update version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3a3969f..e498e24 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@artus/core", - "version": "2.2.0", + "version": "2.2.1", "description": "Core package of Artus", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -72,4 +72,4 @@ "ci": { "version": "16, 18" } -} +} \ No newline at end of file