fix: suppoert .html

YvesCoding · Jul 9, 2020 · aa724af · aa724af
1 parent 6248982
commit aa724af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/@rcpress/core/lib/node/prepare/codegen.js b/packages/@rcpress/core/lib/node/prepare/codegen.js
@@ -32,14 +32,14 @@ exports.genRoutesFile = async function({
     const file = pageFiles[index];
     const filePath = path.join(docsDir, file);
     let code = `
-  {
-    path: ${JSON.stringify(pagePath)},
-    filePath: ${JSON.stringify(filePath)},
-    markdown: AsyncMD$${index},
-    name: '${pagePath}' ,
-    route_component: LayoutWrapper,
-    exact: true
-  }`;
+    {
+      path: ${JSON.stringify(pagePath)},
+      filePath: ${JSON.stringify(filePath)},
+      markdown: AsyncMD$${index},
+      name: '${pagePath}' ,
+      route_component: LayoutWrapper,
+      exact: true
+    }`;
 
     const dncodedPath = decodeURIComponent(pagePath);
     if (dncodedPath !== pagePath) {
@@ -61,7 +61,7 @@ exports.genRoutesFile = async function({
     } else {
       code += `,
   {
-    path: ${JSON.stringify(pagePath + '.html')},
+    path: ${JSON.stringify(pagePath.slice(0, pagePath.lastIndexOf('.html')))},
     redirect: ${JSON.stringify(pagePath)},
     exact: true
   }`;

diff --git a/packages/@rcpress/core/lib/node/prepare/util.js b/packages/@rcpress/core/lib/node/prepare/util.js
@@ -40,7 +40,7 @@ exports.fileToPath = function(file) {
   } else {
     // foo.md -> /foo.html
     // foo/bar.md -> /foo/bar.html
-    return `/${file.replace(extRE, '').replace(/\\/g, '/')}`;
+    return `/${file.replace(extRE, '.html').replace(/\\/g, '/')}`;
   }
 };