3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-10 23:57:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(v2): fix multi-instance mdx loaders not sandboxed correctly (#3970)

Browse source 
* another attempt to fix the multi-instance conflicts

* try to fix windows build

* cleanup + improve comment
This commit is contained in:
Sébastien Lorber 2020-12-30 11:18:51 +01:00 • committed by GitHub
parent 9fdac1a0dc
commit 1e1860681b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/docusaurus-plugin-content-blog/src/index.ts
View file

@ -15,6 +15,7 @@ import {
getPluginI18nPath,
reportMessage,
posixPath,
addTrailingPathSeparator,
} from '@docusaurus/utils';
import {
STATIC_DIR_NAME,
@ -436,7 +437,9 @@ export default function pluginContentBlog(
rules: [
{
test: /(\.mdx?)$/,
include: getContentPathList(contentPaths),
include: getContentPathList(contentPaths)
// Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
.map(addTrailingPathSeparator),
use: [
getCacheLoader(isServer),
getBabelLoader(isServer),

5
packages/docusaurus-plugin-content-docs/src/index.ts
View file

@ -17,6 +17,7 @@ import {
aliasedSitePath,
reportMessage,
posixPath,
addTrailingPathSeparator,
} from '@docusaurus/utils';
import {LoadContext, Plugin, RouteConfig} from '@docusaurus/types';
@ -345,7 +346,9 @@ export default function pluginContentDocs(
function createMDXLoaderRule(): RuleSetRule {
return {
test: /(\.mdx?)$/,
include: flatten(versionsMetadata.map(getDocsDirPaths)),
include: flatten(versionsMetadata.map(getDocsDirPaths))
// Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
.map(addTrailingPathSeparator),
use: compact([
getCacheLoader(isServer),
getBabelLoader(isServer),

5
packages/docusaurus-plugin-content-pages/src/index.ts
View file

@ -17,6 +17,7 @@ import {
docuHash,
getPluginI18nPath,
getFolderContainingFile,
addTrailingPathSeparator,
} from '@docusaurus/utils';
import {
LoadContext,
@ -210,7 +211,9 @@ export default function pluginContentPages(
rules: [
{
test: /(\.mdx?)$/,
include: getContentPathList(contentPaths),
include: getContentPathList(contentPaths)
// Trailing slash is important, see https://github.com/facebook/docusaurus/pull/3970
.map(addTrailingPathSeparator),
use: [
getCacheLoader(isServer),
getBabelLoader(isServer),

3
packages/docusaurus-utils/src/index.ts
View file

@ -414,6 +414,9 @@ export function addLeadingSlash(str: string): string {
export function addTrailingSlash(str: string): string {
return str.endsWith('/') ? str : `${str}/`;
}
export function addTrailingPathSeparator(str: string): string {
return str.endsWith(path.sep) ? str : `${str}${path.sep}`;
}
export function removeTrailingSlash(str: string): string {
return removeSuffix(str, '/');