@docusaurus/plugin-content-blog 4.0.0-canary-6870 → 4.0.0-canary-6872

package/lib/blogUtils.js

@@ -18,7 +18,7 @@ exports.generateBlogPosts = generateBlogPosts;
 exports.applyProcessBlogPosts = applyProcessBlogPosts;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
@@ -166,7 +166,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
     const { routeBasePath, tagsBasePath: tagsRouteBasePath, truncateMarker, showReadingTime, editUrl, } = options;
     // Lookup in localized folder in priority
     const blogDirPath = await (0, utils_1.getFolderContainingFile)((0, utils_1.getContentPathList)(contentPaths), blogSourceRelative);
-    const blogSourceAbsolute = path_1.default.join(blogDirPath, blogSourceRelative);
+    const blogSourceAbsolute = node_path_1.default.join(blogDirPath, blogSourceRelative);
     const { frontMatter, content, contentTitle, excerpt } = await parseBlogPostMarkdownFile({
         filePath: blogSourceAbsolute,
         parseFrontMatter,
@@ -193,10 +193,10 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
     const slug = frontMatter.slug ?? parsedBlogFileName.slug;
     const permalink = (0, utils_1.normalizeUrl)([baseUrl, routeBasePath, slug]);
     function getBlogEditUrl() {
-        const blogPathRelative = path_1.default.relative(blogDirPath, path_1.default.resolve(blogSourceAbsolute));
+        const blogPathRelative = node_path_1.default.relative(blogDirPath, node_path_1.default.resolve(blogSourceAbsolute));
         if (typeof editUrl === 'function') {
             return editUrl({
-                blogDirPath: (0, utils_1.posixPath)(path_1.default.relative(siteDir, blogDirPath)),
+                blogDirPath: (0, utils_1.posixPath)(node_path_1.default.relative(siteDir, blogDirPath)),
                 blogPath: (0, utils_1.posixPath)(blogPathRelative),
                 permalink,
                 locale: i18n.currentLocale,
@@ -211,7 +211,7 @@ async function processBlogSourceFile(blogSourceRelative, contentPaths, context,
                 : contentPaths.contentPath;
             const contentPathEditUrl = (0, utils_1.normalizeUrl)([
                 editUrl,
-                (0, utils_1.posixPath)(path_1.default.relative(siteDir, fileContentPath)),
+                (0, utils_1.posixPath)(node_path_1.default.relative(siteDir, fileContentPath)),
             ]);
             return (0, utils_1.getEditUrl)(blogPathRelative, contentPathEditUrl);
         }

package/lib/feed.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBlogFeedFiles = createBlogFeedFiles;
 exports.createFeedHtmlHeadTags = createFeedHtmlHeadTags;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const feed_1 = require("feed");
 const srcset_1 = require("srcset");
@@ -107,18 +107,18 @@ async function defaultCreateFeedItems({ blogPosts, siteConfig, outDir, }) {
     }));
 }
 async function resolveXsltFilePaths({ xsltFilePath, contentPaths, }) {
-    const xsltAbsolutePath = path_1.default.isAbsolute(xsltFilePath)
+    const xsltAbsolutePath = node_path_1.default.isAbsolute(xsltFilePath)
         ? xsltFilePath
         : ((await (0, utils_1.getDataFilePath)({ filePath: xsltFilePath, contentPaths })) ??
-            path_1.default.resolve(contentPaths.contentPath, xsltFilePath));
+            node_path_1.default.resolve(contentPaths.contentPath, xsltFilePath));
     if (!(await fs_extra_1.default.pathExists(xsltAbsolutePath))) {
-        throw new Error(logger_1.default.interpolate `Blog feed XSLT file not found at path=${path_1.default.relative(process.cwd(), xsltAbsolutePath)}`);
+        throw new Error(logger_1.default.interpolate `Blog feed XSLT file not found at path=${node_path_1.default.relative(process.cwd(), xsltAbsolutePath)}`);
     }
-    const parsedPath = path_1.default.parse(xsltAbsolutePath);
-    const cssAbsolutePath = path_1.default.resolve(parsedPath.dir, `${parsedPath.name}.css`);
+    const parsedPath = node_path_1.default.parse(xsltAbsolutePath);
+    const cssAbsolutePath = node_path_1.default.resolve(parsedPath.dir, `${parsedPath.name}.css`);
     if (!(await fs_extra_1.default.pathExists(cssAbsolutePath))) {
-        throw new Error(logger_1.default.interpolate `Blog feed XSLT file was found at path=${path_1.default.relative(process.cwd(), xsltAbsolutePath)}
-But its expected co-located CSS file could not be found at path=${path_1.default.relative(process.cwd(), cssAbsolutePath)}
+        throw new Error(logger_1.default.interpolate `Blog feed XSLT file was found at path=${node_path_1.default.relative(process.cwd(), xsltAbsolutePath)}
+But its expected co-located CSS file could not be found at path=${node_path_1.default.relative(process.cwd(), cssAbsolutePath)}
 If you want to provide a custom XSLT file, you must provide a CSS file with the exact same name.`);
     }
     return { xsltAbsolutePath, cssAbsolutePath };
@@ -128,8 +128,8 @@ async function generateXsltFiles({ xsltFilePath, generatePath, contentPaths, })
         xsltFilePath,
         contentPaths,
     });
-    const xsltOutputPath = path_1.default.join(generatePath, path_1.default.basename(xsltAbsolutePath));
-    const cssOutputPath = path_1.default.join(generatePath, path_1.default.basename(cssAbsolutePath));
+    const xsltOutputPath = node_path_1.default.join(generatePath, node_path_1.default.basename(xsltAbsolutePath));
+    const cssOutputPath = node_path_1.default.join(generatePath, node_path_1.default.basename(cssAbsolutePath));
     await fs_extra_1.default.copy(xsltAbsolutePath, xsltOutputPath);
     await fs_extra_1.default.copy(cssAbsolutePath, cssOutputPath);
 }
@@ -137,7 +137,7 @@ async function generateXsltFiles({ xsltFilePath, generatePath, contentPaths, })
 // Good enough for now: we probably don't need a full XML parser just for that
 // See also https://darekkay.com/blog/rss-styling/
 function injectXslt({ feedContent, xsltFilePath, }) {
-    return feedContent.replace('<?xml version="1.0" encoding="utf-8"?>', `<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="${path_1.default.basename(xsltFilePath)}"?>`);
+    return feedContent.replace('<?xml version="1.0" encoding="utf-8"?>', `<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xsl" href="${node_path_1.default.basename(xsltFilePath)}"?>`);
 }
 const FeedConfigs = {
     rss: {
@@ -165,7 +165,7 @@ async function createBlogFeedFile({ feed, feedType, generatePath, feedOptions, c
             await generateXsltFiles({ xsltFilePath, contentPaths, generatePath });
             feedContent = injectXslt({ feedContent, xsltFilePath });
         }
-        const outputPath = path_1.default.join(generatePath, feedConfig.outputFileName);
+        const outputPath = node_path_1.default.join(generatePath, feedConfig.outputFileName);
         await fs_extra_1.default.outputFile(outputPath, feedContent);
     }
     catch (err) {
@@ -195,7 +195,7 @@ async function createBlogFeedFiles({ blogPosts: allBlogPosts, options, siteConfi
     await Promise.all(feedTypes.map((feedType) => createBlogFeedFile({
         feed,
         feedType,
-        generatePath: path_1.default.join(outDir, options.routeBasePath),
+        generatePath: node_path_1.default.join(outDir, options.routeBasePath),
         feedOptions: options.feedOptions,
         contentPaths,
     })));

package/lib/index.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
 exports.default = pluginContentBlog;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 const utils_1 = require("@docusaurus/utils");
@@ -34,7 +34,7 @@ async function pluginContentBlog(context, options) {
     const { baseUrl } = siteConfig;
     const shouldTranslate = (0, utils_1.getLocaleConfig)(context.i18n).translate;
     const contentPaths = {
-        contentPath: path_1.default.resolve(siteDir, options.path),
+        contentPath: node_path_1.default.resolve(siteDir, options.path),
         contentPathLocalized: shouldTranslate
             ? (0, utils_1.getPluginI18nPath)({
                 localizationDir,
@@ -44,12 +44,12 @@ async function pluginContentBlog(context, options) {
             : undefined,
     };
     const pluginId = options.id;
-    const pluginDataDirRoot = path_1.default.join(generatedFilesDir, PluginName);
-    const dataDir = path_1.default.join(pluginDataDirRoot, pluginId);
+    const pluginDataDirRoot = node_path_1.default.join(generatedFilesDir, PluginName);
+    const dataDir = node_path_1.default.join(pluginDataDirRoot, pluginId);
     // TODO Docusaurus v4 breaking change
     //  module aliasing should be automatic
     //  we should never find local absolute FS paths in the codegen registry
-    const aliasedSource = (source) => `~blog/${(0, utils_1.posixPath)(path_1.default.relative(pluginDataDirRoot, source))}`;
+    const aliasedSource = (source) => `~blog/${(0, utils_1.posixPath)(node_path_1.default.relative(pluginDataDirRoot, source))}`;
     const authorsMapFilePath = await (0, utils_1.getDataFilePath)({
         filePath: options.authorsMapPath,
         contentPaths,
@@ -69,14 +69,14 @@ async function pluginContentBlog(context, options) {
                 ...beforeDefaultRemarkPlugins,
             ],
             beforeDefaultRehypePlugins,
-            staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
+            staticDirs: siteConfig.staticDirectories.map((dir) => node_path_1.default.resolve(siteDir, dir)),
             siteDir,
             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.
                 const aliasedPath = (0, utils_1.aliasedSitePath)(mdxPath, siteDir);
-                return path_1.default.join(dataDir, `${(0, utils_1.docuHash)(aliasedPath)}.json`);
+                return node_path_1.default.join(dataDir, `${(0, utils_1.docuHash)(aliasedPath)}.json`);
             },
             // For blog posts a title in markdown is always removed
             // Blog posts title are rendered separately
@@ -107,7 +107,7 @@ async function pluginContentBlog(context, options) {
                 truncateMarker,
             };
             return {
-                loader: path_1.default.resolve(__dirname, './markdownLoader.js'),
+                loader: node_path_1.default.resolve(__dirname, './markdownLoader.js'),
                 options: markdownLoaderOptions,
             };
         }

package/lib/options.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XSLTBuiltInPaths = exports.DEFAULT_OPTIONS = void 0;
 exports.validateOptions = validateOptions;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const utils_1 = require("@docusaurus/utils");
 const glob_1 = require("@docusaurus/glob");
@@ -65,8 +65,8 @@ exports.DEFAULT_OPTIONS = {
     onUntruncatedBlogPosts: 'warn',
 };
 exports.XSLTBuiltInPaths = {
-    rss: path_1.default.resolve(__dirname, '..', 'assets', 'rss.xsl'),
-    atom: path_1.default.resolve(__dirname, '..', 'assets', 'atom.xsl'),
+    rss: node_path_1.default.resolve(__dirname, '..', 'assets', 'rss.xsl'),
+    atom: node_path_1.default.resolve(__dirname, '..', 'assets', 'atom.xsl'),
 };
 function normalizeXsltOption(option, type) {
     if (typeof option === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "4.0.0-canary-6870",
+  "version": "4.0.0-canary-6872",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -31,16 +31,16 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "4.0.0-canary-6870",
-    "@docusaurus/glob": "4.0.0-canary-6870",
-    "@docusaurus/logger": "4.0.0-canary-6870",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6870",
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6870",
-    "@docusaurus/theme-common": "4.0.0-canary-6870",
-    "@docusaurus/types": "4.0.0-canary-6870",
-    "@docusaurus/utils": "4.0.0-canary-6870",
-    "@docusaurus/utils-common": "4.0.0-canary-6870",
-    "@docusaurus/utils-validation": "4.0.0-canary-6870",
+    "@docusaurus/core": "4.0.0-canary-6872",
+    "@docusaurus/glob": "4.0.0-canary-6872",
+    "@docusaurus/logger": "4.0.0-canary-6872",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6872",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6872",
+    "@docusaurus/theme-common": "4.0.0-canary-6872",
+    "@docusaurus/types": "4.0.0-canary-6872",
+    "@docusaurus/utils": "4.0.0-canary-6872",
+    "@docusaurus/utils-common": "4.0.0-canary-6872",
+    "@docusaurus/utils-validation": "4.0.0-canary-6872",
     "cheerio": "^1.2.0",
     "combine-promises": "^1.2.0",
     "feed": "^5.2.1",
@@ -69,5 +69,5 @@
     "tree-node-cli": "^3.0.0",
     "unified": "^11.0.5"
   },
-  "gitHead": "ea3b6292c97af2e26f559f112cf9ea75a58a09c8"
+  "gitHead": "97ddb0451f086d8a1c20967f0d324d667dc58ebf"
 }

package/src/blogUtils.ts

@@ -6,7 +6,7 @@
  */
 
 import fs from 'fs-extra';
-import path from 'path';
+import path from 'node:path';
 import _ from 'lodash';
 import logger from '@docusaurus/logger';
 import {

package/src/feed.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
+import path from 'node:path';
 import fs from 'fs-extra';
 import {Feed, type Author as FeedAuthor} from 'feed';
 import {parseSrcset, stringifySrcset} from 'srcset';

package/src/index.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
+import path from 'node:path';
 import logger from '@docusaurus/logger';
 import combinePromises from 'combine-promises';
 

package/src/options.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import path from 'path';
+import path from 'node:path';
 import {
   Joi,
   RemarkPluginsSchema,