fix: dont show footer if themeConfig.footer is undefined

facebook · May 16, 2019 · 8d068da · 8d068da
1 parent d03ff70
commit 8d068da
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/index.js b/packages/docusaurus-theme-classic/src/theme/Footer/index.js
@@ -20,6 +20,10 @@ function Footer() {
  themeConfig: {footer},
  } = siteConfig;
 
+ if (!footer) {
+ return null;
+ }
+
  const {copyright, links = [], logo} = footer;
 
  return (
@@ -30,15 +34,17 @@ function Footer() {
  <div className="container">
  {links && links.length > 0 && (
  <div className="row footer__links">
- {links.map(linkItem => (
- <div className="col">
+ {links.map((linkItem, i) => (
+ <div key={`linkItem-${i}`} className="col">
  {linkItem.title != null ? (
  <h4 className="footer__title">{linkItem.title}</h4>
  ) : null}
- {linkItem.items != null && linkItem.items.length > 0 ? (
+ {linkItem.items != null &&
+ Array.isArray(linkItem.items) &&
+ linkItem.items.length > 0 ? (
  <ul className="footer__items">
  {linkItem.items.map(item => (
- <li className="footer__item">
+ <li key={item.href || item.to} className="footer__item">
  <Link
  className="footer__link-item"
  {...item}

diff --git a/packages/docusaurus/src/server/load/config.js b/packages/docusaurus/src/server/load/config.js
@@ -7,6 +7,7 @@
 
 const fs = require('fs-extra');
 const _ = require('lodash');
+const importFresh = require('import-fresh');
 const path = require('path');
 const {CONFIG_FILE_NAME} = require('../../constants');
 
@@ -37,14 +38,11 @@ function formatFields(fields) {
  return fields.map(field => `'${field}'`).join(', ');
 }
 
-function loadConfig(siteDir, deleteCache = true) {
+function loadConfig(siteDir) {
  const configPath = path.resolve(siteDir, CONFIG_FILE_NAME);
- if (deleteCache) {
- delete require.cache[configPath];
- }
  let loadedConfig = {};
  if (fs.existsSync(configPath)) {
- loadedConfig = require(configPath); // eslint-disable-line
+ loadedConfig = importFresh(configPath);
  }
 
  const missingFields = REQUIRED_FIELDS.filter(

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
@@ -52,6 +52,10 @@ module.exports = {
  label: 'Feedback',
  to: 'feedback',
  },
+ {
+ label: 'Discord',
+ href: 'https://discordapp.com/invite/docusaurus',
+ },
  ],
  },
  {