fix(ioredis): fix incompatible esm import

tsedio · Nov 8, 2024 · 1d486ea · 1d486ea
1 parent 6406314
commit 1d486ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/orm/ioredis/src/domain/IORedisStore.ts b/packages/orm/ioredis/src/domain/IORedisStore.ts
@@ -1,5 +1,6 @@
 import type {Config, FactoryConfig, Store} from "cache-manager";
-import {Cluster, ClusterNode, ClusterOptions, Redis, RedisOptions} from "ioredis";
+import type {Cluster, ClusterNode, ClusterOptions, Redis, RedisOptions} from "ioredis";
+import ioredis from "ioredis";
 
 export interface RedisClusterConfig {
   nodes: ClusterNode[];
@@ -25,7 +26,9 @@ export class IORedisStore implements Store {
 
     this.redisCache =
       options.redisInstance ||
-      ("clusterConfig" in options ? new Redis.Cluster(options.clusterConfig.nodes, options.clusterConfig.options) : new Redis(options));
+      ("clusterConfig" in options
+        ? new ioredis.Redis.Cluster(options.clusterConfig.nodes, options.clusterConfig.options)
+        : new ioredis.Redis(options));
 
     this.storeArgs = this.redisCache.options;
     this.isCacheable = this.isCacheableValue =

diff --git a/packages/orm/ioredis/src/utils/registerConnectionProvider.ts b/packages/orm/ioredis/src/utils/registerConnectionProvider.ts
@@ -1,7 +1,8 @@
 import {setValue} from "@tsed/core";
 import {Configuration, registerProvider, TokenProvider} from "@tsed/di";
 import {Logger} from "@tsed/logger";
-import {Cluster, Redis, RedisOptions} from "ioredis";
+import type {Cluster, Redis, RedisOptions} from "ioredis";
+import ioredis from "ioredis";
 
 import {IORedisConfiguration} from "../domain/IORedisConfiguration.js";
 import {ioRedisStore} from "../domain/IORedisStore.js";
@@ -46,7 +47,7 @@ export function registerConnectionProvider({provide, name = "default"}: CreateCo
           setValue(clusterOptions, "clusterRetryStrategy", retryStrategy);
           setValue(clusterOptions, "redisOptions.reconnectOnError", reconnectOnError);
 
-          connection = new Redis.Cluster(nodes, {
+          connection = new ioredis.Redis.Cluster(nodes, {
             ...clusterOptions,
             lazyConnect: true
           });
@@ -56,14 +57,14 @@ export function registerConnectionProvider({provide, name = "default"}: CreateCo
           setValue(sentinelsOptions, "sentinelRetryStrategy", retryStrategy);
           setValue(sentinelsOptions, "redisOptions.reconnectOnError", reconnectOnError);
 
-          connection = new Redis({
+          connection = new ioredis.Redis({
             name: String(sentinelName),
             sentinels,
             ...sentinelsOptions,
             lazyConnect: true
           });
         } else {
-          connection = new Redis({
+          connection = new ioredis.Redis({
             reconnectOnError,
             ...redisOptions,
             lazyConnect: true