diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json index 26d4201640..78653f0d0d 100644 --- a/packages/docusaurus-theme-classic/package.json +++ b/packages/docusaurus-theme-classic/package.json @@ -23,6 +23,9 @@ "react": "^16.8.4", "react-dom": "^16.8.4" }, + "bundledDependencies": [ + "@docusaurus/utils" + ], "engines": { "node": ">=10.9.0" } diff --git a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js index aaf7ea57a9..1cfc93da76 100644 --- a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js +++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.js @@ -11,6 +11,10 @@ import Layout from '@theme/Layout'; import BlogPostItem from '@theme/BlogPostItem'; import Link from '@docusaurus/Link'; +function pluralize(count, word) { + return count > 1 ? `${word}s` : word; +} + function BlogTagsPostPage(props) { const {metadata, items} = props; const {allTagsPath, name: tagName, count} = metadata; @@ -23,7 +27,8 @@ function BlogTagsPostPage(props) {

- {count} post(s) tagged with "{tagName}" + {count} {pluralize(count, 'post')} tagged with "{tagName} + "

View All Tags
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js index a994194366..f72126d714 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js +++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js @@ -11,7 +11,7 @@ import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import useBaseUrl from '@docusaurus/useBaseUrl'; import useLockBodyScroll from '@theme/hooks/useLockBodyScroll'; import Link from '@docusaurus/Link'; -import isInternalUrl from '@docusaurus/utils'; // eslint-disable-line import/no-extraneous-dependencies +import isInternalUrl from '@docusaurus/utils'; import styles from './styles.module.css'; diff --git a/packages/docusaurus/src/client/exports/utils.js b/packages/docusaurus/src/client/exports/utils.js index 74ed1a1177..269c9ace70 100644 --- a/packages/docusaurus/src/client/exports/utils.js +++ b/packages/docusaurus/src/client/exports/utils.js @@ -4,6 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ + export default function isInternalUrl(url) { return /^\/(?!\/)/.test(url); }