@docusaurus/plugin-client-redirects 0.0.0-4291 → 0.0.0-4297

package/lib/collectRedirects.js

@@ -11,7 +11,7 @@ const lodash_1 = require("lodash");
 const extensionRedirects_1 = require("./extensionRedirects");
 const redirectValidation_1 = require("./redirectValidation");
 const utils_common_1 = require("@docusaurus/utils-common");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
 function collectRedirects(pluginContext, trailingSlash) {
     let redirects = doCollectRedirects(pluginContext);
     redirects = applyRedirectsTrailingSlash(redirects, {
@@ -66,19 +66,15 @@ function filterUnwantedRedirects(redirects, pluginContext) {
     // that would lead to writing twice the same html redirection file
     Object.entries((0, lodash_1.groupBy)(redirects, (redirect) => redirect.from)).forEach(([from, groupedFromRedirects]) => {
         if (groupedFromRedirects.length > 1) {
-            console.error(chalk_1.default.red(`@docusaurus/plugin-client-redirects: multiple redirects are created with the same "from" pathname=${from}
-It is not possible to redirect the same pathname to multiple destinations:
-- ${groupedFromRedirects.map((r) => JSON.stringify(r)).join('\n- ')}
-`));
+            logger_1.default.error `name=${'@docusaurus/plugin-client-redirects'}: multiple redirects are created with the same "from" pathname: path=${from}
+It is not possible to redirect the same pathname to multiple destinations: ${groupedFromRedirects.map((r) => JSON.stringify(r))}`;
         }
     });
     const collectedRedirects = (0, lodash_1.uniqBy)(redirects, (redirect) => redirect.from);
     // We don't want to override an already existing route with a redirect file!
     const redirectsOverridingExistingPath = collectedRedirects.filter((redirect) => pluginContext.relativeRoutesPaths.includes(redirect.from));
     if (redirectsOverridingExistingPath.length > 0) {
-        console.error(chalk_1.default.red(`@docusaurus/plugin-client-redirects: some redirects would override existing paths, and will be ignored:
-- ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r)).join('\n- ')}
-`));
+        logger_1.default.error `name=${'@docusaurus/plugin-client-redirects'}: some redirects would override existing paths, and will be ignored: ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r))}`;
     }
     return collectedRedirects.filter((redirect) => !pluginContext.relativeRoutesPaths.includes(redirect.from));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "0.0.0-4291",
+  "version": "0.0.0-4297",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-client-redirects.d.ts",
@@ -18,10 +18,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4291",
-    "@docusaurus/utils": "0.0.0-4291",
-    "@docusaurus/utils-common": "0.0.0-4291",
-    "@docusaurus/utils-validation": "0.0.0-4291",
+    "@docusaurus/core": "0.0.0-4297",
+    "@docusaurus/logger": "0.0.0-4297",
+    "@docusaurus/utils": "0.0.0-4297",
+    "@docusaurus/utils-common": "0.0.0-4297",
+    "@docusaurus/utils-validation": "0.0.0-4297",
     "chalk": "^4.1.2",
     "eta": "^1.12.3",
     "fs-extra": "^10.0.0",
@@ -29,7 +30,7 @@
     "tslib": "^2.3.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "0.0.0-4291"
+    "@docusaurus/types": "0.0.0-4297"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
@@ -38,5 +39,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "7097980fb8a57b1950c0714707966eea27f69975"
+  "gitHead": "84ae34c33c664bf856f3a92047919a074e087d77"
 }

package/src/collectRedirects.ts

@@ -22,7 +22,7 @@ import {
   ApplyTrailingSlashParams,
 } from '@docusaurus/utils-common';
 
-import chalk from 'chalk';
+import logger from '@docusaurus/logger';
 
 export default function collectRedirects(
   pluginContext: PluginContext,
@@ -99,14 +99,10 @@ function filterUnwantedRedirects(
   Object.entries(groupBy(redirects, (redirect) => redirect.from)).forEach(
     ([from, groupedFromRedirects]) => {
       if (groupedFromRedirects.length > 1) {
-        console.error(
-          chalk.red(
-            `@docusaurus/plugin-client-redirects: multiple redirects are created with the same "from" pathname=${from}
-It is not possible to redirect the same pathname to multiple destinations:
-- ${groupedFromRedirects.map((r) => JSON.stringify(r)).join('\n- ')}
-`,
-          ),
-        );
+        logger.error`name=${'@docusaurus/plugin-client-redirects'}: multiple redirects are created with the same "from" pathname: path=${from}
+It is not possible to redirect the same pathname to multiple destinations: ${groupedFromRedirects.map(
+          (r) => JSON.stringify(r),
+        )}`;
       }
     },
   );
@@ -117,13 +113,9 @@ It is not possible to redirect the same pathname to multiple destinations:
     (redirect) => pluginContext.relativeRoutesPaths.includes(redirect.from),
   );
   if (redirectsOverridingExistingPath.length > 0) {
-    console.error(
-      chalk.red(
-        `@docusaurus/plugin-client-redirects: some redirects would override existing paths, and will be ignored:
-- ${redirectsOverridingExistingPath.map((r) => JSON.stringify(r)).join('\n- ')}
-`,
-      ),
-    );
+    logger.error`name=${'@docusaurus/plugin-client-redirects'}: some redirects would override existing paths, and will be ignored: ${redirectsOverridingExistingPath.map(
+      (r) => JSON.stringify(r),
+    )}`;
   }
   return collectedRedirects.filter(
     (redirect) => !pluginContext.relativeRoutesPaths.includes(redirect.from),