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

chore(v2): normalize url properly (#1105)

Browse source 
* refactor(v2): normalize url properly

* nits
This commit is contained in:
Endilie Yacop Sucipto 2018-11-12 00:25:13 +08:00 • committed by GitHub
parent 34dcc0c22e
commit b84754dde8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 128 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
v2/lib/load/blog.js
View file

@ -8,7 +8,7 @@
const globby = require('globby');
const path = require('path');
const fs = require('fs-extra');
const {parse, idx} = require('./utils');
const {parse, idx, normalizeUrl} = require('./utils');
function fileToUrl(fileName) {
return fileName
@ -47,7 +47,7 @@ async function loadBlog({blogDir, env, siteConfig}) {
const fileString = await fs.readFile(source, 'utf-8');
const {metadata: rawMetadata} = parse(fileString);
const metadata = {
permalink: path.join(baseUrl, `blog`, fileToUrl(blogFileName)),
permalink: normalizeUrl([baseUrl, `blog`, fileToUrl(blogFileName)]),
source,
...rawMetadata,
date,
@ -67,7 +67,10 @@ async function loadBlog({blogDir, env, siteConfig}) {
/* eslint-disable */
for (let page = 0; page < numberOfPage; page++) {
blogMetadatas.push({
permalink: path.join(basePageUrl, `${page > 0 ? `page${page + 1}` : ''}`),
permalink: normalizeUrl([
basePageUrl,
`${page > 0 ? `page${page + 1}` : ''}`,
]),
language: defaultLangTag,
isBlogPage: true,
posts: blogMetadatas.slice(page * perPage, (page + 1) * perPage),