From 79a83bc17db0914bdf68b422cf912e5f43a0fbc2 Mon Sep 17 00:00:00 2001 From: "qingwei.li" Date: Tue, 30 May 2017 15:27:04 +0800 Subject: [PATCH] fix(ssr): file path --- packages/docsify-server-renderer/index.js | 3 ++- src/core/router/util.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/docsify-server-renderer/index.js b/packages/docsify-server-renderer/index.js index d790a0f8..80cbf42b 100644 --- a/packages/docsify-server-renderer/index.js +++ b/packages/docsify-server-renderer/index.js @@ -5,6 +5,7 @@ import { Compiler } from '../../src/core/render/compiler' import { isAbsolutePath } from '../../src/core/router/util' import { readFileSync } from 'fs' import { resolve, basename } from 'path' +import resolvePathname from 'resolve-pathname' function cwd (...args) { return resolve(process.cwd(), ...args) @@ -131,7 +132,7 @@ export default class Renderer { const fileName = basename(filePath) - return await this._loadFile(cwd(filePath, '../..', fileName)) + return await this._loadFile(resolvePathname(`../${fileName}`, filePath)) } } } diff --git a/src/core/router/util.js b/src/core/router/util.js index 4a4221fc..e2c9bc7c 100644 --- a/src/core/router/util.js +++ b/src/core/router/util.js @@ -36,7 +36,7 @@ export function getPath (...args) { } export const isAbsolutePath = cached(path => { - return /(:|(\/{2}))/.test(path) + return /(:|(\/{2}))/g.test(path) }) export const getParentPath = cached(path => {