Merge branch 'master' into tsirlucas/master

Author: slorber

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Installation
         uses: bahmutov/npm-install@v1
         with:
-          install-command: yarn install --immutable # Fails if yarn.lock is modified
+          install-command: yarn install --frozen-lockfile # Fails if yarn.lock is modified
       - name: Lint
         run: yarn lint:ci
       - name: Prettier Code

packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/generateBlogFeed.test.ts.snap

@@ -1,18 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`blogFeed atom can show feed without posts 1`] = `
-"<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
-<feed xmlns=\\"http://www.w3.org/2005/Atom\\">
-    <id>https://docusaurus.io/blog</id>
-    <title>Hello Blog</title>
-    <updated>2015-10-25T23:29:00.000Z</updated>
-    <generator>https://github.com/jpmonette/feed</generator>
-    <link rel=\\"alternate\\" href=\\"https://docusaurus.io/blog\\"/>
-    <subtitle>Hello Blog</subtitle>
-    <icon>https://docusaurus.io/image/favicon.ico</icon>
-    <rights>Copyright</rights>
-</feed>"
-`;
+exports[`blogFeed atom should not show feed without posts 1`] = `null`;
 
 exports[`blogFeed atom shows feed item for each post 1`] = `
 "<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
@@ -49,20 +37,7 @@ exports[`blogFeed atom shows feed item for each post 1`] = `
 </feed>"
 `;
 
-exports[`blogFeed rss can show feed without posts 1`] = `
-"<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>
-<rss version=\\"2.0\\">
-    <channel>
-        <title>Hello Blog</title>
-        <link>https://docusaurus.io/blog</link>
-        <description>Hello Blog</description>
-        <lastBuildDate>Sun, 25 Oct 2015 23:29:00 GMT</lastBuildDate>
-        <docs>https://validator.w3.org/feed/docs/rss2.html</docs>
-        <generator>https://github.com/jpmonette/feed</generator>
-        <copyright>Copyright</copyright>
-    </channel>
-</rss>"
-`;
+exports[`blogFeed rss should not show feed without posts 1`] = `null`;
 
 exports[`blogFeed rss shows feed item for each post 1`] = `
 "<?xml version=\\"1.0\\" encoding=\\"utf-8\\"?>

packages/docusaurus-plugin-content-blog/src/__tests__/generateBlogFeed.test.ts

@@ -32,7 +32,7 @@ function getBlogContentPaths(siteDir: string): BlogContentPaths {
 describe('blogFeed', () => {
   (['atom', 'rss'] as const).forEach((feedType) => {
     describe(`${feedType}`, () => {
-      test('can show feed without posts', async () => {
+      test('should not show feed without posts', async () => {
         const siteDir = __dirname;
         const siteConfig = {
           title: 'Hello',

packages/docusaurus-plugin-content-blog/src/blogUtils.ts

@@ -67,7 +67,7 @@ export async function generateBlogFeed(
   }
   const {siteConfig} = context;
   const blogPosts = await generateBlogPosts(contentPaths, context, options);
-  if (blogPosts == null) {
+  if (!blogPosts.length) {
     return null;
   }
 

packages/docusaurus-plugin-content-blog/src/index.ts

@@ -117,6 +117,7 @@ export default function pluginContentBlog(
       const {postsPerPage, routeBasePath} = options;
 
       blogPosts = await generateBlogPosts(contentPaths, context, options);
+
       if (!blogPosts.length) {
         return null;
       }
@@ -506,9 +507,14 @@ export default function pluginContentBlog(
     },
 
     injectHtmlTags() {
+      if (!blogPosts.length) {
+        return {};
+      }
+
       if (!options.feedOptions?.type) {
         return {};
       }
+
       const feedTypes = options.feedOptions.type;
       const {
         siteConfig: {title},

packages/docusaurus-plugin-ideal-image/package.json

@@ -25,7 +25,7 @@
     "@docusaurus/responsive-loader": "1.4.0",
     "@docusaurus/types": "2.0.0-beta.0",
     "@endiliey/react-ideal-image": "^0.0.11",
-    "react-waypoint": "^9.0.2",
+    "react-waypoint": "^10.1.0",
     "sharp": "^0.28.2",
     "tslib": "^2.1.0",
     "webpack": "^5.28.0"

packages/docusaurus-theme-classic/src/index.ts

@@ -178,9 +178,6 @@ export default function docusaurusThemeClassic(
         preBodyTags: [
           {
             tagName: 'script',
-            attributes: {
-              type: 'text/javascript',
-            },
             innerHTML: noFlashColorMode(colorMode),
           },
         ],

packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx

@@ -109,13 +109,13 @@ function BlogPostItem(props: Props): JSX.Element {
           <footer className="row margin-vert--lg">
             {tags.length > 0 && (
               <div className="col">
-                <strong>
+                <b>
                   <Translate
                     id="theme.tags.tagsListLabel"
                     description="The label alongside a tag list">
                     Tags:
                   </Translate>
-                </strong>
+                </b>
                 {tags.map(({label, permalink: tagPermalink}) => (
                   <Link
                     key={tagPermalink}
@@ -131,13 +131,13 @@ function BlogPostItem(props: Props): JSX.Element {
                 <Link
                   to={metadata.permalink}
                   aria-label={`Read more about ${title}`}>
-                  <strong>
+                  <b>
                     <Translate
                       id="theme.blog.post.readMore"
                       description="The label used in blog post item excerpts to link to full blog posts">
                       Read More
                     </Translate>
-                  </strong>
+                  </b>
                 </Link>
               </div>
             )}

packages/docusaurus-theme-classic/src/theme/DocPage/styles.module.css

@@ -19,6 +19,10 @@
   width: 100%;
 }
 
+.docItemWrapper {
+  padding-top: 0.5rem !important;
+}
+
 @media (min-width: 997px) {
   .docMainContainer {
     flex-grow: 1;
@@ -72,7 +76,9 @@
   }
 
   .docItemWrapperEnhanced {
-    max-width: calc(var(--ifm-container-width) + var(--doc-sidebar-width)) !important;
+    max-width: calc(
+      var(--ifm-container-width) + var(--doc-sidebar-width)
+    ) !important;
   }
 }
 

packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx

@@ -18,6 +18,7 @@ import type {Props} from '@theme/DocSidebar';
 import Logo from '@theme/Logo';
 import IconArrow from '@theme/IconArrow';
 import IconMenu from '@theme/IconMenu';
+import IconExternalLink from '@theme/IconExternalLink';
 import {translate} from '@docusaurus/Translate';
 
 import styles from './styles.module.css';
@@ -179,7 +180,6 @@ function DocSidebarItemLink({
       <Link
         className={clsx('menu__link', {
           'menu__link--active': isActive,
-          [styles.menuLinkExternal]: !isInternalUrl(href),
         })}
         to={href}
         {...(isInternalUrl(href) && {
@@ -188,7 +188,14 @@ function DocSidebarItemLink({
           onClick: onItemClick,
         })}
         {...props}>
-        {label}
+        {isInternalUrl(href) ? (
+          label
+        ) : (
+          <span>
+            {label}
+            <IconExternalLink />
+          </span>
+        )}
       </Link>
     </li>
   );