From 7d5668629df563865e4359ed604abc7006ad8dac Mon Sep 17 00:00:00 2001 From: endiliey Date: Sat, 26 Oct 2019 14:47:49 +0700 Subject: [PATCH] Merge master --- CHANGELOG-2.x.md | 9 ++ lerna.json | 2 +- packages/docusaurus-1.x/package.json | 2 +- packages/docusaurus-init/package.json | 2 +- .../templates/classic/package.json | 6 +- packages/docusaurus-mdx-loader/package.json | 2 +- .../package.json | 8 +- .../package.json | 8 +- .../package.json | 6 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../docusaurus-plugin-sitemap/package.json | 2 +- .../docusaurus-preset-classic/package.json | 18 +-- .../docusaurus-theme-classic/package.json | 4 +- .../src/theme/DocSidebar/index.js | 75 +++++---- .../src/theme/Navbar/index.js | 10 +- .../package.json | 2 +- .../package.json | 2 +- .../src/theme/SearchBar/index.js | 1 + packages/docusaurus-types/package.json | 2 +- packages/docusaurus-types/src/index.d.ts | 2 +- packages/docusaurus-utils/package.json | 2 +- packages/docusaurus/package.json | 6 +- website-1.x/package.json | 4 +- website/docs/advanced-themes.md | 43 +----- website/docs/configuration.md | 39 ++--- website/docs/docusaurus-core.md | 145 +++++++++++++++++- website/docs/docusaurus.config.js.md | 33 ++-- website/docs/installation.md | 2 +- website/docs/lifecycle-apis.md | 49 +++++- website/docs/migrating-from-v1-to-v2.md | 10 +- website/package.json | 8 +- yarn.lock | 8 +- 34 files changed, 330 insertions(+), 188 deletions(-) diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md index a0b9a98b8c784..98889efbae93c 100644 --- a/CHANGELOG-2.x.md +++ b/CHANGELOG-2.x.md @@ -2,6 +2,8 @@ ## Unreleased +## 2.0.0-alpha.31 + - Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers. - Footer is now also displayed in docs page for consistency. - Remove empty doc sidebar container if sidebar for a particular doc page does not exist. Otherwise, it will cause an additional empty space. @@ -9,6 +11,13 @@ - Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input. - New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar. - Disable adding hashes to the generated class names of CSS modules in dev mode. Generating unique identifiers takes some time, which can be saved since including paths to files in class names is enough to avoid collisions. +- Update infima from 0.2.0-alpha.2 to 0.2.0-alpha.3 + - Fix showing sidebar category with empty items. + - Fix pagination nav and right sidebar color contrast ratio + - Fix sidebar arrow color in dark mode + - Fix footer mobile issue + - Increase sidebar width + - etc ## 2.0.0-alpha.30 diff --git a/lerna.json b/lerna.json index 7b01a7d936865..20fda1265a220 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.14.1", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/docusaurus-1.x/package.json b/packages/docusaurus-1.x/package.json index deb9efe26b9c9..679628af0492d 100644 --- a/packages/docusaurus-1.x/package.json +++ b/packages/docusaurus-1.x/package.json @@ -1,7 +1,7 @@ { "name": "docusaurus", "description": "Easy to Maintain Open Source Documentation Websites", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "license": "MIT", "keywords": [ "documentation", diff --git a/packages/docusaurus-init/package.json b/packages/docusaurus-init/package.json index fd49cb33184f6..a6ee1a57d1be9 100644 --- a/packages/docusaurus-init/package.json +++ b/packages/docusaurus-init/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/init", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Create Docusaurus app easily", "repository": { "type": "git", diff --git a/packages/docusaurus-init/templates/classic/package.json b/packages/docusaurus-init/templates/classic/package.json index 575bcd866b5dd..e4d27d9d8a719 100644 --- a/packages/docusaurus-init/templates/classic/package.json +++ b/packages/docusaurus-init/templates/classic/package.json @@ -1,6 +1,6 @@ { "name": "docusaurus-2-classic-template", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "private": true, "scripts": { "docusaurus": "docusaurus", @@ -10,8 +10,8 @@ "deploy": "docusaurus deploy" }, "dependencies": { - "@docusaurus/core": "^2.0.0-alpha.30", - "@docusaurus/preset-classic": "^2.0.0-alpha.30", + "@docusaurus/core": "^2.0.0-alpha.31", + "@docusaurus/preset-classic": "^2.0.0-alpha.31", "classnames": "^2.2.6", "react": "^16.8.4", "react-dom": "^16.8.4" diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json index e080bedd1ee1c..63abfbd3ce678 100644 --- a/packages/docusaurus-mdx-loader/package.json +++ b/packages/docusaurus-mdx-loader/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/mdx-loader", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Docusaurus Loader for MDX", "main": "src/index.js", "publishConfig": { diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json index 30b62b622dcc5..770cae3ed75a2 100644 --- a/packages/docusaurus-plugin-content-blog/package.json +++ b/packages/docusaurus-plugin-content-blog/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-content-blog", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Blog plugin for Docusaurus", "main": "lib/index.js", "scripts": { @@ -11,11 +11,11 @@ }, "license": "MIT", "devDependencies": { - "@docusaurus/types": "^2.0.0-alpha.30" + "@docusaurus/types": "^2.0.0-alpha.31" }, "dependencies": { - "@docusaurus/mdx-loader": "^2.0.0-alpha.30", - "@docusaurus/utils": "^2.0.0-alpha.30", + "@docusaurus/mdx-loader": "^2.0.0-alpha.31", + "@docusaurus/utils": "^2.0.0-alpha.31", "fs-extra": "^8.1.0", "globby": "^10.0.1", "loader-utils": "^1.2.3", diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json index 334ea53bd3a0a..6594906ea7857 100644 --- a/packages/docusaurus-plugin-content-docs/package.json +++ b/packages/docusaurus-plugin-content-docs/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-content-docs", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Docs content plugin for Docusaurus", "main": "lib/index.js", "scripts": { @@ -11,11 +11,11 @@ }, "license": "MIT", "devDependencies": { - "@docusaurus/types": "^2.0.0-alpha.30" + "@docusaurus/types": "^2.0.0-alpha.31" }, "dependencies": { - "@docusaurus/mdx-loader": "^2.0.0-alpha.30", - "@docusaurus/utils": "^2.0.0-alpha.30", + "@docusaurus/mdx-loader": "^2.0.0-alpha.31", + "@docusaurus/utils": "^2.0.0-alpha.31", "cross-spawn": "^7.0.1", "fs-extra": "^8.1.0", "globby": "^10.0.1", diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index 103164e37c17a..0041bd63fa96f 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-content-pages", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Pages content plugin for Docusaurus", "main": "lib/index.js", "scripts": { @@ -11,8 +11,8 @@ }, "license": "MIT", "dependencies": { - "@docusaurus/types": "^2.0.0-alpha.30", - "@docusaurus/utils": "^2.0.0-alpha.30", + "@docusaurus/types": "^2.0.0-alpha.31", + "@docusaurus/utils": "^2.0.0-alpha.31", "globby": "^10.0.1" }, "peerDependencies": { diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json index 868c33c6238af..3196e44f539ea 100644 --- a/packages/docusaurus-plugin-google-analytics/package.json +++ b/packages/docusaurus-plugin-google-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-google-analytics", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Global analytics (analytics.js) plugin for Docusaurus", "main": "src/index.js", "publishConfig": { diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json index d33b93c37d5a9..1473c596d22d0 100644 --- a/packages/docusaurus-plugin-google-gtag/package.json +++ b/packages/docusaurus-plugin-google-gtag/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-google-gtag", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Global Site Tag (gtag.js) plugin for Docusaurus", "main": "src/index.js", "publishConfig": { diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json index b28ddf531aeb6..fb1d056abe1c9 100644 --- a/packages/docusaurus-plugin-ideal-image/package.json +++ b/packages/docusaurus-plugin-ideal-image/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-ideal-image", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder)", "main": "src/index.js", "publishConfig": { diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json index 835e3b6011c6c..af6761849d76c 100644 --- a/packages/docusaurus-plugin-sitemap/package.json +++ b/packages/docusaurus-plugin-sitemap/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/plugin-sitemap", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Simple sitemap generation plugin for Docusaurus", "main": "src/index.js", "publishConfig": { diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json index ef77f0c3857aa..30a58c55a8c58 100644 --- a/packages/docusaurus-preset-classic/package.json +++ b/packages/docusaurus-preset-classic/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/preset-classic", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Preset for classic Docusaurus", "main": "src/index.js", "publishConfig": { @@ -8,14 +8,14 @@ }, "license": "MIT", "dependencies": { - "@docusaurus/plugin-content-blog": "^2.0.0-alpha.30", - "@docusaurus/plugin-content-docs": "^2.0.0-alpha.30", - "@docusaurus/plugin-content-pages": "^2.0.0-alpha.30", - "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.30", - "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.30", - "@docusaurus/plugin-sitemap": "^2.0.0-alpha.30", - "@docusaurus/theme-classic": "^2.0.0-alpha.30", - "@docusaurus/theme-search-algolia": "^2.0.0-alpha.30" + "@docusaurus/plugin-content-blog": "^2.0.0-alpha.31", + "@docusaurus/plugin-content-docs": "^2.0.0-alpha.31", + "@docusaurus/plugin-content-pages": "^2.0.0-alpha.31", + "@docusaurus/plugin-google-analytics": "^2.0.0-alpha.31", + "@docusaurus/plugin-google-gtag": "^2.0.0-alpha.31", + "@docusaurus/plugin-sitemap": "^2.0.0-alpha.31", + "@docusaurus/theme-classic": "^2.0.0-alpha.31", + "@docusaurus/theme-search-algolia": "^2.0.0-alpha.31" }, "peerDependencies": { "@docusaurus/core": "^2.0.0" diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json index f0974af6d0586..bdac8087f0b8f 100644 --- a/packages/docusaurus-theme-classic/package.json +++ b/packages/docusaurus-theme-classic/package.json @@ -1,6 +1,6 @@ { "name": "@docusaurus/theme-classic", - "version": "2.0.0-alpha.30", + "version": "2.0.0-alpha.31", "description": "Classic theme for Docusaurus", "main": "src/index.js", "publishConfig": { @@ -12,7 +12,7 @@ "@mdx-js/react": "^1.5.1", "classnames": "^2.2.6", "clipboard": "^2.0.4", - "infima": "0.2.0-alpha.2", + "infima": "0.2.0-alpha.3", "prism-react-renderer": "^1.0.2", "react-toggle": "^4.1.1" }, diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js index 2e863bb1711af..686b35192702a 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js +++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.js @@ -30,31 +30,35 @@ function DocSidebarItem({item, onItemClick, collapsible}) { switch (type) { case 'category': return ( -
  • - 0 && ( +
  • setCollapsed(!collapsed) : undefined}> - {label} - - -
    • + key={label}> + setCollapsed(!collapsed) : undefined + }> + {label} + + + + ) ); case 'link': @@ -164,16 +168,19 @@ function DocSidebar(props) { )} diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js index f60d3c331c2d7..15f1f2bb8a104 100644 --- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js +++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js @@ -92,7 +92,7 @@ function Navbar() {