@docusaurus/core 0.0.0-5131 → 0.0.0-5136

package/lib/server/brokenLinks.js

@@ -150,7 +150,7 @@ async function handleBrokenLinks({ allCollectedLinks, onBrokenLinks, routes, bas
     });
     const errorMessage = getBrokenLinksErrorMessage(allBrokenLinks);
     if (errorMessage) {
-        (0, utils_1.reportMessage)(errorMessage, onBrokenLinks);
+        logger_1.default.report(onBrokenLinks)(errorMessage);
     }
 }
 exports.handleBrokenLinks = handleBrokenLinks;

package/lib/server/configValidation.js

@@ -89,6 +89,7 @@ const LocaleConfigSchema = utils_validation_1.Joi.object({
     htmlLang: utils_validation_1.Joi.string(),
     direction: utils_validation_1.Joi.string().equal('ltr', 'rtl').default('ltr'),
     calendar: utils_validation_1.Joi.string(),
+    path: utils_validation_1.Joi.string(),
 });
 const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     defaultLocale: utils_validation_1.Joi.string().required(),
@@ -125,13 +126,13 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     trailingSlash: utils_validation_1.Joi.boolean(),
     i18n: I18N_CONFIG_SCHEMA,
     onBrokenLinks: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onBrokenLinks),
     onBrokenMarkdownLinks: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onBrokenMarkdownLinks),
     onDuplicateRoutes: utils_validation_1.Joi.string()
-        .equal('ignore', 'log', 'warn', 'error', 'throw')
+        .equal('ignore', 'log', 'warn', 'throw')
         .default(exports.DEFAULT_CONFIG.onDuplicateRoutes),
     organizationName: utils_validation_1.Joi.string().allow(''),
     staticDirectories: utils_validation_1.Joi.array()

package/lib/server/i18n.js

@@ -21,6 +21,7 @@ function getDefaultLocaleConfig(locale) {
         htmlLang: locale,
         // If the locale name includes -u-ca-xxx the calendar will be defined
         calendar: new Intl.Locale(locale).calendar ?? 'gregory',
+        path: locale,
     };
 }
 exports.getDefaultLocaleConfig = getDefaultLocaleConfig;

package/lib/server/index.js

@@ -46,8 +46,7 @@ async function loadContext(options) {
         pathType: 'fs',
     });
     const siteConfig = { ...initialSiteConfig, baseUrl };
-    // TODO allow customizing localizationDir per-locale
-    const localizationDir = path_1.default.resolve(siteDir, i18n.path, i18n.currentLocale);
+    const localizationDir = path_1.default.resolve(siteDir, i18n.path, i18n.localeConfigs[i18n.currentLocale].path);
     const codeTranslationFileContent = (await (0, translations_1.readCodeTranslationFileContent)({ localizationDir })) ?? {};
     // We only need key->message for code translations
     const codeTranslations = lodash_1.default.mapValues(codeTranslationFileContent, (value) => value.message);

package/lib/server/routes.js

@@ -10,6 +10,7 @@ exports.loadRoutes = exports.handleDuplicateRoutes = exports.genChunkName = void
 const tslib_1 = require("tslib");
 const querystring_1 = tslib_1.__importDefault(require("querystring"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./utils");
 /** Indents every line of `str` by one level. */
@@ -133,12 +134,8 @@ function handleDuplicateRoutes(pluginsRouteConfigs, onDuplicateRoutes) {
         return false;
     });
     if (duplicatePaths.length > 0) {
-        const finalMessage = `Duplicate routes found!
-${duplicatePaths
-            .map((duplicateRoute) => `- Attempting to create page at ${duplicateRoute}, but a page already exists at this route.`)
-            .join('\n')}
+        logger_1.default.report(onDuplicateRoutes) `Duplicate routes found!${duplicatePaths.map((duplicateRoute) => logger_1.default.interpolate `Attempting to create page at url=${duplicateRoute}, but a page already exists at this route.`)}
 This could lead to non-deterministic routing behavior.`;
-        (0, utils_1.reportMessage)(finalMessage, onDuplicateRoutes);
     }
 }
 exports.handleDuplicateRoutes = handleDuplicateRoutes;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5131",
+  "version": "0.0.0-5136",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,23 +33,23 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.5",
     "@babel/generator": "^7.18.2",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.18.2",
+    "@babel/plugin-transform-runtime": "^7.18.5",
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.3",
     "@babel/runtime-corejs3": "^7.18.3",
-    "@babel/traverse": "^7.18.2",
-    "@docusaurus/cssnano-preset": "0.0.0-5131",
-    "@docusaurus/logger": "0.0.0-5131",
-    "@docusaurus/mdx-loader": "0.0.0-5131",
+    "@babel/traverse": "^7.18.5",
+    "@docusaurus/cssnano-preset": "0.0.0-5136",
+    "@docusaurus/logger": "0.0.0-5136",
+    "@docusaurus/mdx-loader": "0.0.0-5136",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-5131",
-    "@docusaurus/utils-common": "0.0.0-5131",
-    "@docusaurus/utils-validation": "0.0.0-5131",
+    "@docusaurus/utils": "0.0.0-5136",
+    "@docusaurus/utils-common": "0.0.0-5136",
+    "@docusaurus/utils-validation": "0.0.0-5136",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -63,7 +63,7 @@
     "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.22.8",
+    "core-js": "^3.23.1",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
     "cssnano": "^5.1.11",
@@ -79,7 +79,7 @@
     "import-fresh": "^3.3.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.6.0",
+    "mini-css-extract-plugin": "^2.6.1",
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.0",
     "prompts": "^2.4.2",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5131",
-    "@docusaurus/types": "0.0.0-5131",
+    "@docusaurus/module-type-aliases": "0.0.0-5136",
+    "@docusaurus/types": "0.0.0-5136",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.5",
     "@types/react-router-config": "^5.0.6",
@@ -127,5 +127,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "5b400900fd74a046485d3757abec2590df390a4a"
+  "gitHead": "85095b9c1b8a7a935c7cce10cb78b2146c655f32"
 }