From b992c19ea48b8549ffd8e94125d35a064bac413a Mon Sep 17 00:00:00 2001 From: John Harrington <84741727+harr1424@users.noreply.github.com> Date: Fri, 10 Oct 2025 08:23:51 -0700 Subject: [PATCH] fix broken imports --- libs/common/src/tools/log/index.ts | 5 +---- libs/logging/src/default-semantic-logger.spec.ts | 4 ++-- libs/logging/src/default-semantic-logger.ts | 4 ++-- libs/logging/src/disabled-logger.ts | 2 +- libs/logging/src/factory.ts | 2 +- libs/{common/src/tools/log => logging/src}/types.ts | 0 libs/{common/src/tools/log => logging/src}/util.ts | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) rename libs/{common/src/tools/log => logging/src}/types.ts (100%) rename libs/{common/src/tools/log => logging/src}/util.ts (82%) diff --git a/libs/common/src/tools/log/index.ts b/libs/common/src/tools/log/index.ts index 1c93a6ce63f..a0b8daaa49f 100644 --- a/libs/common/src/tools/log/index.ts +++ b/libs/common/src/tools/log/index.ts @@ -1,4 +1 @@ -export * from "./factory"; -export * from "./disabled-logger"; -export { LogProvider } from "./types"; -export { SemanticLogger } from "./semantic-logger.abstraction"; +export * from "@bitwarden/logging"; diff --git a/libs/logging/src/default-semantic-logger.spec.ts b/libs/logging/src/default-semantic-logger.spec.ts index 7f608fb40ef..486d1417712 100644 --- a/libs/logging/src/default-semantic-logger.spec.ts +++ b/libs/logging/src/default-semantic-logger.spec.ts @@ -1,7 +1,7 @@ import { mock } from "jest-mock-extended"; -import { LogService } from "../../platform/abstractions/log.service"; -import { LogLevelType } from "../../platform/enums"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { LogLevelType } from "@bitwarden/common/platform/enums"; import { DefaultSemanticLogger } from "./default-semantic-logger"; diff --git a/libs/logging/src/default-semantic-logger.ts b/libs/logging/src/default-semantic-logger.ts index eb1ecbe36c6..499a0c7fb09 100644 --- a/libs/logging/src/default-semantic-logger.ts +++ b/libs/logging/src/default-semantic-logger.ts @@ -1,7 +1,7 @@ import { Jsonify } from "type-fest"; -import { LogService } from "../../platform/abstractions/log.service"; -import { LogLevelType } from "../../platform/enums"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { LogLevelType } from "@bitwarden/common/platform/enums"; import { SemanticLogger } from "./semantic-logger.abstraction"; diff --git a/libs/logging/src/disabled-logger.ts b/libs/logging/src/disabled-logger.ts index 53feb0c8b39..e0cded0fcbf 100644 --- a/libs/logging/src/disabled-logger.ts +++ b/libs/logging/src/disabled-logger.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { deepFreeze } from "../util"; +import { deepFreeze } from "@bitwarden/common/tools/util"; import { SemanticLogger } from "./semantic-logger.abstraction"; diff --git a/libs/logging/src/factory.ts b/libs/logging/src/factory.ts index 5f0f2d74e91..3427d5e6722 100644 --- a/libs/logging/src/factory.ts +++ b/libs/logging/src/factory.ts @@ -1,6 +1,6 @@ import { Jsonify } from "type-fest"; -import { LogService } from "../../platform/abstractions/log.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { DefaultSemanticLogger } from "./default-semantic-logger"; import { DISABLED_LOGGER } from "./disabled-logger"; diff --git a/libs/common/src/tools/log/types.ts b/libs/logging/src/types.ts similarity index 100% rename from libs/common/src/tools/log/types.ts rename to libs/logging/src/types.ts diff --git a/libs/common/src/tools/log/util.ts b/libs/logging/src/util.ts similarity index 82% rename from libs/common/src/tools/log/util.ts rename to libs/logging/src/util.ts index cf1c39230e1..33d10239bc5 100644 --- a/libs/common/src/tools/log/util.ts +++ b/libs/logging/src/util.ts @@ -1,4 +1,4 @@ -import { LogService } from "../../platform/abstractions/log.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; // show our GRIT - these functions implement generalized logging // controls and should return DISABLED_LOGGER in production.