Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计算机应用开发
前端
Vuepress
提交
0a7e38ab
V
Vuepress
项目概览
计算机应用开发
/
前端
/
Vuepress
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
Vuepress
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0a7e38ab
编写于
10月 08, 2018
作者:
U
ULIVZ
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix($core): theme/styles/palette.styl doesn't work
BTW, remove Object usage of palette.
上级
0a142ef5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
19 deletion
+8
-19
packages/@vuepress/core/lib/build.js
packages/@vuepress/core/lib/build.js
+1
-1
packages/@vuepress/core/lib/internal-plugins/palette/index.js
...ages/@vuepress/core/lib/internal-plugins/palette/index.js
+7
-15
packages/@vuepress/core/lib/prepare/loadTheme.js
packages/@vuepress/core/lib/prepare/loadTheme.js
+0
-3
未找到文件。
packages/@vuepress/core/lib/build.js
浏览文件 @
0a7e38ab
...
...
@@ -26,7 +26,7 @@ module.exports = async function build (sourceDir, cliOptions = {}) {
return
console
.
error
(
logger
.
error
(
chalk
.
red
(
'
Unexpected option: outDir cannot be set to the current working directory.
\n
'
),
false
))
}
await
fs
.
remove
(
outDir
)
logger
.
debug
(
'
Dist directory:
'
+
chalk
.
gray
(
require
(
'
path
'
)
.
resolve
(
process
.
cwd
(),
outDir
)))
logger
.
debug
(
'
Dist directory:
'
+
chalk
.
gray
(
path
.
resolve
(
process
.
cwd
(),
outDir
)))
let
clientConfig
=
createClientConfig
(
options
,
cliOptions
).
toConfig
()
let
serverConfig
=
createServerConfig
(
options
,
cliOptions
).
toConfig
()
...
...
packages/@vuepress/core/lib/internal-plugins/palette/index.js
浏览文件 @
0a7e38ab
...
...
@@ -24,23 +24,21 @@ module.exports = (options, ctx) => ({
// 2. write palette.styl
const
{
sourceDir
,
writeTemp
}
=
ctx
const
themePalette
=
ctx
.
themePalette
const
{
palette
:
userPalette
}
=
ctx
.
siteConfig
const
palettePath
=
path
.
resolve
(
sourceDir
,
'
.vuepress/styles/palette.styl
'
)
const
themePalette
=
path
.
resolve
(
ctx
.
themePath
,
'
styles/palette.styl
'
)
const
userPalette
=
path
.
resolve
(
sourceDir
,
'
.vuepress/styles/palette.styl
'
)
const
themePaletteContent
=
resolvePaletteContent
(
themePalette
)
const
userPaletteContent
=
resolvePaletteContent
(
userPalette
)
const
userPaletteContent2
=
resolvePaletteContent
(
palettePath
)
// user's palette can override theme's palette.
const
paletteContent
=
themePaletteContent
+
userPaletteContent
+
userPaletteContent2
const
paletteContent
=
themePaletteContent
+
userPaletteContent
await
writeTemp
(
'
palette.styl
'
,
paletteContent
)
}
})
/**
* resolve palette content
* @param {string
|object
} palette
* @param {string} palette
* @returns {string}
*/
...
...
@@ -55,14 +53,8 @@ function resolvePaletteContent (palette) {
return
''
}
if
(
isString
(
palette
))
{
if
(
fs
.
existsSync
(
palette
))
{
return
`@import(
${
JSON
.
stringify
(
palette
)}
)\n`
}
return
''
}
else
if
(
isPlainObject
(
palette
))
{
return
Object
.
keys
(
palette
).
map
(
variableName
=>
{
return
`
${
variableName
}
=
${
palette
[
variableName
]}
`
}).
join
(
'
\n
'
)
+
'
\n
'
if
(
isString
(
palette
)
&&
fs
.
existsSync
(
palette
))
{
return
`@import(
${
JSON
.
stringify
(
palette
)}
)\n`
}
return
''
}
packages/@vuepress/core/lib/prepare/loadTheme.js
浏览文件 @
0a7e38ab
...
...
@@ -69,8 +69,6 @@ module.exports = async function loadTheme (ctx) {
}
// handle theme api
const
{
palette
:
themePalette
}
=
themeEntryFile
const
layoutDirs
=
[
path
.
resolve
(
themePath
,
'
layouts
'
),
path
.
resolve
(
themePath
,
'
.
'
)
...
...
@@ -135,7 +133,6 @@ module.exports = async function loadTheme (ctx) {
themePath
,
layoutComponentMap
,
themeEntryFile
,
themePalette
,
themeName
,
themeShortcut
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录