3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-14 17:47:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: docusaurus-version should allow duplicate id in different subfolder (#1125)

Browse source 
* fix: docusaurus-version should not be confused for duplicate ids in different subfolder

* nits

* nits

* remove log
This commit is contained in:
Endilie Yacop Sucipto 2018-11-23 15:51:18 +08:00 • committed by Yangshun Tay
parent 579cc61bbf
commit 1e8361392c
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
v1/lib/server/versionFallback.js
View file

@ -76,9 +76,6 @@ files.forEach(file => {
); );
} }
if (!(metadata.original_id in available)) {
available[metadata.original_id] = new Set();
}
// The version will be between "version-" and "-<metadata.original_id>" // The version will be between "version-" and "-<metadata.original_id>"
// e.g. version-1.0.0-beta.2-doc1 => 1.0.0-beta.2 // e.g. version-1.0.0-beta.2-doc1 => 1.0.0-beta.2
// e.g. version-1.0.0-doc2 => 1.0.0 // e.g. version-1.0.0-doc2 => 1.0.0
@ -87,6 +84,19 @@ files.forEach(file => {
metadata.id.indexOf('version-') + 8, // version- is 8 characters metadata.id.indexOf('version-') + 8, // version- is 8 characters
metadata.id.lastIndexOf(`-${metadata.original_id}`), metadata.id.lastIndexOf(`-${metadata.original_id}`),
); );
// the original_id should be namespaced according to subdir to allow duplicate id in different subfolder
const subDir = utils.getSubDir(
file,
path.join(versionFolder, `version-${version}`),
);
if (subDir) {
metadata.original_id = `${subDir}/${metadata.original_id}`;
}
if (!(metadata.original_id in available)) {
available[metadata.original_id] = new Set();
}
available[metadata.original_id].add(version); available[metadata.original_id].add(version);
if (!(version in versionFiles)) { if (!(version in versionFiles)) {

12
v1/lib/version.js
View file

@ -115,15 +115,15 @@ files.forEach(file => {
metadata.title = metadata.id; metadata.title = metadata.id;
} }
if (!versionFallback.diffLatestDoc(file, metadata.id)) { const docsDir = path.join(CWD, '../', readMetadata.getDocsPath());
const subDir = utils.getSubDir(file, docsDir);
const originalId = subDir ? `${subDir}/${metadata.id}` : metadata.id;
if (!versionFallback.diffLatestDoc(file, originalId)) {
return; return;
} }
metadata.original_id = metadata.id; metadata.original_id = originalId;
metadata.id = `version-${version}-${metadata.id}`; metadata.id = `version-${version}-${originalId}`;
const docsDir = path.join(CWD, '../', readMetadata.getDocsPath());
const subDir = utils.getSubDir(file, docsDir);
const targetFile = subDir const targetFile = subDir
? `${versionFolder}/${subDir}/${path.basename(file)}` ? `${versionFolder}/${subDir}/${path.basename(file)}`
: `${versionFolder}/${path.basename(file)}`; : `${versionFolder}/${path.basename(file)}`;