refactor: use AstroIntegrationLogger

jlarmstrongiv · Sep 13, 2023 · f7468c1 · f7468c1
1 parent 4bc7c4a
commit f7468c1
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 359 deletions.
diff --git a/src/astro/logger/README.md b/src/astro/logger/README.md
diff --git a/src/astro/logger/console.ts b/src/astro/logger/console.ts
diff --git a/src/astro/logger/core.ts b/src/astro/logger/core.ts
diff --git a/src/astro/logger/node.ts b/src/astro/logger/node.ts
diff --git a/src/integration/ensureValidConfigs/ensureValidConfigs.ts b/src/integration/ensureValidConfigs/ensureValidConfigs.ts
@@ -1,4 +1,4 @@
-import type { AstroConfig } from "astro";
+import type { AstroConfig, AstroIntegrationLogger } from "astro";
 import type { UpdateConfig } from "./UpdateConfig";
 import type { I18nConfig } from "../../shared/configs";
 import { ensureValidTrailingSlashAndFormat } from "./ensureValidTrailingSlashAndFormat";
@@ -8,9 +8,10 @@ import { createVirtualModules } from "./createVirtualModules";
 export async function ensureValidConfigs(
   config: AstroConfig,
   updateConfig: UpdateConfig,
-  i18nConfig: I18nConfig
+  i18nConfig: I18nConfig,
+  logger: AstroIntegrationLogger
 ) {
-  ensureValidTrailingSlashAndFormat(config, updateConfig);
-  await ensureValidRedirectMiddleware(config, i18nConfig);
+  ensureValidTrailingSlashAndFormat(config, updateConfig, logger);
+  await ensureValidRedirectMiddleware(config, i18nConfig, logger);
   createVirtualModules(config, updateConfig, i18nConfig);
 }
diff --git a/src/integration/ensureValidConfigs/ensureValidRedirectMiddleware.ts b/src/integration/ensureValidConfigs/ensureValidRedirectMiddleware.ts
@@ -1,14 +1,14 @@
-import type { AstroConfig } from "astro";
+import type { AstroConfig, AstroIntegrationLogger } from "astro";
 import type { I18nConfig } from "../../shared/configs";
 import path from "path";
 import fs from "fs-extra";
 import dedent from "dedent";
-import { logger } from "../../astro/logger/node";
 import { removeLeadingForwardSlashWindows } from "../../astro/internal-helpers/path";
 
 export async function ensureValidRedirectMiddleware(
   config: AstroConfig,
-  i18nConfig: I18nConfig
+  i18nConfig: I18nConfig,
+  logger: AstroIntegrationLogger
 ) {
   if (i18nConfig.redirectDefaultLocale) {
     const configSrcDirPathname = path.normalize(
@@ -35,12 +35,11 @@ export async function ensureValidRedirectMiddleware(
 
     // warn and create middleware if it does not exist
     if (pathExists === false) {
-      logger.warn("astro-i18n-aut", `cannot find any Astro middleware files:`);
+      logger.warn(`cannot find any Astro middleware files:`);
       middlewarePaths.forEach((middlewarePath) => {
-        logger.warn("astro-i18n-aut", `- ${middlewarePath}`);
+        logger.warn(`- ${middlewarePath}`);
       });
       logger.warn(
-        "astro-i18n-aut",
         `creating ${defaultMiddlewarePath} with defaultLocale = "en"`
       );
       await fs.outputFile(