Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
21f68018
U
uni-app
项目概览
genary
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
21f68018
编写于
11月 17, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore(hbx): format log
上级
b8090531
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
8 deletion
+47
-8
packages/uni-cli-shared/src/hbx/log.ts
packages/uni-cli-shared/src/hbx/log.ts
+32
-1
packages/uni-cli-shared/src/logs/format.ts
packages/uni-cli-shared/src/logs/format.ts
+4
-0
packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts
...ges/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts
+10
-6
packages/vite-plugin-uni/package.json
packages/vite-plugin-uni/package.json
+1
-1
未找到文件。
packages/uni-cli-shared/src/hbx/log.ts
浏览文件 @
21f68018
...
@@ -55,7 +55,6 @@ export const removeWarnFormatter: Formatter = {
...
@@ -55,7 +55,6 @@ export const removeWarnFormatter: Formatter = {
}
}
const
fileRE
=
/file:
\s(
.*
)
:
(\d
+
)
:
(\d
+
)
/
const
fileRE
=
/file:
\s(
.*
)
:
(\d
+
)
:
(\d
+
)
/
export
const
FilenameFormatter
:
Formatter
=
{
export
const
FilenameFormatter
:
Formatter
=
{
test
(
msg
)
{
test
(
msg
)
{
return
fileRE
.
test
(
msg
)
return
fileRE
.
test
(
msg
)
...
@@ -67,6 +66,18 @@ export const FilenameFormatter: Formatter = {
...
@@ -67,6 +66,18 @@ export const FilenameFormatter: Formatter = {
},
},
}
}
const
vueFileRE
=
/file:
\s(
.*
)\?
vue&type=
(
.*
)
/
export
const
VueFilenameFormatter
:
Formatter
=
{
test
(
msg
)
{
return
vueFileRE
.
test
(
msg
)
},
format
(
msg
)
{
return
msg
.
replace
(
vueFileRE
,
(
_
,
filename
)
=>
{
return
`file:
${
filename
.
split
(
'
?
'
)[
0
]}
`
})
},
}
export
const
HBuilderXFileFormatter
:
Formatter
=
{
export
const
HBuilderXFileFormatter
:
Formatter
=
{
test
(
msg
)
{
test
(
msg
)
{
return
fileRE
.
test
(
msg
)
return
fileRE
.
test
(
msg
)
...
@@ -91,3 +102,23 @@ export const HBuilderXFileFormatter: Formatter = {
...
@@ -91,3 +102,23 @@ export const HBuilderXFileFormatter: Formatter = {
)
)
},
},
}
}
export
const
HBuilderXVueFileFormatter
:
Formatter
=
{
test
(
msg
)
{
return
vueFileRE
.
test
(
msg
)
},
format
(
msg
)
{
return
(
msg
// remove color
.
replace
(
/
\x
1B
[
[(?);
]{0,2}(
;
?\d)
*./g
,
''
)
.
replace
(
vueFileRE
,
(
_
,
filename
)
=>
{
return
(
'
at
'
+
normalizePath
(
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
filename
))
+
'
:1
'
)
})
)
},
}
packages/uni-cli-shared/src/logs/format.ts
浏览文件 @
21f68018
...
@@ -8,6 +8,8 @@ import {
...
@@ -8,6 +8,8 @@ import {
removeWarnFormatter
,
removeWarnFormatter
,
FilenameFormatter
,
FilenameFormatter
,
HBuilderXFileFormatter
,
HBuilderXFileFormatter
,
HBuilderXVueFileFormatter
,
VueFilenameFormatter
,
}
from
'
../hbx/log
'
}
from
'
../hbx/log
'
export
interface
Formatter
{
export
interface
Formatter
{
...
@@ -25,8 +27,10 @@ const initErrFormattersOnce = once(() => {
...
@@ -25,8 +27,10 @@ const initErrFormattersOnce = once(() => {
}
}
if
(
runByHBuilderX
())
{
if
(
runByHBuilderX
())
{
errFormatters
.
push
(
HBuilderXFileFormatter
)
errFormatters
.
push
(
HBuilderXFileFormatter
)
errFormatters
.
push
(
HBuilderXVueFileFormatter
)
}
else
{
}
else
{
errFormatters
.
push
(
FilenameFormatter
)
errFormatters
.
push
(
FilenameFormatter
)
errFormatters
.
push
(
VueFilenameFormatter
)
}
}
})
})
...
...
packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/css.ts
浏览文件 @
21f68018
...
@@ -260,11 +260,11 @@ export function cssPostPlugin(
...
@@ -260,11 +260,11 @@ export function cssPostPlugin(
const
processChunkCSS
=
async
(
const
processChunkCSS
=
async
(
css
:
string
,
css
:
string
,
{
{
dir
name
,
file
name
,
inlined
,
inlined
,
minify
,
minify
,
}:
{
}:
{
dir
name
:
string
file
name
:
string
inlined
:
boolean
inlined
:
boolean
minify
:
boolean
minify
:
boolean
}
}
...
@@ -272,13 +272,17 @@ export function cssPostPlugin(
...
@@ -272,13 +272,17 @@ export function cssPostPlugin(
// replace asset url references with resolved url.
// replace asset url references with resolved url.
css
=
css
.
replace
(
assetUrlRE
,
(
_
,
fileHash
,
postfix
=
''
)
=>
{
css
=
css
.
replace
(
assetUrlRE
,
(
_
,
fileHash
,
postfix
=
''
)
=>
{
return
normalizePath
(
return
normalizePath
(
path
.
relative
(
dirname
,
getAssetFilename
(
fileHash
,
config
)
+
postfix
)
path
.
relative
(
path
.
dirname
(
filename
),
getAssetFilename
(
fileHash
,
config
)
+
postfix
)
)
)
})
})
if
(
minify
&&
config
.
build
.
minify
)
{
if
(
minify
&&
config
.
build
.
minify
)
{
css
=
await
minifyCSS
(
css
,
config
)
css
=
await
minifyCSS
(
css
,
config
)
}
}
return
css
// 压缩后再处理,小程序平台会补充 @import nvue 代码,esbuild 的压缩会把 `@import "./nvue.css";` 的空格移除,变成 `@import"./nvue.css";` 在支付宝小程序中不支持
return
chunkCssCode
(
filename
,
css
)
}
}
const
genCssCode
=
(
fileName
:
string
)
=>
{
const
genCssCode
=
(
fileName
:
string
)
=>
{
...
@@ -288,8 +292,8 @@ export function cssPostPlugin(
...
@@ -288,8 +292,8 @@ export function cssPostPlugin(
}
}
for
(
const
filename
of
cssChunks
.
keys
())
{
for
(
const
filename
of
cssChunks
.
keys
())
{
const
cssCode
=
genCssCode
(
filename
)
const
cssCode
=
genCssCode
(
filename
)
let
source
=
await
processChunkCSS
(
c
hunkCssCode
(
filename
,
cssCode
)
,
{
let
source
=
await
processChunkCSS
(
c
ssCode
,
{
dirname
:
path
.
dirname
(
filename
)
,
filename
:
filename
,
inlined
:
false
,
inlined
:
false
,
minify
:
true
,
minify
:
true
,
})
})
...
...
packages/vite-plugin-uni/package.json
浏览文件 @
21f68018
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
"vite"
:
"^2.6.14"
"vite"
:
"^2.6.14"
},
},
"uni-app"
:
{
"uni-app"
:
{
"compilerVersion"
:
"3.2.1
0
"
"compilerVersion"
:
"3.2.1
4
"
},
},
"gitHead"
:
"33e807d66e1fe47e2ee08ad9c59247e37b8884da"
"gitHead"
:
"33e807d66e1fe47e2ee08ad9c59247e37b8884da"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录