Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yangkaifeng
uni-app
提交
f7865c2e
U
uni-app
项目概览
yangkaifeng
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
3
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,发现更多精彩内容 >>
提交
f7865c2e
编写于
4月 28, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove unnecessary inject options
上级
6c6c32bc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
31 deletion
+30
-31
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+17
-17
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
+6
-8
packages/vite-plugin-uni/src/configResolved/plugins/inject.ts
...ages/vite-plugin-uni/src/configResolved/plugins/inject.ts
+7
-6
未找到文件。
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
f7865c2e
...
...
@@ -447,7 +447,7 @@ var safeAreaInsets = {
onChange
,
offChange
};
var
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
=
safeAreaInsets
;
var
out
=
safeAreaInsets
;
const
onEventPrevent
=
/* @__PURE__ */
withModifiers
(()
=>
{
},
[
"
prevent
"
]);
const
onEventStop
=
/* @__PURE__ */
withModifiers
(()
=>
{
...
...
@@ -459,10 +459,10 @@ function getWindowOffset() {
const
left
=
parseInt
(
style2
.
getPropertyValue
(
"
--window-left
"
));
const
right
=
parseInt
(
style2
.
getPropertyValue
(
"
--window-right
"
));
return
{
top
:
top
?
top
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
:
0
,
bottom
:
bottom
?
bottom
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
:
0
,
left
:
left
?
left
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
:
0
,
right
:
right
?
right
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
:
0
top
:
top
?
top
+
out
.
top
:
0
,
bottom
:
bottom
?
bottom
+
out
.
bottom
:
0
,
left
:
left
?
left
+
out
.
left
:
0
,
right
:
right
?
right
+
out
.
right
:
0
};
}
const
style
=
document
.
documentElement
.
style
;
...
...
@@ -1113,7 +1113,7 @@ function normalizePageMeta(pageMeta) {
let
offset
=
rpx2px
(
refreshOptions
.
offset
);
const
{
type
}
=
navigationBar
;
if
(
type
!==
"
transparent
"
&&
type
!==
"
none
"
)
{
offset
+=
NAVBAR_HEIGHT
+
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
;
offset
+=
NAVBAR_HEIGHT
+
out
.
top
;
}
refreshOptions
.
offset
=
offset
;
refreshOptions
.
height
=
rpx2px
(
refreshOptions
.
height
);
...
...
@@ -11380,7 +11380,7 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
const
windowWidth
=
getWindowWidth
(
screenWidth
);
let
windowHeight
=
window
.
innerHeight
;
const
language
=
navigator
.
language
;
const
statusBarHeight
=
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
;
const
statusBarHeight
=
out
.
top
;
let
osname
;
let
osversion
;
let
model
;
...
...
@@ -11493,12 +11493,12 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
const
system
=
`
${
osname
}
${
osversion
}
`
;
const
platform
=
osname
.
toLocaleLowerCase
();
const
safeArea
=
{
left
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
,
right
:
windowWidth
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
top
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
,
bottom
:
windowHeight
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
,
width
:
windowWidth
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out
.
left
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
height
:
windowHeight
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out
.
top
-
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
left
:
out
.
left
,
right
:
windowWidth
-
out
.
right
,
top
:
out
.
top
,
bottom
:
windowHeight
-
out
.
bottom
,
width
:
windowWidth
-
out
.
left
-
out
.
right
,
height
:
windowHeight
-
out
.
top
-
out
.
bottom
};
const
{
top
:
windowTop
,
bottom
:
windowBottom
}
=
getWindowOffset
();
windowHeight
-=
windowTop
;
...
...
@@ -11518,10 +11518,10 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => {
model
,
safeArea
,
safeAreaInsets
:
{
top
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
top
,
right
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
right
,
bottom
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
bottom
,
left
:
D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_
out
.
left
top
:
out
.
top
,
right
:
out
.
right
,
bottom
:
out
.
bottom
,
left
:
out
.
left
}
};
});
...
...
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
浏览文件 @
f7865c2e
...
...
@@ -94,14 +94,14 @@ export function initPlugins(
// h5平台需要为非App.vue组件自动增加scoped
addPlugin
(
plugins
,
uniCssScopedPlugin
(
Object
.
assign
(
uniCssScopedPluginOptions
,
options
)),
uniCssScopedPlugin
(
extend
(
uniCssScopedPluginOptions
,
options
)),
0
,
'
pre
'
)
}
addPlugin
(
plugins
,
uniPrePlugin
(
Object
.
assign
(
uniPrePluginOptions
,
options
)),
uniPrePlugin
(
extend
(
uniPrePluginOptions
,
options
)),
0
,
'
pre
'
)
...
...
@@ -111,7 +111,7 @@ export function initPlugins(
addPlugin
(
plugins
,
uniPreCssPlugin
(
Object
.
assign
(
uniPreCssPluginOptions
,
options
)),
uniPreCssPlugin
(
extend
(
uniPreCssPluginOptions
,
options
)),
'
vite:css
'
)
addPlugin
(
plugins
,
uniPreVuePlugin
(),
'
vite:vue
'
,
'
pre
'
)
...
...
@@ -122,9 +122,7 @@ export function initPlugins(
if
(
command
===
'
build
'
)
{
addPlugin
(
plugins
,
uniInjectPlugin
(
Object
.
assign
(
uniInjectPluginOptions
,
options
,
injectOptions
)
),
uniInjectPlugin
(
extend
(
uniInjectPluginOptions
,
injectOptions
)),
'
vite:vue
'
)
}
else
{
...
...
@@ -132,7 +130,7 @@ export function initPlugins(
addPlugin
(
plugins
,
uniInjectPlugin
(
extend
({
exclude
:
[...
COMMON_EXCLUDE
]
},
options
,
injectOptions
)
extend
({
exclude
:
[...
COMMON_EXCLUDE
]
},
injectOptions
)
),
'
vite:vue
'
)
...
...
@@ -141,7 +139,7 @@ export function initPlugins(
addPlugin
(
plugins
,
uniEasycomPlugin
(
Object
.
assign
(
uniEasycomPluginOptions
,
options
)),
uniEasycomPlugin
(
extend
(
uniEasycomPluginOptions
,
options
)),
'
vite:vue
'
)
addPlugin
(
plugins
,
uniPageVuePlugin
(
options
),
'
vite:vue
'
)
...
...
packages/vite-plugin-uni/src/configResolved/plugins/inject.ts
浏览文件 @
f7865c2e
import
path
,
{
sep
}
from
'
path
'
import
debug
from
'
debug
'
import
{
Plugin
,
ViteDevServer
}
from
'
vite
'
import
{
Plugin
}
from
'
vite
'
import
{
BaseNode
,
...
...
@@ -15,6 +15,7 @@ import {
import
{
attachScopes
,
createFilter
,
FilterPattern
,
makeLegalIdentifier
,
}
from
'
@rollup/pluginutils
'
import
{
AcornNode
}
from
'
rollup
'
...
...
@@ -38,15 +39,16 @@ interface Scope {
type
Injectment
=
string
|
[
string
,
string
]
export
interface
InjectOptions
extends
UniPluginFilterOptions
{
export
interface
InjectOptions
{
sourceMap
?:
boolean
callback
?:
(
imports
:
Map
<
any
,
any
>
,
mod
:
[
string
,
string
])
=>
void
include
?:
FilterPattern
exclude
?:
FilterPattern
[
str
:
string
]:
|
Injectment
|
Inject
Options
[
'
include
'
]
|
UniPluginFilter
Options
[
'
include
'
]
|
Boolean
|
ViteDevServer
|
any
|
Function
}
const
debugInject
=
debug
(
'
uni:inject
'
)
...
...
@@ -60,7 +62,6 @@ export function uniInjectPlugin(options: InjectOptions): Plugin {
delete
modules
.
include
delete
modules
.
exclude
delete
modules
.
sourceMap
delete
modules
.
devServer
delete
modules
.
callback
const
modulesMap
=
new
Map
<
string
,
string
|
[
string
,
string
]
>
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录