@docusaurus/plugin-content-docs 2.0.0-beta.8e9b829d9 → 2.0.0-beta.9

package/lib/versions.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDocsDirPaths = exports.readVersionsMetadata = exports.getVersionsFilePath = exports.getVersionedSidebarsDirPath = exports.getVersionedDocsDirPath = void 0;
 const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const constants_1 = require("./constants");
 const constants_2 = require("@docusaurus/core/lib/constants");
 const utils_1 = require("@docusaurus/utils");
@@ -83,7 +83,7 @@ function readVersionNames(siteDir, options) {
     return versions;
 }
 function getDocsDirPathLocalized({ siteDir, locale, pluginId, versionName, }) {
-    return utils_1.getPluginI18nPath({
+    return (0, utils_1.getPluginI18nPath)({
         siteDir,
         locale,
         pluginName: 'docusaurus-plugin-content-docs',
@@ -108,7 +108,7 @@ function getVersionMetadataPaths({ versionName, context, options, }) {
     });
     function getSidebarFilePath() {
         if (isCurrentVersion) {
-            return sidebars_1.resolveSidebarPathOption(context.siteDir, options.sidebarPath);
+            return (0, sidebars_1.resolveSidebarPathOption)(context.siteDir, options.sidebarPath);
         }
         else {
             return path_1.default.join(getVersionedSidebarsDirPath(context.siteDir, options.id), `version-${versionName}-sidebars.json`);
@@ -138,10 +138,10 @@ function getVersionEditUrls({ contentPath, contentPathLocalized, context: { site
             pluginId: id,
         })
         : contentPathLocalized;
-    const versionPathSegment = utils_1.posixPath(path_1.default.relative(siteDir, path_1.default.resolve(siteDir, editDirPath)));
-    const versionPathSegmentLocalized = utils_1.posixPath(path_1.default.relative(siteDir, path_1.default.resolve(siteDir, editDirPathLocalized)));
-    const versionEditUrl = utils_1.normalizeUrl([editUrl, versionPathSegment]);
-    const versionEditUrlLocalized = utils_1.normalizeUrl([
+    const versionPathSegment = (0, utils_1.posixPath)(path_1.default.relative(siteDir, path_1.default.resolve(siteDir, editDirPath)));
+    const versionPathSegmentLocalized = (0, utils_1.posixPath)(path_1.default.relative(siteDir, path_1.default.resolve(siteDir, editDirPathLocalized)));
+    const versionEditUrl = (0, utils_1.normalizeUrl)([editUrl, versionPathSegment]);
+    const versionEditUrlLocalized = (0, utils_1.normalizeUrl)([
         editUrl,
         versionPathSegmentLocalized,
     ]);
@@ -153,7 +153,7 @@ function getVersionEditUrls({ contentPath, contentPathLocalized, context: { site
 function getDefaultVersionBanner({ versionName, versionNames, lastVersionName, }) {
     // Current version: good, no banner
     if (versionName === lastVersionName) {
-        return 'none';
+        return null;
     }
     // Upcoming versions: unreleased banner
     else if (versionNames.indexOf(versionName) < versionNames.indexOf(lastVersionName)) {
@@ -166,20 +166,34 @@ function getDefaultVersionBanner({ versionName, versionNames, lastVersionName, }
 }
 function getVersionBanner({ versionName, versionNames, lastVersionName, options, }) {
     var _a;
-    const versionOptionBanner = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.banner;
-    return (versionOptionBanner !== null && versionOptionBanner !== void 0 ? versionOptionBanner : getDefaultVersionBanner({
+    const versionBannerOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.banner;
+    if (versionBannerOption) {
+        return versionBannerOption === 'none' ? null : versionBannerOption;
+    }
+    return getDefaultVersionBanner({
         versionName,
         versionNames,
         lastVersionName,
-    }));
+    });
+}
+function getVersionBadge({ versionName, versionNames, options, }) {
+    var _a;
+    const versionBadgeOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.badge;
+    // If site is not versioned or only one version is included
+    // we don't show the version badge by default
+    // See https://github.com/facebook/docusaurus/issues/3362
+    const versionBadgeDefault = versionNames.length !== 1;
+    return versionBadgeOption !== null && versionBadgeOption !== void 0 ? versionBadgeOption : versionBadgeDefault;
+}
+function getVersionClassName({ versionName, options, }) {
+    var _a;
+    const versionClassNameOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.className;
+    const versionClassNameDefault = `docs-version-${versionName}`;
+    return versionClassNameOption !== null && versionClassNameOption !== void 0 ? versionClassNameOption : versionClassNameDefault;
 }
 function createVersionMetadata({ versionName, versionNames, lastVersionName, context, options, }) {
     var _a, _b, _c;
-    const { sidebarFilePath, contentPath, contentPathLocalized, } = getVersionMetadataPaths({
-        versionName,
-        context,
-        options,
-    });
+    const { sidebarFilePath, contentPath, contentPathLocalized } = getVersionMetadataPaths({ versionName, context, options });
     const isLast = versionName === lastVersionName;
     // retro-compatible values
     const defaultVersionLabel = versionName === constants_1.CURRENT_VERSION_NAME ? 'Next' : versionName;
@@ -193,7 +207,7 @@ function createVersionMetadata({ versionName, versionNames, lastVersionName, con
     const versionOptions = (_a = options.versions[versionName]) !== null && _a !== void 0 ? _a : {};
     const versionLabel = (_b = versionOptions.label) !== null && _b !== void 0 ? _b : defaultVersionLabel;
     const versionPathPart = (_c = versionOptions.path) !== null && _c !== void 0 ? _c : defaultVersionPathPart;
-    const versionPath = utils_1.normalizeUrl([
+    const versionPath = (0, utils_1.normalizeUrl)([
         context.baseUrl,
         options.routeBasePath,
         versionPathPart,
@@ -206,10 +220,14 @@ function createVersionMetadata({ versionName, versionNames, lastVersionName, con
     });
     // Because /docs/:route` should always be after `/docs/versionName/:route`.
     const routePriority = versionPathPart === '' ? -1 : undefined;
+    // the path that will be used to refer the docs tags
+    // example below will be using /docs/tags
+    const tagsPath = (0, utils_1.normalizeUrl)([versionPath, options.tagsBasePath]);
     return {
         versionName,
         versionLabel,
         versionPath,
+        tagsPath,
         versionEditUrl: versionEditUrls === null || versionEditUrls === void 0 ? void 0 : versionEditUrls.versionEditUrl,
         versionEditUrlLocalized: versionEditUrls === null || versionEditUrls === void 0 ? void 0 : versionEditUrls.versionEditUrlLocalized,
         versionBanner: getVersionBanner({
@@ -218,6 +236,8 @@ function createVersionMetadata({ versionName, versionNames, lastVersionName, con
             lastVersionName,
             options,
         }),
+        versionBadge: getVersionBadge({ versionName, versionNames, options }),
+        versionClassName: getVersionClassName({ versionName, options }),
         isLast,
         routePriority,
         sidebarFilePath,
@@ -263,7 +283,7 @@ function checkVersionsOptions(availableVersionNames, options) {
         !availableVersionNames.includes(options.lastVersion)) {
         throw new Error(`Docs option lastVersion=${options.lastVersion} is invalid. ${availableVersionNamesMsg}`);
     }
-    const unknownVersionConfigNames = lodash_1.difference(Object.keys(options.versions), availableVersionNames);
+    const unknownVersionConfigNames = (0, lodash_1.difference)(Object.keys(options.versions), availableVersionNames);
     if (unknownVersionConfigNames.length > 0) {
         throw new Error(`Invalid docs option "versions": unknown versions (${unknownVersionConfigNames.join(',')}) found. ${availableVersionNamesMsg}`);
     }
@@ -271,7 +291,7 @@ function checkVersionsOptions(availableVersionNames, options) {
         if (options.onlyIncludeVersions.length === 0) {
             throw new Error(`Invalid docs option "onlyIncludeVersions": an empty array is not allowed, at least one version is needed.`);
         }
-        const unknownOnlyIncludeVersionNames = lodash_1.difference(options.onlyIncludeVersions, availableVersionNames);
+        const unknownOnlyIncludeVersionNames = (0, lodash_1.difference)(options.onlyIncludeVersions, availableVersionNames);
         if (unknownOnlyIncludeVersionNames.length > 0) {
             throw new Error(`Invalid docs option "onlyIncludeVersions": unknown versions (${unknownOnlyIncludeVersionNames.join(',')}) found. ${availableVersionNamesMsg}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "2.0.0-beta.8e9b829d9",
+  "version": "2.0.0-beta.9",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-docs.d.ts",
@@ -18,19 +18,20 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.8e9b829d9",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.9",
     "@types/js-yaml": "^4.0.0",
     "@types/picomatch": "^2.2.1",
     "commander": "^5.1.0",
-    "picomatch": "^2.1.1"
+    "picomatch": "^2.1.1",
+    "utility-types": "^3.10.0"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.8e9b829d9",
-    "@docusaurus/mdx-loader": "2.0.0-beta.8e9b829d9",
-    "@docusaurus/types": "2.0.0-beta.8e9b829d9",
-    "@docusaurus/utils": "2.0.0-beta.8e9b829d9",
-    "@docusaurus/utils-validation": "2.0.0-beta.8e9b829d9",
-    "chalk": "^4.1.1",
+    "@docusaurus/core": "2.0.0-beta.9",
+    "@docusaurus/mdx-loader": "2.0.0-beta.9",
+    "@docusaurus/types": "2.0.0-beta.9",
+    "@docusaurus/utils": "2.0.0-beta.9",
+    "@docusaurus/utils-validation": "2.0.0-beta.9",
+    "chalk": "^4.1.2",
     "combine-promises": "^1.1.0",
     "escape-string-regexp": "^4.0.0",
     "execa": "^5.0.0",
@@ -38,20 +39,20 @@
     "globby": "^11.0.2",
     "import-fresh": "^3.2.2",
     "js-yaml": "^4.0.0",
-    "loader-utils": "^1.2.3",
+    "loader-utils": "^2.0.0",
     "lodash": "^4.17.20",
     "remark-admonitions": "^1.2.1",
     "shelljs": "^0.8.4",
-    "tslib": "^2.2.0",
+    "tslib": "^2.3.1",
     "utility-types": "^3.10.0",
-    "webpack": "^5.40.0"
+    "webpack": "^5.61.0"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14"
   },
-  "gitHead": "cb79fda03ac12835068842a7e0a86f610974eae2"
+  "gitHead": "8a491fc29ad002f90e97f5b5fe4178ac8fa0c4d7"
 }

package/src/__tests__/__fixtures__/simple-site/docs/foo/baz.md

@@ -3,6 +3,11 @@ id: baz
 title: baz
 slug: bazSlug.html
 pagination_label: baz pagination_label
+tags:
+  - tag 1
+  - tag-1
+  - label: tag 2
+    permalink: tag2-custom-permalink
 ---
 
 # Baz markdown title

package/src/__tests__/__fixtures__/simple-site/docs/hello.md

@@ -2,6 +2,7 @@
 id: hello
 title: Hello, World !
 sidebar_label: Hello sidebar_label
+tags: [tag-1, tag 3]
 ---
 
 Hi, Endilie here :)

package/src/__tests__/__fixtures__/simple-site/docs/rootAbsoluteSlug.md

@@ -1,5 +1,7 @@
 ---
 slug: /rootAbsoluteSlug
+pagination_next: headingAsTitle
+pagination_prev: foo/baz
 ---
 
 Lorem

package/src/__tests__/__fixtures__/simple-site/docs/rootRelativeSlug.md

@@ -1,5 +1,7 @@
 ---
 slug: rootRelativeSlug
+pagination_next: headingAsTitle
+pagination_prev: foo/baz
 ---
 
 Lorem

package/src/__tests__/__fixtures__/simple-site/docs/rootResolvedSlug.md

@@ -1,5 +1,7 @@
 ---
 slug: ./hey/ho/../rootResolvedSlug
+pagination_next: headingAsTitle
+pagination_prev: foo/baz
 ---
 
 Lorem

package/src/__tests__/__fixtures__/simple-site/docs/rootTryToEscapeSlug.md

@@ -1,5 +1,7 @@
 ---
 slug: ../../../../../../../../rootTryToEscapeSlug
+pagination_next: headingAsTitle
+pagination_prev: foo/baz
 ---
 
 Lorem

package/src/__tests__/__fixtures__/simple-site/sidebars.json

@@ -4,7 +4,21 @@
       {
         "type": "category",
         "label": "foo",
-        "items": ["foo/bar", "foo/baz"] 
+        "items": ["foo/bar", "foo/baz"]
+      },
+      {
+        "type": "category",
+        "label": "Slugs",
+        "items": [
+          "rootAbsoluteSlug",
+          "rootRelativeSlug",
+          "rootResolvedSlug",
+          "rootTryToEscapeSlug"
+        ]
+      },
+      {
+        "type": "doc",
+        "id": "headingAsTitle"
       },
       {
         "type": "link",

package/src/__tests__/__fixtures__/versioned-site/docs/foo/bar.md

@@ -1,4 +1,10 @@
 ---
 slug: barSlug
+tags:
+  - barTag 1
+  - barTag-2
+  - label: barTag 3
+    permalink: barTag-3-permalink
 ---
+
 This is `next` version of bar.

package/src/__tests__/__snapshots__/cli.test.ts.snap

@@ -23,6 +23,34 @@ Object {
           "label": "foo",
           "type": "category",
         },
+        Object {
+          "collapsed": true,
+          "collapsible": true,
+          "items": Array [
+            Object {
+              "id": "version-1.0.0/rootAbsoluteSlug",
+              "type": "doc",
+            },
+            Object {
+              "id": "version-1.0.0/rootRelativeSlug",
+              "type": "doc",
+            },
+            Object {
+              "id": "version-1.0.0/rootResolvedSlug",
+              "type": "doc",
+            },
+            Object {
+              "id": "version-1.0.0/rootTryToEscapeSlug",
+              "type": "doc",
+            },
+          ],
+          "label": "Slugs",
+          "type": "category",
+        },
+        Object {
+          "id": "version-1.0.0/headingAsTitle",
+          "type": "doc",
+        },
         Object {
           "href": "https://github.com",
           "label": "Github",

package/src/__tests__/__snapshots__/docs.test.ts.snap

@@ -0,0 +1,140 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`simple site custom pagination 1`] = `
+Array [
+  Array [
+    Object {
+      "permalink": "/docs/rootTryToEscapeSlug",
+      "title": "rootTryToEscapeSlug",
+    },
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bar",
+      "title": "Bar",
+    },
+    Object {
+      "permalink": "/docs/absoluteSlug",
+      "title": "absoluteSlug",
+    },
+  ],
+  Array [
+    undefined,
+    Object {
+      "permalink": "/docs/hello",
+      "title": "Hello sidebar_label",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/headingAsTitle",
+      "title": "My heading as title",
+    },
+    Object {
+      "permalink": "/docs/ipsum",
+      "title": "ipsum",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/hello",
+      "title": "Hello sidebar_label",
+    },
+    Object {
+      "permalink": "/docs/lorem",
+      "title": "lorem",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/ipsum",
+      "title": "ipsum",
+    },
+    Object {
+      "permalink": "/docs/rootAbsoluteSlug",
+      "title": "rootAbsoluteSlug",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+    Object {
+      "permalink": "/docs/headingAsTitle",
+      "title": "My heading as title",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+    Object {
+      "permalink": "/docs/headingAsTitle",
+      "title": "My heading as title",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+    Object {
+      "permalink": "/docs/headingAsTitle",
+      "title": "My heading as title",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+    Object {
+      "permalink": "/docs/headingAsTitle",
+      "title": "My heading as title",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/foo/bazSlug.html",
+      "title": "baz pagination_label",
+    },
+    Object {
+      "permalink": "/docs/slugs/relativeSlug",
+      "title": "relativeSlug",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/absoluteSlug",
+      "title": "absoluteSlug",
+    },
+    Object {
+      "permalink": "/docs/slugs/hey/resolvedSlug",
+      "title": "resolvedSlug",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/slugs/relativeSlug",
+      "title": "relativeSlug",
+    },
+    Object {
+      "permalink": "/docs/tryToEscapeSlug",
+      "title": "tryToEscapeSlug",
+    },
+  ],
+  Array [
+    Object {
+      "permalink": "/docs/slugs/hey/resolvedSlug",
+      "title": "resolvedSlug",
+    },
+    undefined,
+  ],
+]
+`;