From aa157969cf95af22be07ba761c419755bde0660e Mon Sep 17 00:00:00 2001 From: Endi Date: Wed, 22 May 2019 19:20:53 +0700 Subject: [PATCH] chore(v2): cleanup & update deps (#1505) * chore(v2): rename useBaseUrl -> withBaseUrl & update deps * nits --- package.json | 2 +- .../src/theme/Footer/index.js | 4 +- .../src/theme/Layout/index.js | 13 +- .../src/theme/Navbar/index.js | 27 +-- packages/docusaurus/package.json | 6 +- .../client/exports/__tests__/useBaseUrl.ts | 52 ------ .../client/exports/__tests__/withBaseUrl.ts | 52 ++++++ .../exports/{useBaseUrl.ts => withBaseUrl.ts} | 16 +- .../src/client/theme-fallback/Layout/index.js | 5 +- packages/docusaurus/src/webpack/base.ts | 7 +- packages/docusaurus/src/webpack/utils.ts | 2 +- website/pages/index.js | 20 +-- yarn.lock | 159 +++++++----------- 13 files changed, 159 insertions(+), 206 deletions(-) delete mode 100644 packages/docusaurus/src/client/exports/__tests__/useBaseUrl.ts create mode 100644 packages/docusaurus/src/client/exports/__tests__/withBaseUrl.ts rename packages/docusaurus/src/client/exports/{useBaseUrl.ts => withBaseUrl.ts} (74%) diff --git a/package.json b/package.json index b7cb52cd48..17354e2b24 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "tsc": "lerna run tsc --no-private" }, "devDependencies": { - "@babel/core": "^7.4.4", + "@babel/core": "^7.4.5", "@babel/preset-typescript": "^7.3.3", "@types/chalk": "^2.2.0", "@types/escape-string-regexp": "^1.0.0", diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/index.js b/packages/docusaurus-theme-classic/src/theme/Footer/index.js index ea04c719ea..53b44d8add 100644 --- a/packages/docusaurus-theme-classic/src/theme/Footer/index.js +++ b/packages/docusaurus-theme-classic/src/theme/Footer/index.js @@ -10,13 +10,13 @@ import classnames from 'classnames'; import Link from '@docusaurus/Link'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import withBaseUrl from '@docusaurus/withBaseUrl'; function Footer() { const context = useDocusaurusContext(); const {siteConfig = {}} = context; const { - baseUrl, themeConfig: {footer}, } = siteConfig; @@ -55,7 +55,7 @@ function Footer() { href: item.href, } : { - to: `${baseUrl}${item.to}`, + to: withBaseUrl(item.to), })}> {item.label} diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.js b/packages/docusaurus-theme-classic/src/theme/Layout/index.js index d67b691f5f..21d10687a0 100644 --- a/packages/docusaurus-theme-classic/src/theme/Layout/index.js +++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.js @@ -6,23 +6,24 @@ */ import React from 'react'; -import Head from '@docusaurus/Head'; // eslint-disable-line -import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; // eslint-disable-line -import Navbar from '@theme/Navbar'; // eslint-disable-line -import Footer from '@theme/Footer'; // eslint-disable-line +import Head from '@docusaurus/Head'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import withBaseUrl from '@docusaurus/withBaseUrl'; +import Navbar from '@theme/Navbar'; +import Footer from '@theme/Footer'; import './styles.css'; function Layout(props) { const context = useDocusaurusContext(); const {siteConfig = {}} = context; - const {baseUrl, favicon, tagline, title: defaultTitle} = siteConfig; + const {favicon, tagline, title: defaultTitle} = siteConfig; const {children, title, noFooter, description} = props; return ( {title && {`${title} · ${tagline}`}} - {favicon && } + {favicon && } {description && } {description && ( diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js index 263265ec03..f90e5e5aad 100644 --- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js +++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js @@ -9,26 +9,26 @@ import React from 'react'; import Link from '@docusaurus/Link'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import withBaseUrl from '@docusaurus/withBaseUrl'; import SearchBar from '@theme/SearchBar'; function NavLink(props) { - const {baseUrl, ...originalProps} = props; return ( - {originalProps.label} + {props.label} ); } @@ -42,15 +42,6 @@ function Navbar() { } = siteConfig; const {title, logo, links} = navbar; - const getUrl = url => { - const externalRegex = /^(https?:|\/\/)/; - const internalRegex = /^\/(?!\/)/; - if (externalRegex.test(url) || internalRegex.test(url)) { - return url; - } - return baseUrl + url; - }; - return (