@docusaurus/plugin-sitemap 2.0.0-beta.15d451942 → 2.0.0-beta.16

package/lib/createSitemap.d.ts

@@ -4,6 +4,6 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { PluginOptions } from './types';
-import { DocusaurusConfig } from '@docusaurus/types';
-export default function createSitemap(siteConfig: DocusaurusConfig, routesPaths: string[], options: PluginOptions): Promise<string>;
+import type { Options } from '@docusaurus/plugin-sitemap';
+import type { DocusaurusConfig } from '@docusaurus/types';
+export default function createSitemap(siteConfig: DocusaurusConfig, routesPaths: string[], options: Options): Promise<string>;

package/lib/createSitemap.js

@@ -7,25 +7,26 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const sitemap_1 = require("sitemap");
-const utils_1 = require("@docusaurus/utils");
+const utils_common_1 = require("@docusaurus/utils-common");
 async function createSitemap(siteConfig, routesPaths, options) {
     const { url: hostname } = siteConfig;
     if (!hostname) {
-        throw new Error('url in docusaurus.config.js cannot be empty/undefined');
+        throw new Error('URL in docusaurus.config.js cannot be empty/undefined.');
     }
-    const { changefreq, priority, trailingSlash } = options;
-    const sitemapStream = new sitemap_1.SitemapStream({
-        hostname,
-    });
+    const { changefreq, priority } = options;
+    const sitemapStream = new sitemap_1.SitemapStream({ hostname });
     routesPaths
         .filter((route) => !route.endsWith('404.html'))
-        .map((routePath) => sitemapStream.write({
-        url: trailingSlash ? utils_1.addTrailingSlash(routePath) : routePath,
+        .forEach((routePath) => sitemapStream.write({
+        url: (0, utils_common_1.applyTrailingSlash)(routePath, {
+            trailingSlash: siteConfig.trailingSlash,
+            baseUrl: siteConfig.baseUrl,
+        }),
         changefreq,
         priority,
     }));
     sitemapStream.end();
-    const generatedSitemap = await sitemap_1.streamToPromise(sitemapStream).then((sm) => sm.toString());
+    const generatedSitemap = (await (0, sitemap_1.streamToPromise)(sitemapStream)).toString();
     return generatedSitemap;
 }
 exports.default = createSitemap;

package/lib/index.d.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { PluginOptions } from './types';
-import { LoadContext, OptionValidationContext, ValidationResult, Plugin } from '@docusaurus/types';
-export default function pluginSitemap(_context: LoadContext, options: PluginOptions): Plugin<void>;
-export declare function validateOptions({ validate, options, }: OptionValidationContext<PluginOptions>): ValidationResult<PluginOptions>;
+import type { Options } from '@docusaurus/plugin-sitemap';
+import type { LoadContext, OptionValidationContext, ValidationResult, Plugin } from '@docusaurus/types';
+export default function pluginSitemap(_context: LoadContext, options: Options): Plugin<void>;
+export declare function validateOptions({ validate, options, }: OptionValidationContext<Options>): ValidationResult<Options>;

package/lib/index.js

@@ -8,23 +8,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const createSitemap_1 = tslib_1.__importDefault(require("./createSitemap"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const createSitemap_1 = (0, tslib_1.__importDefault)(require("./createSitemap"));
 const pluginOptionSchema_1 = require("./pluginOptionSchema");
 function pluginSitemap(_context, options) {
     return {
         name: 'docusaurus-plugin-sitemap',
         async postBuild({ siteConfig, routesPaths, outDir }) {
+            if (siteConfig.noIndex) {
+                return;
+            }
             // Generate sitemap.
-            const generatedSitemap = await createSitemap_1.default(siteConfig, routesPaths, options);
+            const generatedSitemap = await (0, createSitemap_1.default)(siteConfig, routesPaths, options);
             // Write sitemap file.
             const sitemapPath = path_1.default.join(outDir, 'sitemap.xml');
             try {
                 await fs_extra_1.default.outputFile(sitemapPath, generatedSitemap);
             }
             catch (err) {
-                throw new Error(`Sitemap error: ${err}`);
+                throw new Error(`Writing sitemap failed: ${err}`);
             }
         },
     };

package/lib/pluginOptionSchema.d.ts

@@ -5,6 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Joi } from '@docusaurus/utils-validation';
-import { PluginOptions } from './types';
-export declare const DEFAULT_OPTIONS: Required<PluginOptions>;
+import type { Options } from '@docusaurus/plugin-sitemap';
+export declare const DEFAULT_OPTIONS: Required<Options>;
 export declare const PluginOptionSchema: Joi.ObjectSchema<any>;

package/lib/pluginOptionSchema.js

@@ -12,7 +12,6 @@ const sitemap_1 = require("sitemap");
 exports.DEFAULT_OPTIONS = {
     changefreq: sitemap_1.EnumChangefreq.WEEKLY,
     priority: 0.5,
-    trailingSlash: false,
 };
 exports.PluginOptionSchema = utils_validation_1.Joi.object({
     // TODO temporary (@alpha-71)
@@ -23,5 +22,7 @@ exports.PluginOptionSchema = utils_validation_1.Joi.object({
         .valid(...Object.values(sitemap_1.EnumChangefreq))
         .default(exports.DEFAULT_OPTIONS.changefreq),
     priority: utils_validation_1.Joi.number().min(0).max(1).default(exports.DEFAULT_OPTIONS.priority),
-    trailingSlash: utils_validation_1.Joi.bool().default(false),
+    trailingSlash: utils_validation_1.Joi.forbidden().messages({
+        'any.unknown': 'Please use the new Docusaurus global trailingSlash config instead, and the sitemaps plugin will use it.',
+    }),
 });

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@docusaurus/plugin-sitemap",
-  "version": "2.0.0-beta.15d451942",
+  "version": "2.0.0-beta.16",
   "description": "Simple sitemap generation plugin for Docusaurus.",
   "main": "lib/index.js",
+  "types": "src/plugin-sitemap.d.ts",
   "scripts": {
     "build": "tsc",
     "watch": "tsc --watch"
@@ -17,20 +18,23 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.15d451942",
-    "@docusaurus/types": "2.0.0-beta.15d451942",
-    "@docusaurus/utils": "2.0.0-beta.15d451942",
-    "@docusaurus/utils-validation": "2.0.0-beta.15d451942",
-    "fs-extra": "^10.0.0",
-    "sitemap": "^7.0.0",
-    "tslib": "^2.2.0"
+    "@docusaurus/core": "2.0.0-beta.16",
+    "@docusaurus/utils": "2.0.0-beta.16",
+    "@docusaurus/utils-common": "2.0.0-beta.16",
+    "@docusaurus/utils-validation": "2.0.0-beta.16",
+    "fs-extra": "^10.0.1",
+    "sitemap": "^7.1.1",
+    "tslib": "^2.3.1"
+  },
+  "devDependencies": {
+    "@docusaurus/types": "2.0.0-beta.16"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14"
   },
-  "gitHead": "dfceae8bd3e8b42ba8fc14f1449d861046c26143"
+  "gitHead": "eb43c4d4f95a4fb97dc9bb9dc615413e0dc2e1e7"
 }

package/src/createSitemap.ts

@@ -6,30 +6,31 @@
  */
 
 import {SitemapStream, streamToPromise} from 'sitemap';
-import {PluginOptions} from './types';
-import {DocusaurusConfig} from '@docusaurus/types';
-import {addTrailingSlash} from '@docusaurus/utils';
+import type {Options} from '@docusaurus/plugin-sitemap';
+import type {DocusaurusConfig} from '@docusaurus/types';
+import {applyTrailingSlash} from '@docusaurus/utils-common';
 
 export default async function createSitemap(
   siteConfig: DocusaurusConfig,
   routesPaths: string[],
-  options: PluginOptions,
+  options: Options,
 ): Promise<string> {
   const {url: hostname} = siteConfig;
   if (!hostname) {
-    throw new Error('url in docusaurus.config.js cannot be empty/undefined');
+    throw new Error('URL in docusaurus.config.js cannot be empty/undefined.');
   }
-  const {changefreq, priority, trailingSlash} = options;
+  const {changefreq, priority} = options;
 
-  const sitemapStream = new SitemapStream({
-    hostname,
-  });
+  const sitemapStream = new SitemapStream({hostname});
 
   routesPaths
     .filter((route) => !route.endsWith('404.html'))
-    .map((routePath) =>
+    .forEach((routePath) =>
       sitemapStream.write({
-        url: trailingSlash ? addTrailingSlash(routePath) : routePath,
+        url: applyTrailingSlash(routePath, {
+          trailingSlash: siteConfig.trailingSlash,
+          baseUrl: siteConfig.baseUrl,
+        }),
         changefreq,
         priority,
       }),
@@ -37,9 +38,7 @@ export default async function createSitemap(
 
   sitemapStream.end();
 
-  const generatedSitemap = await streamToPromise(sitemapStream).then((sm) =>
-    sm.toString(),
-  );
+  const generatedSitemap = (await streamToPromise(sitemapStream)).toString();
 
   return generatedSitemap;
 }

package/src/index.ts

@@ -7,9 +7,9 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import {PluginOptions} from './types';
+import type {Options} from '@docusaurus/plugin-sitemap';
 import createSitemap from './createSitemap';
-import {
+import type {
   LoadContext,
   Props,
   OptionValidationContext,
@@ -20,12 +20,15 @@ import {PluginOptionSchema} from './pluginOptionSchema';
 
 export default function pluginSitemap(
   _context: LoadContext,
-  options: PluginOptions,
+  options: Options,
 ): Plugin<void> {
   return {
     name: 'docusaurus-plugin-sitemap',
 
     async postBuild({siteConfig, routesPaths, outDir}: Props) {
+      if (siteConfig.noIndex) {
+        return;
+      }
       // Generate sitemap.
       const generatedSitemap = await createSitemap(
         siteConfig,
@@ -38,7 +41,7 @@ export default function pluginSitemap(
       try {
         await fs.outputFile(sitemapPath, generatedSitemap);
       } catch (err) {
-        throw new Error(`Sitemap error: ${err}`);
+        throw new Error(`Writing sitemap failed: ${err}`);
       }
     },
   };
@@ -47,7 +50,7 @@ export default function pluginSitemap(
 export function validateOptions({
   validate,
   options,
-}: OptionValidationContext<PluginOptions>): ValidationResult<PluginOptions> {
+}: OptionValidationContext<Options>): ValidationResult<Options> {
   const validatedOptions = validate(PluginOptionSchema, options);
   return validatedOptions;
 }

package/src/{types.ts → plugin-sitemap.d.ts}

@@ -5,10 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {EnumChangefreq} from 'sitemap';
+import type {EnumChangefreq} from 'sitemap';
 
-export interface PluginOptions {
+export type Options = {
   changefreq?: EnumChangefreq;
   priority?: number;
-  trailingSlash?: boolean;
-}
+};

package/src/pluginOptionSchema.ts

@@ -7,12 +7,11 @@
 
 import {Joi} from '@docusaurus/utils-validation';
 import {EnumChangefreq} from 'sitemap';
-import {PluginOptions} from './types';
+import type {Options} from '@docusaurus/plugin-sitemap';
 
-export const DEFAULT_OPTIONS: Required<PluginOptions> = {
+export const DEFAULT_OPTIONS: Required<Options> = {
   changefreq: EnumChangefreq.WEEKLY,
   priority: 0.5,
-  trailingSlash: false,
 };
 
 export const PluginOptionSchema = Joi.object({
@@ -25,5 +24,8 @@ export const PluginOptionSchema = Joi.object({
     .valid(...Object.values(EnumChangefreq))
     .default(DEFAULT_OPTIONS.changefreq),
   priority: Joi.number().min(0).max(1).default(DEFAULT_OPTIONS.priority),
-  trailingSlash: Joi.bool().default(false),
+  trailingSlash: Joi.forbidden().messages({
+    'any.unknown':
+      'Please use the new Docusaurus global trailingSlash config instead, and the sitemaps plugin will use it.',
+  }),
 });