Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
菜鸟程序猿_c
uni-app
提交
73c00f2b
U
uni-app
项目概览
菜鸟程序猿_c
/
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,发现更多精彩内容 >>
提交
73c00f2b
编写于
10月 10, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): Compatible with vite@3
上级
c2b95783
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
48 addition
and
19 deletion
+48
-19
packages/uni-cli-shared/src/hbx/log.ts
packages/uni-cli-shared/src/hbx/log.ts
+6
-6
packages/uni-h5-vite/src/plugin/config.ts
packages/uni-h5-vite/src/plugin/config.ts
+8
-0
packages/uni-h5-vite/src/plugin/transformIndexHtml/index.ts
packages/uni-h5-vite/src/plugin/transformIndexHtml/index.ts
+15
-1
packages/uni-uts-vite/src/utils/compiler/kotlin.ts
packages/uni-uts-vite/src/utils/compiler/kotlin.ts
+7
-6
packages/vite-plugin-uni/src/cli/server.ts
packages/vite-plugin-uni/src/cli/server.ts
+12
-6
未找到文件。
packages/uni-cli-shared/src/hbx/log.ts
浏览文件 @
73c00f2b
...
...
@@ -12,8 +12,8 @@ import { EXTNAME_VUE_RE } from '../constants'
import
{
parseVue
}
from
'
../vite/utils/ast
'
import
{
generateCodeFrame
}
from
'
../vite/plugins/vitejs/utils
'
const
SIGNAL_H5_LOCAL
=
'
>
Local:
'
const
SIGNAL_H5_NETWORK
=
'
>
Network:
'
const
SIGNAL_H5_LOCAL
=
'
➜
Local:
'
const
SIGNAL_H5_NETWORK
=
'
➜
Network:
'
const
networkLogs
:
string
[]
=
[]
...
...
@@ -39,19 +39,19 @@ export const h5ServeFormatter: Formatter = {
},
format
(
msg
)
{
if
(
msg
.
includes
(
SIGNAL_H5_NETWORK
))
{
networkLogs
.
push
(
msg
)
networkLogs
.
push
(
msg
.
replace
(
'
➜
'
,
'
➜
'
)
)
process
.
nextTick
(()
=>
{
if
(
networkLogs
.
length
)
{
// 延迟打印所有 network,仅最后一个 network 替换
>
为 -,通知 hbx
// 延迟打印所有 network,仅最后一个 network 替换
➜
为 -,通知 hbx
const
len
=
networkLogs
.
length
-
1
networkLogs
[
len
]
=
networkLogs
[
len
].
replace
(
'
>
'
,
'
-
'
)
networkLogs
[
len
]
=
networkLogs
[
len
].
replace
(
'
➜
'
,
'
-
'
)
console
.
log
(
networkLogs
.
join
(
'
\n
'
))
networkLogs
.
length
=
0
}
})
return
''
}
return
msg
.
replace
(
'
>
'
,
'
-
'
)
return
msg
.
replace
(
'
➜
'
,
'
-
'
)
},
}
...
...
packages/uni-h5-vite/src/plugin/config.ts
浏览文件 @
73c00f2b
import
os
from
'
os
'
import
fs
from
'
fs
'
import
path
from
'
path
'
import
type
{
Plugin
,
ResolvedConfig
,
ServerOptions
}
from
'
vite
'
...
...
@@ -29,6 +30,13 @@ export function createConfig(options: {
const
server
:
ServerOptions
=
{
host
:
true
,
hmr
:
{
// mac 内置浏览器版本较低不支持 globalThis,而 overlay 使用了 globalThis
overlay
:
os
.
platform
()
!==
'
win32
'
?
process
.
env
.
UNI_H5_BROWSER
!==
'
builtin
'
:
true
,
},
fs
:
{
strict
:
false
},
watch
:
{
ignored
:
[
...
...
packages/uni-h5-vite/src/plugin/transformIndexHtml/index.ts
浏览文件 @
73c00f2b
...
...
@@ -6,6 +6,20 @@ export function createTransformIndexHtml(): Plugin['transformIndexHtml'] {
return
async
function
(
html
)
{
const
manifestJson
=
parseManifestJsonOnce
(
process
.
env
.
UNI_INPUT_DIR
)
const
title
=
manifestJson
.
h5
?.
title
||
manifestJson
.
name
||
''
return
html
.
replace
(
/<title>
(
.*
?)
<
\/
title>/
,
`<title>
${
title
}
</title>`
)
return
{
html
:
html
.
replace
(
/<title>
(
.*
?)
<
\/
title>/
,
`<title>
${
title
}
</title>`
),
tags
:
process
.
env
.
NODE_ENV
===
'
development
'
?
[
{
tag
:
'
script
'
,
children
:
`if (typeof globalThis === 'undefined') {
window.globalThis = window
}`
,
injectTo
:
'
head-prepend
'
,
},
]
:
[],
}
}
}
packages/uni-uts-vite/src/utils/compiler/kotlin.ts
浏览文件 @
73c00f2b
...
...
@@ -221,15 +221,16 @@ const getCompilerServer = ():
):
Promise
<
boolean
>
}
|
false
=>
{
try
{
const
compilerServerPath
=
path
.
resolve
(
process
.
env
.
UNI_HBUILDERX_PLUGINS
,
'
uniapp-runextension/out/main.js
'
)
const
compilerServerPath
=
path
.
resolve
(
process
.
env
.
UNI_HBUILDERX_PLUGINS
,
'
uniapp-runextension/out/main.js
'
)
if
(
fs
.
existsSync
(
compilerServerPath
))
{
// eslint-disable-next-line no-restricted-globals
return
require
(
compilerServerPath
)
}
catch
(
e
)
{
}
else
{
installHBuilderXPlugin
(
'
uniapp-runextension
'
)
}
return
false
}
packages/vite-plugin-uni/src/cli/server.ts
浏览文件 @
73c00f2b
...
...
@@ -185,9 +185,9 @@ function printServerUrls(
):
void
{
if
(
hostname
.
host
===
'
127.0.0.1
'
)
{
const
url
=
`
${
protocol
}
://
${
hostname
.
name
}
:
${
colors
.
bold
(
port
)}${
base
}
`
info
(
`
>
Local:
${
colors
.
cyan
(
url
)}
`
)
info
(
`
-
Local:
${
colors
.
cyan
(
url
)}
`
)
if
(
hostname
.
name
!==
'
127.0.0.1
'
)
{
info
(
`
>
Network:
${
colors
.
dim
(
'
use `--host` to expose
'
)}
`
)
info
(
`
-
Network:
${
colors
.
dim
(
'
use `--host` to expose
'
)}
`
)
}
}
else
{
Object
.
values
(
os
.
networkInterfaces
())
...
...
@@ -203,13 +203,19 @@ function printServerUrls(
)
.
map
((
detail
)
=>
{
const
type
=
detail
.
address
.
includes
(
'
127.0.0.1
'
)
?
'
Local:
'
:
'
Network:
'
?
'
-
Local:
'
:
'
➜
Network:
'
const
host
=
detail
.
address
.
replace
(
'
127.0.0.1
'
,
hostname
.
name
)
const
url
=
`
${
protocol
}
://
${
host
}
:
${
colors
.
bold
(
port
)}${
base
}
`
return
` >
${
type
}
${
colors
.
cyan
(
url
)}
`
return
`
${
type
}
${
colors
.
cyan
(
url
)}
`
})
.
forEach
((
msg
,
index
,
arr
)
=>
{
if
(
arr
.
length
-
1
===
index
)
{
info
(
msg
.
replace
(
'
➜
'
,
'
-
'
))
}
else
{
info
(
msg
)
}
})
.
forEach
((
msg
)
=>
info
(
msg
))
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录