diff --git a/.eslintrc.js b/.eslintrc.js index 6bc2685c7301..92f71292f986 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -114,7 +114,7 @@ module.exports = { 'prefer-destructuring': WARNING, yoda: WARNING, 'no-control-regex': WARNING, - 'no-empty': WARNING, + 'no-empty': [WARNING, {allowEmptyCatch: true}], 'no-prototype-builtins': WARNING, 'no-case-declarations': WARNING, 'no-undef': OFF, diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars.ts b/packages/docusaurus-plugin-content-docs/src/sidebars.ts index dae4be2ffc83..86d06312b33d 100644 --- a/packages/docusaurus-plugin-content-docs/src/sidebars.ts +++ b/packages/docusaurus-plugin-content-docs/src/sidebars.ts @@ -128,7 +128,7 @@ function assertIsCategory( } // "collapsed" is an optional property if ( - Object.prototype.hasOwnProperty.call(item, 'collapsed') && + typeof item.collapsed !== 'undefined' && typeof item.collapsed !== 'boolean' ) { throw new Error( diff --git a/packages/docusaurus/src/server/configValidation.ts b/packages/docusaurus/src/server/configValidation.ts index c897ab3a85c9..08aa8dd1cc31 100644 --- a/packages/docusaurus/src/server/configValidation.ts +++ b/packages/docusaurus/src/server/configValidation.ts @@ -116,9 +116,7 @@ const SiteUrlSchema = URISchema.required().custom(function (value, helpers) { warningMessage: `the url is not supposed to contain a sub-path like '${pathname}', please use the baseUrl field for sub-paths`, }); } - } catch (e) { - /* Do nothing with invalid URL */ - } + } catch (e) {} return value; }, 'siteUrlCustomValidation');