@docusaurus/plugin-content-docs 0.0.0-4524 → 0.0.0-4531

package/lib/cli.d.ts

@@ -5,4 +5,4 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { PathOptions, SidebarOptions } from '@docusaurus/plugin-content-docs';
-export declare function cliDocsVersionCommand(version: string | null | undefined, siteDir: string, pluginId: string, options: PathOptions & SidebarOptions): void;
+export declare function cliDocsVersionCommand(version: string | null | undefined, siteDir: string, pluginId: string, options: PathOptions & SidebarOptions): Promise<void>;

package/lib/cli.js

@@ -14,11 +14,11 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const sidebars_1 = require("./sidebars");
 const utils_1 = require("@docusaurus/utils");
 const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-function createVersionedSidebarFile({ siteDir, pluginId, sidebarPath, version, }) {
+async function createVersionedSidebarFile({ siteDir, pluginId, sidebarPath, version, }) {
     // Load current sidebar and create a new versioned sidebars file (if needed).
     // Note: we don't need the sidebars file to be normalized: it's ok to let
     // plugin option changes to impact older, versioned sidebars
-    const sidebars = (0, sidebars_1.loadSidebarsFile)(sidebarPath);
+    const sidebars = await (0, sidebars_1.loadSidebarsFile)(sidebarPath);
     // Do not create a useless versioned sidebars file if sidebars file is empty
     // or sidebars are disabled/false)
     const shouldCreateVersionedSidebarFile = Object.keys(sidebars).length > 0;
@@ -30,7 +30,7 @@ function createVersionedSidebarFile({ siteDir, pluginId, sidebarPath, version, }
     }
 }
 // Tests depend on non-default export for mocking.
-function cliDocsVersionCommand(version, siteDir, pluginId, options) {
+async function cliDocsVersionCommand(version, siteDir, pluginId, options) {
     // It wouldn't be very user-friendly to show a [default] log prefix,
     // so we use [docs] instead of [default]
     const pluginIdLogPrefix = pluginId === utils_1.DEFAULT_PLUGIN_ID ? '[docs]' : `[${pluginId}]`;
@@ -73,7 +73,7 @@ function cliDocsVersionCommand(version, siteDir, pluginId, options) {
     else {
         throw new Error(`${pluginIdLogPrefix}: there is no docs to version!`);
     }
-    createVersionedSidebarFile({
+    await createVersionedSidebarFile({
         siteDir,
         pluginId,
         version,

package/lib/index.js

@@ -214,7 +214,7 @@ async function pluginContentDocs(context, options) {
             function createMDXLoaderRule() {
                 const contentDirs = versionsMetadata.flatMap(versions_1.getDocsDirPaths);
                 return {
-                    test: /(\.mdx?)$/,
+                    test: /\.mdx?$/i,
                     include: contentDirs
                         // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
                         .map(utils_1.addTrailingPathSeparator),

package/lib/lastUpdate.js

@@ -10,20 +10,21 @@ exports.getFileLastUpdate = void 0;
 const tslib_1 = require("tslib");
 const shelljs_1 = (0, tslib_1.__importDefault)(require("shelljs"));
 const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX = /^(\d+),(.+)$/;
+const GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX = /^(?<timestamp>\d+),(?<author>.+)$/;
 let showedGitRequirementError = false;
 async function getFileLastUpdate(filePath) {
     if (!filePath) {
         return null;
     }
     function getTimestampAndAuthor(str) {
+        var _a;
         if (!str) {
             return null;
         }
-        const temp = str.match(GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX);
-        return !temp || temp.length < 3
-            ? null
-            : { timestamp: +temp[1], author: temp[2] };
+        const temp = (_a = str.match(GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX)) === null || _a === void 0 ? void 0 : _a.groups;
+        return temp
+            ? { timestamp: Number(temp.timestamp), author: temp.author }
+            : null;
     }
     // Wrap in try/catch in case the shell commands fail
     // (e.g. project doesn't use Git, etc).

package/lib/numberPrefix.js

@@ -10,13 +10,13 @@ exports.stripPathNumberPrefixes = exports.stripNumberPrefix = exports.DisabledNu
 // Best-effort to avoid parsing some patterns as number prefix
 const IgnoredPrefixPatterns = (() => {
     // ignore common date-like patterns: https://github.com/facebook/docusaurus/issues/4640
-    const DateLikePrefixRegex = /^((\d{2}|\d{4})[-_.]\d{2}([-_.](\d{2}|\d{4}))?)(.*)$/;
+    const DateLikePrefixRegex = /^(?:\d{2}|\d{4})[-_.]\d{2}(?:[-_.](?:\d{2}|\d{4}))?.*$/;
     // ignore common versioning patterns: https://github.com/facebook/docusaurus/issues/4653
     // note: we could try to parse float numbers in filenames but that is
     // probably not worth it as a version such as "8.0" can be interpreted as both
     // a version and a float. User can configure her own NumberPrefixParser if
     // she wants 8.0 to be interpreted as a float
-    const VersionLikePrefixRegex = /^(\d+[-_.]\d+)(.*)$/;
+    const VersionLikePrefixRegex = /^\d+[-_.]\d+.*$/;
     return new RegExp(`${DateLikePrefixRegex.source}|${VersionLikePrefixRegex.source}`);
 })();
 const NumberPrefixRegex = /^(?<numberPrefix>\d+)(?<separator>\s*[-_.]+\s*)(?<suffix>.*)$/;

package/lib/sidebars/index.d.ts

@@ -11,6 +11,6 @@ import type { PluginOptions } from '@docusaurus/plugin-content-docs';
 export declare const DefaultSidebars: SidebarsConfig;
 export declare const DisabledSidebars: SidebarsConfig;
 export declare function resolveSidebarPathOption(siteDir: string, sidebarPathOption: PluginOptions['sidebarPath']): PluginOptions['sidebarPath'];
-export declare function loadSidebarsFile(sidebarFilePath: string | false | undefined): SidebarsConfig;
-export declare function loadNormalizedSidebars(sidebarFilePath: string | false | undefined, params: NormalizeSidebarsParams): NormalizedSidebars;
+export declare function loadSidebarsFile(sidebarFilePath: string | false | undefined): Promise<SidebarsConfig>;
+export declare function loadNormalizedSidebars(sidebarFilePath: string | false | undefined, params: NormalizeSidebarsParams): Promise<NormalizedSidebars>;
 export declare function loadSidebars(sidebarFilePath: string | false | undefined, options: SidebarProcessorParams): Promise<Sidebars>;

package/lib/sidebars/index.js

@@ -32,7 +32,7 @@ function resolveSidebarPathOption(siteDir, sidebarPathOption) {
         : sidebarPathOption;
 }
 exports.resolveSidebarPathOption = resolveSidebarPathOption;
-function loadSidebarsFileUnsafe(sidebarFilePath) {
+async function loadSidebarsFileUnsafe(sidebarFilePath) {
     // false => no sidebars
     if (sidebarFilePath === false) {
         return exports.DisabledSidebars;
@@ -50,14 +50,14 @@ function loadSidebarsFileUnsafe(sidebarFilePath) {
     // We don't want sidebars to be cached because of hot reloading.
     return (0, import_fresh_1.default)(sidebarFilePath);
 }
-function loadSidebarsFile(sidebarFilePath) {
-    const sidebarsConfig = loadSidebarsFileUnsafe(sidebarFilePath);
+async function loadSidebarsFile(sidebarFilePath) {
+    const sidebarsConfig = await loadSidebarsFileUnsafe(sidebarFilePath);
     (0, validation_1.validateSidebars)(sidebarsConfig);
     return sidebarsConfig;
 }
 exports.loadSidebarsFile = loadSidebarsFile;
-function loadNormalizedSidebars(sidebarFilePath, params) {
-    return (0, normalization_1.normalizeSidebars)(loadSidebarsFile(sidebarFilePath), params);
+async function loadNormalizedSidebars(sidebarFilePath, params) {
+    return (0, normalization_1.normalizeSidebars)(await loadSidebarsFile(sidebarFilePath), params);
 }
 exports.loadNormalizedSidebars = loadNormalizedSidebars;
 // Note: sidebarFilePath must be absolute, use resolveSidebarPathOption
@@ -67,7 +67,7 @@ async function loadSidebars(sidebarFilePath, options) {
         version: options.version,
         categoryLabelSlugger: (0, utils_1.createSlugger)(),
     };
-    const normalizedSidebars = loadNormalizedSidebars(sidebarFilePath, normalizeSidebarsParams);
+    const normalizedSidebars = await loadNormalizedSidebars(sidebarFilePath, normalizeSidebarsParams);
     return (0, processor_1.processSidebars)(normalizedSidebars, options);
 }
 exports.loadSidebars = loadSidebars;

package/lib/sidebars/validation.js

@@ -20,7 +20,7 @@ const sidebarItemAutogeneratedSchema = sidebarItemBaseSchema.append({
     type: 'autogenerated',
     dirName: utils_validation_1.Joi.string()
         .required()
-        .pattern(/^[^/](.*[^/])?$/)
+        .pattern(/^[^/](?:.*[^/])?$/)
         .message('"dirName" must be a dir path relative to the docs folder root, and should not start or end with slash'),
 });
 const sidebarItemDocSchema = sidebarItemBaseSchema.append({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "0.0.0-4524",
+  "version": "0.0.0-4531",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "exports": {
@@ -22,11 +22,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4524",
-    "@docusaurus/logger": "0.0.0-4524",
-    "@docusaurus/mdx-loader": "0.0.0-4524",
-    "@docusaurus/utils": "0.0.0-4524",
-    "@docusaurus/utils-validation": "0.0.0-4524",
+    "@docusaurus/core": "0.0.0-4531",
+    "@docusaurus/logger": "0.0.0-4531",
+    "@docusaurus/mdx-loader": "0.0.0-4531",
+    "@docusaurus/utils": "0.0.0-4531",
+    "@docusaurus/utils-validation": "0.0.0-4531",
     "combine-promises": "^1.1.0",
     "fs-extra": "^10.0.0",
     "import-fresh": "^3.2.2",
@@ -36,11 +36,11 @@
     "shelljs": "^0.8.4",
     "tslib": "^2.3.1",
     "utility-types": "^3.10.0",
-    "webpack": "^5.61.0"
+    "webpack": "^5.68.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4524",
-    "@docusaurus/types": "0.0.0-4524",
+    "@docusaurus/module-type-aliases": "0.0.0-4531",
+    "@docusaurus/types": "0.0.0-4531",
     "@types/js-yaml": "^4.0.0",
     "@types/picomatch": "^2.2.1",
     "commander": "^5.1.0",
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "41a6bff3a67446f7d2a2972cbe4d05fec7378a15"
+  "gitHead": "fe104fed3e8ef603f81594311564e598c9c55a6c"
 }

package/src/cli.ts

@@ -20,7 +20,7 @@ import {loadSidebarsFile, resolveSidebarPathOption} from './sidebars';
 import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import logger from '@docusaurus/logger';
 
-function createVersionedSidebarFile({
+async function createVersionedSidebarFile({
   siteDir,
   pluginId,
   sidebarPath,
@@ -34,7 +34,7 @@ function createVersionedSidebarFile({
   // Load current sidebar and create a new versioned sidebars file (if needed).
   // Note: we don't need the sidebars file to be normalized: it's ok to let
   // plugin option changes to impact older, versioned sidebars
-  const sidebars = loadSidebarsFile(sidebarPath);
+  const sidebars = await loadSidebarsFile(sidebarPath);
 
   // Do not create a useless versioned sidebars file if sidebars file is empty
   // or sidebars are disabled/false)
@@ -56,12 +56,12 @@ function createVersionedSidebarFile({
 }
 
 // Tests depend on non-default export for mocking.
-export function cliDocsVersionCommand(
+export async function cliDocsVersionCommand(
   version: string | null | undefined,
   siteDir: string,
   pluginId: string,
   options: PathOptions & SidebarOptions,
-): void {
+): Promise<void> {
   // It wouldn't be very user-friendly to show a [default] log prefix,
   // so we use [docs] instead of [default]
   const pluginIdLogPrefix =
@@ -127,7 +127,7 @@ export function cliDocsVersionCommand(
     throw new Error(`${pluginIdLogPrefix}: there is no docs to version!`);
   }
 
-  createVersionedSidebarFile({
+  await createVersionedSidebarFile({
     siteDir,
     pluginId,
     version,

package/src/index.ts

@@ -333,7 +333,7 @@ export default async function pluginContentDocs(
       function createMDXLoaderRule(): RuleSetRule {
         const contentDirs = versionsMetadata.flatMap(getDocsDirPaths);
         return {
-          test: /(\.mdx?)$/,
+          test: /\.mdx?$/i,
           include: contentDirs
             // Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
             .map(addTrailingPathSeparator),

package/src/lastUpdate.ts

@@ -10,7 +10,7 @@ import logger from '@docusaurus/logger';
 
 type FileLastUpdateData = {timestamp?: number; author?: string};
 
-const GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX = /^(\d+),(.+)$/;
+const GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX = /^(?<timestamp>\d+),(?<author>.+)$/;
 
 let showedGitRequirementError = false;
 
@@ -25,10 +25,10 @@ export async function getFileLastUpdate(
       return null;
     }
 
-    const temp = str.match(GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX);
-    return !temp || temp.length < 3
-      ? null
-      : {timestamp: +temp[1], author: temp[2]};
+    const temp = str.match(GIT_COMMIT_TIMESTAMP_AUTHOR_REGEX)?.groups;
+    return temp
+      ? {timestamp: Number(temp.timestamp), author: temp.author}
+      : null;
   }
 
   // Wrap in try/catch in case the shell commands fail

package/src/numberPrefix.ts

@@ -11,14 +11,14 @@ import type {NumberPrefixParser} from '@docusaurus/plugin-content-docs';
 const IgnoredPrefixPatterns = (() => {
   // ignore common date-like patterns: https://github.com/facebook/docusaurus/issues/4640
   const DateLikePrefixRegex =
-    /^((\d{2}|\d{4})[-_.]\d{2}([-_.](\d{2}|\d{4}))?)(.*)$/;
+    /^(?:\d{2}|\d{4})[-_.]\d{2}(?:[-_.](?:\d{2}|\d{4}))?.*$/;
 
   // ignore common versioning patterns: https://github.com/facebook/docusaurus/issues/4653
   // note: we could try to parse float numbers in filenames but that is
   // probably not worth it as a version such as "8.0" can be interpreted as both
   // a version and a float. User can configure her own NumberPrefixParser if
   // she wants 8.0 to be interpreted as a float
-  const VersionLikePrefixRegex = /^(\d+[-_.]\d+)(.*)$/;
+  const VersionLikePrefixRegex = /^\d+[-_.]\d+.*$/;
 
   return new RegExp(
     `${DateLikePrefixRegex.source}|${VersionLikePrefixRegex.source}`,

package/src/sidebars/index.ts

@@ -38,9 +38,9 @@ export function resolveSidebarPathOption(
     : sidebarPathOption;
 }
 
-function loadSidebarsFileUnsafe(
+async function loadSidebarsFileUnsafe(
   sidebarFilePath: string | false | undefined,
-): SidebarsConfig {
+): Promise<SidebarsConfig> {
   // false => no sidebars
   if (sidebarFilePath === false) {
     return DisabledSidebars;
@@ -62,19 +62,19 @@ function loadSidebarsFileUnsafe(
   return importFresh(sidebarFilePath);
 }
 
-export function loadSidebarsFile(
+export async function loadSidebarsFile(
   sidebarFilePath: string | false | undefined,
-): SidebarsConfig {
-  const sidebarsConfig = loadSidebarsFileUnsafe(sidebarFilePath);
+): Promise<SidebarsConfig> {
+  const sidebarsConfig = await loadSidebarsFileUnsafe(sidebarFilePath);
   validateSidebars(sidebarsConfig);
   return sidebarsConfig;
 }
 
-export function loadNormalizedSidebars(
+export async function loadNormalizedSidebars(
   sidebarFilePath: string | false | undefined,
   params: NormalizeSidebarsParams,
-): NormalizedSidebars {
-  return normalizeSidebars(loadSidebarsFile(sidebarFilePath), params);
+): Promise<NormalizedSidebars> {
+  return normalizeSidebars(await loadSidebarsFile(sidebarFilePath), params);
 }
 
 // Note: sidebarFilePath must be absolute, use resolveSidebarPathOption
@@ -87,7 +87,7 @@ export async function loadSidebars(
     version: options.version,
     categoryLabelSlugger: createSlugger(),
   };
-  const normalizedSidebars = loadNormalizedSidebars(
+  const normalizedSidebars = await loadNormalizedSidebars(
     sidebarFilePath,
     normalizeSidebarsParams,
   );

package/src/sidebars/validation.ts

@@ -36,7 +36,7 @@ const sidebarItemAutogeneratedSchema =
     type: 'autogenerated',
     dirName: Joi.string()
       .required()
-      .pattern(/^[^/](.*[^/])?$/)
+      .pattern(/^[^/](?:.*[^/])?$/)
       .message(
         '"dirName" must be a dir path relative to the docs folder root, and should not start or end with slash',
       ),