Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
ad97c98a
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ad97c98a
编写于
12月 31, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into alpha
# Conflicts: # packages/uni-h5/dist/index.umd.min.js
上级
6de798c5
88a8a87c
变更
10
展开全部
隐藏空白更改
内联
并排
Showing
10 changed file
with
108 addition
and
61 deletion
+108
-61
lib/h5/main.js
lib/h5/main.js
+0
-4
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+14
-5
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/MODIFY.md
...ugin-uni/packages/@vue/component-compiler-utils/MODIFY.md
+2
-1
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/dist/compileStyle.js
...ckages/@vue/component-compiler-utils/dist/compileStyle.js
+3
-0
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/dist/stylePlugins/remove-scoped.js
...mponent-compiler-utils/dist/stylePlugins/remove-scoped.js
+61
-0
packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
...vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
+13
-7
packages/vue-cli-plugin-uni/packages/postcss/index.js
packages/vue-cli-plugin-uni/packages/postcss/index.js
+0
-21
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
+0
-21
src/core/vue.js
src/core/vue.js
+14
-1
未找到文件。
lib/h5/main.js
浏览文件 @
ad97c98a
...
...
@@ -47,10 +47,6 @@ Vue.use(require('uni-view/plugins').default, {
routes
:
__uniRoutes
})
Vue
.
config
.
errorHandler
=
function
(
err
,
vm
,
info
)
{
UniServiceJSBridge
.
emit
(
'
onError
'
,
err
)
}
initVue
(
Vue
)
require
(
'
uni-platform/components
'
)
require
(
'
uni-components
'
)
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
ad97c98a
...
...
@@ -12155,9 +12155,22 @@ var serviceContext = (function () {
'
uni-web-view
'
];
function
hasLifecycleHook
(
vueOptions
=
{},
hook
)
{
return
Array
.
isArray
(
vueOptions
[
hook
])
&&
vueOptions
[
hook
].
length
}
// 使用白名单过滤(前期有一批自定义组件使用了 uni-)
function
initVue
(
Vue
)
{
function
initVue
(
Vue
)
{
Vue
.
config
.
errorHandler
=
function
(
err
)
{
const
app
=
getApp
();
if
(
app
&&
hasLifecycleHook
(
app
.
$options
,
'
onError
'
))
{
app
.
__call_hook
(
'
onError
'
,
err
);
}
else
{
console
.
error
(
err
);
}
};
const
oldIsReservedTag
=
Vue
.
config
.
isReservedTag
;
Vue
.
config
.
isReservedTag
=
function
(
tag
)
{
...
...
@@ -12768,10 +12781,6 @@ var serviceContext = (function () {
return
key
}
function
hasLifecycleHook
(
vueOptions
=
{},
hook
)
{
return
Array
.
isArray
(
vueOptions
[
hook
])
&&
vueOptions
[
hook
].
length
}
/* @flow */
const
LIFECYCLE_HOOKS
=
[
...
...
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
ad97c98a
此差异已折叠。
点击以展开。
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/MODIFY.md
浏览文件 @
ad97c98a
dist/compileTemplate
dist/parse
dist/parseCustomBlocks
dist/stylePlugins/scoped.js
\ No newline at end of file
dist/stylePlugins/scoped.js
dist/stylePlugins/remove-scoped.js
\ No newline at end of file
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/dist/compileStyle.js
浏览文件 @
ad97c98a
...
...
@@ -7,6 +7,7 @@ const postcss = require('postcss');
const
trim_1
=
__importDefault
(
require
(
"
./stylePlugins/trim
"
));
const
scoped_1
=
__importDefault
(
require
(
"
./stylePlugins/scoped
"
));
const
styleProcessors_1
=
require
(
"
./styleProcessors
"
);
const
removeScoped_1
=
__importDefault
(
require
(
"
./stylePlugins/remove-scoped
"
));
function
compileStyle
(
options
)
{
return
doCompileStyle
(
Object
.
assign
({},
options
,
{
isAsync
:
false
}));
}
...
...
@@ -27,6 +28,8 @@ function doCompileStyle(options) {
}
if
(
scoped
)
{
plugins
.
push
(
scoped_1
.
default
(
id
));
}
else
{
// fixed by xxxxxx
plugins
.
push
(
removeScoped_1
.
default
(
id
));
}
const
postCSSOptions
=
Object
.
assign
({},
postcssOptions
,
{
to
:
filename
,
from
:
filename
});
if
(
map
)
{
...
...
packages/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/dist/stylePlugins/remove-scoped.js
0 → 100644
浏览文件 @
ad97c98a
"
use strict
"
;
var
__importStar
=
(
this
&&
this
.
__importStar
)
||
function
(
mod
)
{
if
(
mod
&&
mod
.
__esModule
)
return
mod
;
var
result
=
{};
if
(
mod
!=
null
)
for
(
var
k
in
mod
)
if
(
Object
.
hasOwnProperty
.
call
(
mod
,
k
))
result
[
k
]
=
mod
[
k
];
result
[
"
default
"
]
=
mod
;
return
result
;
};
Object
.
defineProperty
(
exports
,
"
__esModule
"
,
{
value
:
true
});
const
postcss
=
__importStar
(
require
(
"
postcss
"
));
// postcss-selector-parser does have typings but it's problematic to work with.
const
selectorParser
=
require
(
'
postcss-selector-parser
'
);
exports
.
default
=
postcss
.
plugin
(
'
remove-scoped
'
,
(
options
)
=>
(
root
)
=>
{
root
.
each
(
function
rewriteSelector
(
node
)
{
if
(
!
node
.
selector
)
{
// handle media queries
if
(
node
.
type
===
'
atrule
'
)
{
if
(
node
.
name
===
'
media
'
||
node
.
name
===
'
supports
'
)
{
node
.
each
(
rewriteSelector
);
}
}
return
;
}
node
.
selector
=
selectorParser
((
selectors
)
=>
{
selectors
.
each
((
selector
)
=>
{
let
node
=
null
;
// find the last child node to insert attribute selector
selector
.
each
((
n
)
=>
{
// ">>>" combinator
// and /deep/ alias for >>>, since >>> doesn't work in SASS
if
(
n
.
type
===
'
combinator
'
&&
(
n
.
value
===
'
>>>
'
||
n
.
value
===
'
/deep/
'
))
{
n
.
value
=
'
'
;
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
;
return
false
;
}
// in newer versions of sass, /deep/ support is also dropped, so add a ::v-deep alias
if
(
n
.
type
===
'
pseudo
'
&&
n
.
value
===
'
::v-deep
'
)
{
n
.
value
=
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
;
return
false
;
}
if
(
n
.
type
!==
'
pseudo
'
&&
n
.
type
!==
'
combinator
'
)
{
node
=
n
;
}
});
if
(
node
)
{
node
.
spaces
.
after
=
''
;
}
else
{
// For deep selectors & standalone pseudo selectors,
// the attribute selectors are prepended rather than appended.
// So all leading spaces must be eliminated to avoid problems.
selector
.
first
.
spaces
.
before
=
''
;
}
});
}).
processSync
(
node
.
selector
);
});
});
packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
浏览文件 @
ad97c98a
...
...
@@ -5808,8 +5808,14 @@ function getTarget(obj, path) {
function
internalMixin
(
Vue
)
{
Vue
.
config
.
errorHandler
=
function
(
err
)
{
console
.
error
(
err
);
Vue
.
config
.
errorHandler
=
function
(
err
)
{
/* eslint-disable no-undef */
var
app
=
getApp
();
if
(
app
&&
app
.
onError
)
{
app
.
onError
(
err
);
}
else
{
console
.
error
(
err
);
}
};
var
oldEmit
=
Vue
.
prototype
.
$emit
;
...
...
@@ -5832,14 +5838,14 @@ function internalMixin(Vue) {
if
(
this
.
$scope
&&
this
.
$scope
[
method
])
{
return
this
.
$scope
[
method
](
args
)
}
// mp-alipay
if
(
typeof
my
===
'
undefined
'
){
return
// mp-alipay
if
(
typeof
my
===
'
undefined
'
)
{
return
}
if
(
method
===
'
createSelectorQuery
'
)
{
if
(
method
===
'
createSelectorQuery
'
)
{
/* eslint-disable no-undef */
return
my
.
createSelectorQuery
(
args
)
}
else
if
(
method
===
'
createIntersectionObserver
'
)
{
}
else
if
(
method
===
'
createIntersectionObserver
'
)
{
/* eslint-disable no-undef */
return
my
.
createIntersectionObserver
(
args
)
}
...
...
packages/vue-cli-plugin-uni/packages/postcss/index.js
浏览文件 @
ad97c98a
...
...
@@ -212,27 +212,6 @@ if (process.env.UNI_USING_V3) {
}
else
{
root
.
walkRules
(
rule
=>
{
const
selectors
=
transformSelector
(
rule
.
selectors
.
join
(
'
,
'
),
function
(
selectors
)
{
selectors
.
each
((
selector
)
=>
{
// find the last child node to insert attribute selector
selector
.
each
((
n
)
=>
{
// ">>>" combinator
// and /deep/ alias for >>>, since >>> doesn't work in SASS
if
(
n
.
type
===
'
combinator
'
&&
(
n
.
value
===
'
>>>
'
||
n
.
value
===
'
/deep/
'
))
{
n
.
value
=
'
'
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
return
false
}
// in newer versions of sass, /deep/ support is also dropped, so add a ::v-deep alias
if
(
n
.
type
===
'
pseudo
'
&&
n
.
value
===
'
::v-deep
'
)
{
n
.
value
=
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
return
false
}
})
})
selectors
.
walkUniversals
(
node
=>
{
node
.
parent
.
remove
()
})
...
...
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
浏览文件 @
ad97c98a
...
...
@@ -22,27 +22,6 @@ module.exports = postcss.plugin('postcss-uniapp-plugin', function (opts) {
// complexSelector => simpleSelectors
// "a.b#c" => ["a", ".b", "#c"]
transformSelector
(
complexSelector
,
simpleSelectors
=>
{
simpleSelectors
.
each
((
selector
)
=>
{
// find the last child node to insert attribute selector
selector
.
each
((
n
)
=>
{
// ">>>" combinator
// and /deep/ alias for >>>, since >>> doesn't work in SASS
if
(
n
.
type
===
'
combinator
'
&&
(
n
.
value
===
'
>>>
'
||
n
.
value
===
'
/deep/
'
))
{
n
.
value
=
'
'
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
return
false
}
// in newer versions of sass, /deep/ support is also dropped, so add a ::v-deep alias
if
(
n
.
type
===
'
pseudo
'
&&
n
.
value
===
'
::v-deep
'
)
{
n
.
value
=
n
.
spaces
.
before
=
n
.
spaces
.
after
=
''
return
false
}
})
})
// only process type selector, leave alone class & id selectors
return
simpleSelectors
.
walkTags
(
tag
=>
{
if
(
tag
.
value
===
'
page
'
)
{
...
...
src/core/vue.js
浏览文件 @
ad97c98a
// 使用白名单过滤(前期有一批自定义组件使用了 uni-)
import
tags
from
'
uni-helpers/tags
'
export
default
function
initVue
(
Vue
)
{
import
{
hasLifecycleHook
}
from
'
uni-helpers/index
'
export
default
function
initVue
(
Vue
)
{
Vue
.
config
.
errorHandler
=
function
(
err
)
{
const
app
=
getApp
()
if
(
app
&&
hasLifecycleHook
(
app
.
$options
,
'
onError
'
))
{
app
.
__call_hook
(
'
onError
'
,
err
)
}
else
{
console
.
error
(
err
)
}
}
const
oldIsReservedTag
=
Vue
.
config
.
isReservedTag
Vue
.
config
.
isReservedTag
=
function
(
tag
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录