fix(v2): fix recent baseurl issues

.gitignore

@@ -27,3 +27,6 @@ packages/docusaurus-plugin-debug/lib/
 packages/docusaurus-plugin-sitemap/lib/
 packages/docusaurus-plugin-ideal-image/lib/
 packages/docusaurus-theme-classic/lib/
+
+website/netlifyDeploy
+_redirects

netlify.toml

@@ -0,0 +1,26 @@
+
+# Note: this file's config override the Netlify UI admin config
+
+# default/production build
+[build]
+  base = "/"
+  command = "yarn netlify:build:production"
+  publish = "website/build"
+
+# we build deploy previews with a /build/ baseUrl on purpose
+# permits to test that baseUrl works fine (this often breaks!)
+[context.deploy-preview]
+  command = "yarn netlify:build:deployPreview"
+  publish = "website/netlifyDeploy"
+
+  # TODO this does not seem to work
+  # workaroud: a _redirect file is created in website/netlifyDeploy
+  # can't we have context-based redirects with Netlify? :'(
+  [[context.deploy-preview.redirects]]
+    from = "/build/*"
+    to = "/build/404.html"
+    status = 200
+  [[context.deploy-preview.redirects]]
+    from = "/*"
+    to = "/build/"
+

package.json

@@ -7,20 +7,29 @@
     "packages/docusaurus-init/templates/*"
   ],
   "scripts": {
+    "testBaseUrl": "yarn build:v2:baseUrl && yarn serve:v2:baseUrl",
     "start": "yarn build:packages && yarn start:v2",
     "start:v1": "yarn workspace docusaurus-1-website start",
     "start:v2": "yarn workspace docusaurus-2-website start",
     "start:v2:watch": "nodemon --watch \"./packages/*/lib/**/*.*\" --exec \"yarn start:v2\"",
+    "start:v2:baseUrl": "BASE_URL='/build/' yarn start:v2",
     "build": "yarn build:packages && yarn build:v2",
     "build:packages": "lerna run build --no-private",
     "build:v1": "yarn workspace docusaurus-1-website build",
     "build:v2": "yarn workspace docusaurus-2-website build",
+    "build:v2:baseUrl": "BASE_URL='/build/' yarn build:v2",
     "serve:v1": "serve website-1.x/build/docusaurus",
     "serve:v2": "serve website/build",
+    "serve:v2:baseUrl": "serve website",
     "serve:v2:ssl": "yarn serve:v2:ssl:gencert && yarn serve:v2:ssl:message && yarn serve:v2:ssl:serve",
     "serve:v2:ssl:gencert": "openssl req -x509 -nodes -days 365 -newkey rsa:4096 -subj \"/C=US/ST=Docusaurus/L=Anywhere/O=Dis/CN=localhost\" -keyout ./website/.docusaurus/selfsigned.key -out ./website/.docusaurus/selfsigned.crt",
     "serve:v2:ssl:message": "echo '\n\n\nServing Docusaurus with HTTPS on localhost requires to disable the Chrome security: chrome://flags/#allow-insecure-localhost\n\n\n'",
     "serve:v2:ssl:serve": "serve website/build --ssl-cert ./website/.docusaurus/selfsigned.crt --ssl-key ./website/.docusaurus/selfsigned.key",
+    "netlify:build:production": "yarn build:v2",
+    "netlify:build:deployPreview": "yarn build:v2:baseUrl && yarn netlify:build:deployPreview:moveBuild && yarn netlify:build:deployPreview:redirects",
+    "netlify:build:deployPreview:moveBuild": "yarn rimraf website/netlifyDeploy && mkdir website/netlifyDeploy && mv website/build website/netlifyDeploy",
+    "netlify:build:deployPreview:redirects": "echo 'Writing Netlify baseUrl deployPreview _redirects file' && echo '/build/* /build/404.html 200' >> website/netlifyDeploy/_redirects && echo '/* /build/' >> website/netlifyDeploy/_redirects",
+    "netlify:test": "yarn netlify:build:deployPreview && yarn netlify dev --debug",
     "changelog": "lerna-changelog",
     "postinstall": "yarn build:packages",
     "prettier": "prettier --config .prettierrc --write \"**/*.{js,ts}\"",
@@ -37,8 +46,8 @@
     "clear": "yarn rimraf website/.docusaurus && rimraf -rf website/node_modules/.cache && yarn lerna exec 'yarn rimraf lib' --ignore docusaurus"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
     "@babel/cli": "^7.9.0",
+    "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.9.0",
     "@babel/preset-typescript": "^7.9.0",
@@ -88,6 +97,7 @@
     "lerna": "^3.19.0",
     "lerna-changelog": "^1.0.1",
     "lint-staged": "^10.1.2",
+    "netlify-cli": "^2.58.0",
     "nodemon": "^2.0.4",
     "prettier": "^2.0.2",
     "react": "^16.8.4",

packages/docusaurus-plugin-content-blog/package.json

@@ -16,9 +16,9 @@
   },
   "dependencies": {
     "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
+    "@docusaurus/core": "^2.0.0-alpha.58",
     "@docusaurus/types": "^2.0.0-alpha.58",
     "@docusaurus/utils": "^2.0.0-alpha.58",
-    "@docusaurus/core": "2.0.0-alpha.58",
     "@hapi/joi": "^17.1.1",
     "feed": "^4.1.0",
     "fs-extra": "^8.1.0",

packages/docusaurus-plugin-content-docs/package.json

@@ -19,6 +19,7 @@
   },
   "dependencies": {
     "@docusaurus/mdx-loader": "^2.0.0-alpha.58",
+    "@docusaurus/core": "^2.0.0-alpha.58",
     "@docusaurus/types": "^2.0.0-alpha.58",
     "@docusaurus/utils": "^2.0.0-alpha.58",
     "execa": "^3.4.0",
@@ -33,8 +34,7 @@
     "lodash.pickby": "^4.6.0",
     "lodash.sortby": "^4.6.0",
     "remark-admonitions": "^1.2.1",
-    "shelljs": "^0.8.4",
-    "@docusaurus/core": "^2.0.0-alpha.58"
+    "shelljs": "^0.8.4"
   },
   "peerDependencies": {
     "react": "^16.8.4",

packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap

@@ -178,7 +178,7 @@ Object {
   "pluginName": Object {
     "pluginId": Object {
       "latestVersionName": null,
-      "path": "docs",
+      "path": "/docs",
       "versions": Array [
         Object {
           "docs": Array [
@@ -469,7 +469,7 @@ Object {
   "pluginName": Object {
     "pluginId": Object {
       "latestVersionName": "1.0.1",
-      "path": "docs",
+      "path": "/docs",
       "versions": Array [
         Object {
           "docs": Array [

packages/docusaurus-plugin-content-docs/src/__tests__/client/docsClientUtils.test.ts

@@ -20,12 +20,12 @@ describe('docsClientUtils', () => {
   test('getActivePlugin', () => {
     const data: Record<string, GlobalPluginData> = {
       pluginIosId: {
-        path: 'ios',
+        path: '/ios',
         latestVersionName: 'xyz',
         versions: [],
       },
       pluginAndroidId: {
-        path: 'android',
+        path: '/android',
         latestVersionName: 'xyz',
         versions: [],
       },

packages/docusaurus-plugin-content-docs/src/client/docsClientUtils.ts

@@ -30,7 +30,7 @@ export const getActivePlugin = (
   const activeEntry = Object.entries(allPluginDatas).find(
     ([_id, pluginData]) => {
       return !!matchPath(pathname, {
-        path: `/${pluginData.path}`,
+        path: pluginData.path,
         exact: false,
         strict: false,
       });

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

@@ -323,7 +323,7 @@ Available document ids=
       const {addRoute, createData, setGlobalData} = actions;
 
       const pluginInstanceGlobalData: GlobalPluginData = {
-        path: options.path,
+        path: normalizeUrl([baseUrl, options.path]),
         latestVersionName: versioning.latestVersion,
         // Initialized empty, will be mutated
         versions: [],

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

@@ -24,10 +24,6 @@ export default {
     return children;
   },
   a: (props: ComponentProps<'a'>): JSX.Element => {
-    if (/\.[^./]+$/.test(props.href || '')) {
-      // eslint-disable-next-line jsx-a11y/anchor-has-content
-      return <a {...props} />;
-    }
     return <Link {...props} />;
   },
   pre: (props: ComponentProps<'div'>): JSX.Element => (

packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx

@@ -28,10 +28,8 @@ function NavLink({
   activeClassName?: string;
   prependBaseUrlToHref?: string;
 } & ComponentProps<'a'>) {
-  const toUrl = useBaseUrl(to);
   const activeBaseUrl = useBaseUrl(activeBasePath);
   const normalizedHref = useBaseUrl(href, {forcePrependBaseUrl: true});
-
   return (
     <Link
       {...(href
@@ -43,7 +41,7 @@ function NavLink({
         : {
             isNavLink: true,
             activeClassName,
-            to: toUrl,
+            to,
             ...(activeBasePath || activeBaseRegex
               ? {
                   isActive: (_match, location) =>

packages/docusaurus/src/client/exports/Link.tsx

@@ -11,6 +11,7 @@ import {NavLink, Link as RRLink} from 'react-router-dom';
 import isInternalUrl from './isInternalUrl';
 import ExecutionEnvironment from './ExecutionEnvironment';
 import {useLinksCollector} from '../LinksCollector';
+import {useBaseUrlUtils} from './useBaseUrl';
 
 declare global {
   interface Window {
@@ -21,15 +22,37 @@ declare global {
 interface Props {
   readonly isNavLink?: boolean;
   readonly to?: string;
-  readonly activeClassName?: string;
   readonly href?: string;
+  readonly activeClassName?: string;
   readonly children?: ReactNode;
+
+  // escape hatch in case broken links check is annoying for a specific link
+  readonly 'data-noBrokenLinkCheck'?: boolean;
 }
 
-function Link({isNavLink, activeClassName, ...props}: Props): JSX.Element {
+function Link({
+  isNavLink,
+  to,
+  href,
+  activeClassName,
+  'data-noBrokenLinkCheck': noBrokenLinkCheck,
+  ...props
+}: Props): JSX.Element {
+  const {withBaseUrl} = useBaseUrlUtils();
   const linksCollector = useLinksCollector();
-  const {to, href} = props;
-  const targetLink = to || href;
+
+  // IMPORTANT: using to or href should not change anything
+  // For example, MDX links will ALWAYS give us the href props
+  // Using one prop or the other should not be used to distinguish
+  // internal links (/docs/myDoc) from external links (https://github.com)
+  const targetLinkUnprefixed = to || href;
+
+  // Automatically apply base url in links
+  const targetLink =
+    typeof targetLinkUnprefixed !== 'undefined'
+      ? withBaseUrl(targetLinkUnprefixed)
+      : undefined;
+
   const isInternal = isInternalUrl(targetLink);
   const preloaded = useRef(false);
   const LinkComponent = isNavLink ? NavLink : RRLink;
@@ -89,10 +112,7 @@ function Link({isNavLink, activeClassName, ...props}: Props): JSX.Element {
   const isAnchorLink = targetLink?.startsWith('#') ?? false;
   const isRegularHtmlLink = !targetLink || !isInternal || isAnchorLink;
 
-  if (targetLink && isInternal && !isAnchorLink) {
-    if (targetLink && targetLink.startsWith('/http')) {
-      console.log('collectLink', props);
-    }
+  if (targetLink && isInternal && !isAnchorLink && !noBrokenLinkCheck) {
     linksCollector.collectLink(targetLink);
   }
 

packages/docusaurus/src/client/exports/__tests__/useBaseUrl.ts

@@ -67,6 +67,8 @@ describe('useBaseUrl', () => {
     expect(useBaseUrl('/hello/byebye', {absolute: true})).toEqual(
       'https://v2.docusaurus.io/docusaurus/hello/byebye',
     );
+    expect(useBaseUrl('/docusaurus/')).toEqual('/docusaurus/');
+    expect(useBaseUrl('/docusaurus/hello')).toEqual('/docusaurus/hello');
   });
 });
 
@@ -125,5 +127,7 @@ describe('useBaseUrlUtils().withBaseUrl()', () => {
     expect(withBaseUrl('/hello/byebye', {absolute: true})).toEqual(
       'https://v2.docusaurus.io/docusaurus/hello/byebye',
     );
+    expect(withBaseUrl('/docusaurus/')).toEqual('/docusaurus/');
+    expect(withBaseUrl('/docusaurus/hello')).toEqual('/docusaurus/hello');
   });
 });

packages/docusaurus/src/client/exports/useBaseUrl.ts

@@ -6,11 +6,9 @@
  */
 
 import useDocusaurusContext from './useDocusaurusContext';
-import isInternalUrl from './isInternalUrl';
+import {hasProtocol} from './isInternalUrl';
 
 type BaseUrlOptions = Partial<{
-  // note: if the url has a protocol, we never prepend it
-  // (it never makes any sense to do so)
   forcePrependBaseUrl: boolean;
   absolute: boolean;
 }>;
@@ -25,15 +23,20 @@ function addBaseUrl(
     return url;
   }
 
-  if (!isInternalUrl(url)) {
+  // it never makes sense to add a base url to an url with a protocol
+  if (hasProtocol(url)) {
     return url;
   }
 
   if (forcePrependBaseUrl) {
     return baseUrl + url;
   }
 
-  const basePath = baseUrl + url.replace(/^\//, '');
+  // sometimes we try to add baseurl to an url that already has a baseurl
+  // we should avoid adding the baseurl twice
+  const shouldAddBaseUrl = !url.startsWith(baseUrl);
+
+  const basePath = shouldAddBaseUrl ? baseUrl + url.replace(/^\//, '') : url;
 
   return absolute ? siteUrl + basePath : basePath;
 }

packages/docusaurus/src/commands/build.ts

@@ -39,7 +39,7 @@ export default async function build(
     outDir,
     generatedFilesDir,
     plugins,
-    siteConfig: {onBrokenLinks},
+    siteConfig: {baseUrl, onBrokenLinks},
     routes,
   } = props;
 
@@ -139,7 +139,13 @@ export default async function build(
     }),
   );
 
-  handleBrokenLinks({allCollectedLinks, routes, onBrokenLinks});
+  await handleBrokenLinks({
+    allCollectedLinks,
+    routes,
+    onBrokenLinks,
+    outDir,
+    baseUrl,
+  });
 
   const relativeDir = path.relative(process.cwd(), outDir);
   console.log(

packages/docusaurus/src/constants.ts

@@ -11,5 +11,6 @@ export const CONFIG_FILE_NAME = 'docusaurus.config.js';
 export const GENERATED_FILES_DIR_NAME = '.docusaurus';
 export const SRC_DIR_NAME = 'src';
 export const STATIC_DIR_NAME = 'static';
+export const STATIC_ASSETS_DIR_NAME = 'assets'; // webpack file-loader files
 export const THEME_PATH = `${SRC_DIR_NAME}/theme`;
 export const DEFAULT_PORT = 3000;

packages/docusaurus/src/server/__tests__/__snapshots__/brokenLinks.test.ts.snap

@@ -5,7 +5,8 @@ exports[`brokenLinks getBrokenLinksErrorMessage 1`] = `
 
 - Page path = /docs/mySourcePage:
    -> link to ./myBrokenLink (resolved as: /docs/myBrokenLink)
-   -> link to ../otherBrokenLink (resolved as: /otherBrokenLink),
+   -> link to ../otherBrokenLink (resolved as: /otherBrokenLink)
+
 
 - Page path = /otherSourcePage:
    -> link to /badLink