@docusaurus/plugin-content-docs 4.0.0-canary-6835 → 4.0.0-canary-6840

package/lib/docs.js

@@ -19,6 +19,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const frontMatter_1 = require("./frontMatter");
 const slug_1 = tslib_1.__importDefault(require("./slug"));
 const numberPrefix_1 = require("./numberPrefix");
@@ -30,7 +31,7 @@ async function readDocFile(versionMetadata, source) {
     return { source, content, contentPath, filePath };
 }
 async function readVersionDocs(versionMetadata, options) {
-    const sources = await (0, utils_1.Globby)(options.include, {
+    const sources = await (0, glob_1.glob)(options.include, {
         cwd: versionMetadata.contentPath,
         ignore: options.exclude,
     });

package/lib/index.js

@@ -12,6 +12,7 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const mdx_loader_1 = require("@docusaurus/mdx-loader");
 const sidebars_1 = require("./sidebars");
@@ -83,7 +84,7 @@ async function pluginContentDocs(context, options) {
                 beforeDefaultRemarkPlugins,
                 staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
                 siteDir,
-                isMDXPartial: (0, utils_1.createAbsoluteFilePathMatcher)(options.exclude, contentDirs),
+                isMDXPartial: (0, glob_1.createAbsoluteFilePathMatcher)(options.exclude, contentDirs),
                 metadataPath: (mdxPath) => {
                     // Note that metadataPath must be the same/in-sync as
                     // the path from createData for each MDX.

package/lib/options.js

@@ -11,7 +11,7 @@ exports.validateOptions = validateOptions;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const generator_1 = require("./sidebars/generator");
 const numberPrefix_1 = require("./numberPrefix");
 exports.DEFAULT_OPTIONS = {
@@ -19,7 +19,7 @@ exports.DEFAULT_OPTIONS = {
     routeBasePath: 'docs', // URL Route.
     tagsBasePath: 'tags', // URL Tags Route.
     include: ['**/*.{md,mdx}'], // Extensions to include.
-    exclude: utils_1.GlobExcludeDefault,
+    exclude: glob_1.GlobExcludeDefault,
     sidebarItemsGenerator: generator_1.DefaultSidebarItemsGenerator,
     numberPrefixParser: numberPrefix_1.DefaultNumberPrefixParser,
     docsRootComponent: '@theme/DocsRoot',

package/lib/sidebars/index.js

@@ -16,6 +16,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
+const glob_1 = require("@docusaurus/glob");
 const Yaml = tslib_1.__importStar(require("js-yaml"));
 const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 const validation_1 = require("./validation");
@@ -38,7 +39,7 @@ function resolveSidebarPathOption(siteDir, sidebarPathOption) {
         : sidebarPathOption;
 }
 async function readCategoriesMetadata(contentPath) {
-    const categoryFiles = await (0, utils_1.Globby)('**/_category_.{json,yml,yaml}', {
+    const categoryFiles = await (0, glob_1.glob)('**/_category_.{json,yml,yaml}', {
         cwd: contentPath,
     });
     const categoryToFile = lodash_1.default.groupBy(categoryFiles, path_1.default.dirname);

package/lib/versions/loadVersion.js

@@ -19,7 +19,7 @@ const utils_2 = require("../sidebars/utils");
 function ensureNoDuplicateDocId(docs) {
     const duplicatesById = lodash_1.default.chain(docs)
         .sort((d1, d2) => {
-        // Need to sort because Globby order is non-deterministic
+        // Need to sort because glob order is non-deterministic
         // TODO maybe we should create a deterministic glob utils?
         //  see https://github.com/sindresorhus/globby/issues/131
         return d1.source.localeCompare(d2.source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "4.0.0-canary-6835",
+  "version": "4.0.0-canary-6840",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "sideEffects": false,
@@ -35,15 +35,16 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "4.0.0-canary-6835",
-    "@docusaurus/logger": "4.0.0-canary-6835",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6835",
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6835",
-    "@docusaurus/theme-common": "4.0.0-canary-6835",
-    "@docusaurus/types": "4.0.0-canary-6835",
-    "@docusaurus/utils": "4.0.0-canary-6835",
-    "@docusaurus/utils-common": "4.0.0-canary-6835",
-    "@docusaurus/utils-validation": "4.0.0-canary-6835",
+    "@docusaurus/core": "4.0.0-canary-6840",
+    "@docusaurus/glob": "4.0.0-canary-6840",
+    "@docusaurus/logger": "4.0.0-canary-6840",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6840",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6840",
+    "@docusaurus/theme-common": "4.0.0-canary-6840",
+    "@docusaurus/types": "4.0.0-canary-6840",
+    "@docusaurus/utils": "4.0.0-canary-6840",
+    "@docusaurus/utils-common": "4.0.0-canary-6840",
+    "@docusaurus/utils-validation": "4.0.0-canary-6840",
     "@types/react-router-config": "^5.0.11",
     "combine-promises": "^1.2.0",
     "fs-extra": "^11.4.0",
@@ -66,5 +67,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "545ee70227b7e3446e96056b3c5e7796711e42b4"
+  "gitHead": "b767143bc76b7747a9d1cc747dece7b06195a5c0"
 }

package/src/docs.ts

@@ -16,12 +16,12 @@ import {
   normalizeUrl,
   parseMarkdownFile,
   posixPath,
-  Globby,
   isUnlisted,
   isDraft,
   readLastUpdateData,
   normalizeTags,
 } from '@docusaurus/utils';
+import {glob} from '@docusaurus/glob';
 import {validateDocFrontMatter} from './frontMatter';
 import getSlug from './slug';
 import {stripPathNumberPrefixes} from './numberPrefix';
@@ -66,7 +66,7 @@ export async function readVersionDocs(
     'include' | 'exclude' | 'showLastUpdateAuthor' | 'showLastUpdateTime'
   >,
 ): Promise<DocFile[]> {
-  const sources = await Globby(options.include, {
+  const sources = await glob(options.include, {
     cwd: versionMetadata.contentPath,
     ignore: options.exclude,
   });

package/src/index.ts

@@ -14,10 +14,10 @@ import {
   getContentPathList,
   posixPath,
   addTrailingPathSeparator,
-  createAbsoluteFilePathMatcher,
   resolveMarkdownLinkPathname,
   DEFAULT_PLUGIN_ID,
 } from '@docusaurus/utils';
+import {createAbsoluteFilePathMatcher} from '@docusaurus/glob';
 import {getTagsFilePathsToWatch} from '@docusaurus/utils-validation';
 import {createMDXLoaderRule} from '@docusaurus/mdx-loader';
 import {resolveSidebarPathOption} from './sidebars';

package/src/options.ts

@@ -15,7 +15,7 @@ import {
   RouteBasePathSchema,
   URISchema,
 } from '@docusaurus/utils-validation';
-import {GlobExcludeDefault} from '@docusaurus/utils';
+import {GlobExcludeDefault} from '@docusaurus/glob';
 import {DefaultSidebarItemsGenerator} from './sidebars/generator';
 import {
   DefaultNumberPrefixParser,

package/src/sidebars/index.ts

@@ -9,7 +9,8 @@ import fs from 'fs-extra';
 import path from 'path';
 import _ from 'lodash';
 import logger from '@docusaurus/logger';
-import {loadFreshModule, Globby} from '@docusaurus/utils';
+import {loadFreshModule} from '@docusaurus/utils';
+import {glob} from '@docusaurus/glob';
 import * as Yaml from 'js-yaml';
 import combinePromises from 'combine-promises';
 import {validateSidebars, validateCategoryMetadataFile} from './validation';
@@ -41,7 +42,7 @@ export function resolveSidebarPathOption(
 }
 
 async function readCategoriesMetadata(contentPath: string) {
-  const categoryFiles = await Globby('**/_category_.{json,yml,yaml}', {
+  const categoryFiles = await glob('**/_category_.{json,yml,yaml}', {
     cwd: contentPath,
   });
   const categoryToFile = _.groupBy(categoryFiles, path.dirname);

package/src/versions/loadVersion.ts

@@ -39,7 +39,7 @@ type LoadVersionParams = {
 function ensureNoDuplicateDocId(docs: DocMetadataBase[]): void {
   const duplicatesById = _.chain(docs)
     .sort((d1, d2) => {
-      // Need to sort because Globby order is non-deterministic
+      // Need to sort because glob order is non-deterministic
       // TODO maybe we should create a deterministic glob utils?
       //  see https://github.com/sindresorhus/globby/issues/131
       return d1.source.localeCompare(d2.source);