From 89582c7b7a96ff542832f5bcf3c172094a72ac26 Mon Sep 17 00:00:00 2001 From: Hongarc Date: Sun, 19 May 2019 15:54:29 +0700 Subject: [PATCH] refactor: better regex & path parsing for metadata (#1492) * Don't need using `toString` after `path.basename` * Use `parse` instead of `basename+extname` --- packages/docusaurus-1.x/lib/server/readMetadata.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/docusaurus-1.x/lib/server/readMetadata.js b/packages/docusaurus-1.x/lib/server/readMetadata.js index 71b9410044..9d69e84bd2 100644 --- a/packages/docusaurus-1.x/lib/server/readMetadata.js +++ b/packages/docusaurus-1.x/lib/server/readMetadata.js @@ -143,7 +143,7 @@ function processMetadata(file, refDir) { const rawContent = result.rawContent; if (!metadata.id) { - metadata.id = path.basename(file, path.extname(file)); + metadata.id = path.parse(file).name; } if (metadata.id.includes('/')) { throw new Error('Document id cannot include "/".'); @@ -374,10 +374,7 @@ function generateMetadataBlog() { } const metadata = blog.getMetadata(file); // Extract, YYYY, MM, DD from the file name - const filePathDateArr = path - .basename(file) - .toString() - .split('-'); + const filePathDateArr = path.basename(file).split('-'); metadata.date = new Date( `${filePathDateArr[0]}-${filePathDateArr[1]}-${ filePathDateArr[2]