Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
e6505fde
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,发现更多精彩内容 >>
提交
e6505fde
编写于
3月 04, 2022
作者:
fxy060608
提交者:
qiang
3月 07, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore(mp): improve error messages
上级
32eadbb5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
139 addition
and
110 deletion
+139
-110
packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js
...pack-uni-mp-loader/lib/babel/global-component-traverse.js
+52
-40
packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js
...pack-uni-mp-loader/lib/babel/scoped-component-traverse.js
+76
-65
packages/webpack-uni-mp-loader/lib/main-new.js
packages/webpack-uni-mp-loader/lib/main-new.js
+5
-2
packages/webpack-uni-mp-loader/lib/script-new.js
packages/webpack-uni-mp-loader/lib/script-new.js
+6
-3
未找到文件。
packages/webpack-uni-mp-loader/lib/babel/global-component-traverse.js
浏览文件 @
e6505fde
const
path
=
require
(
'
path
'
)
const
t
=
require
(
'
@babel/types
'
)
const
babelTraverse
=
require
(
'
@babel/traverse
'
).
default
const
{
parseComponents
}
=
require
(
'
./util
'
)
const
{
normalizePath
}
=
require
(
'
@dcloudio/uni-cli-shared
'
)
const
{
parseComponents
}
=
require
(
'
./util
'
)
const
uniI18n
=
require
(
'
@dcloudio/uni-cli-i18n
'
)
module
.
exports
=
function
(
ast
,
state
=
{})
{
const
imports
=
[]
let
nodePath
=
false
babelTraverse
(
ast
,
{
CallExpression
(
path
)
{
const
callee
=
path
.
node
.
callee
if
(
!
callee
.
object
||
!
callee
.
property
)
{
return
}
const
objectName
=
callee
.
object
.
name
const
propertyName
=
callee
.
property
.
name
if
(
propertyName
===
'
component
'
&&
(
objectName
===
'
Vue
'
||
objectName
===
'
app
'
)
)
{
const
args
=
path
.
node
.
arguments
const
nameNode
=
args
[
0
]
const
valueNode
=
args
[
1
]
nodePath
=
path
if
(
!
t
.
isStringLiteral
(
nameNode
))
{
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.firstParameterNeedStaticString
'
,
{
0
:
objectName
+
'
.component()
'
})
)
try
{
babelTraverse
(
ast
,
{
CallExpression
(
path
)
{
const
callee
=
path
.
node
.
callee
if
(
!
callee
.
object
||
!
callee
.
property
)
{
return
}
if
(
!
t
.
isIdentifier
(
valueNode
))
{
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.requireTwoParameter
'
,
{
0
:
objectName
+
'
.component()
'
})
)
const
objectName
=
callee
.
object
.
name
const
propertyName
=
callee
.
property
.
name
if
(
propertyName
===
'
component
'
&&
(
objectName
===
'
Vue
'
||
objectName
===
'
app
'
)
)
{
const
args
=
path
.
node
.
arguments
const
nameNode
=
args
[
0
]
const
valueNode
=
args
[
1
]
nodePath
=
path
if
(
!
t
.
isStringLiteral
(
nameNode
))
{
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.firstParameterNeedStaticString
'
,
{
0
:
objectName
+
'
.component()
'
})
)
}
if
(
!
t
.
isIdentifier
(
valueNode
))
{
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.requireTwoParameter
'
,
{
0
:
objectName
+
'
.component()
'
})
)
}
imports
.
push
({
name
:
nameNode
.
value
,
value
:
valueNode
.
name
})
}
imports
.
push
({
name
:
nameNode
.
value
,
value
:
valueNode
.
name
})
}
})
if
(
imports
.
length
)
{
state
.
components
=
parseComponents
(
imports
,
nodePath
)
}
else
{
state
.
components
=
[]
}
}
catch
(
e
)
{
if
(
state
.
filename
)
{
console
.
error
(
'
at
'
+
normalizePath
(
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
state
.
filename
))
+
'
:1
'
)
}
})
if
(
imports
.
length
)
{
state
.
components
=
parseComponents
(
imports
,
nodePath
)
}
else
{
state
.
components
=
[]
throw
e
}
return
{
ast
,
state
}
}
}
packages/webpack-uni-mp-loader/lib/babel/scoped-component-traverse.js
浏览文件 @
e6505fde
const
path
=
require
(
'
path
'
)
const
t
=
require
(
'
@babel/types
'
)
const
babelTraverse
=
require
(
'
@babel/traverse
'
).
default
const
{
normalizePath
}
=
require
(
'
@dcloudio/uni-cli-shared
'
)
const
{
parseComponents
}
=
require
(
'
./util
'
)
...
...
@@ -107,77 +110,85 @@ module.exports = function (ast, state = {
components
:
[],
options
:
{}
})
{
babelTraverse
(
ast
,
{
CallExpression
(
path
)
{
const
callee
=
path
.
node
.
callee
const
args
=
path
.
node
.
arguments
const
objExpr
=
args
[
0
]
if
(
t
.
isIdentifier
(
callee
)
&&
callee
.
name
===
'
defineComponent
'
&&
args
.
length
===
1
&&
t
.
isObjectExpression
(
objExpr
)
)
{
handleObjectExpression
(
objExpr
,
path
,
state
)
}
},
AssignmentExpression
(
path
)
{
const
leftExpression
=
path
.
node
.
left
const
rightExpression
=
path
.
node
.
right
try
{
babelTraverse
(
ast
,
{
CallExpression
(
path
)
{
const
callee
=
path
.
node
.
callee
const
args
=
path
.
node
.
arguments
const
objExpr
=
args
[
0
]
if
(
t
.
isIdentifier
(
callee
)
&&
callee
.
name
===
'
defineComponent
'
&&
args
.
length
===
1
&&
t
.
isObjectExpression
(
objExpr
)
)
{
handleObjectExpression
(
objExpr
,
path
,
state
)
}
},
AssignmentExpression
(
path
)
{
const
leftExpression
=
path
.
node
.
left
const
rightExpression
=
path
.
node
.
right
if
(
// global['__wxVueOptions'] = {'van-button':VanButton}
t
.
isMemberExpression
(
leftExpression
)
&&
t
.
isObjectExpression
(
rightExpression
)
&&
leftExpression
.
object
.
name
===
'
global
'
&&
leftExpression
.
property
.
value
===
'
__wxVueOptions
'
)
{
handleObjectExpression
(
rightExpression
,
path
,
state
)
}
if
(
// global['__wxVueOptions'] = {'van-button':VanButton}
t
.
isMemberExpression
(
leftExpression
)
&&
t
.
isObjectExpression
(
rightExpression
)
&&
leftExpression
.
object
.
name
===
'
global
'
&&
leftExpression
.
property
.
value
===
'
__wxVueOptions
'
)
{
handleObjectExpression
(
rightExpression
,
path
,
state
)
}
if
(
// exports.default.components = Object.assign({'van-button': VanButton}, exports.default.components || {})
t
.
isMemberExpression
(
leftExpression
)
&&
t
.
isCallExpression
(
rightExpression
)
&&
leftExpression
.
property
.
name
===
'
components
'
&&
t
.
isMemberExpression
(
leftExpression
.
object
)
&&
leftExpression
.
object
.
object
.
name
===
'
exports
'
&&
leftExpression
.
object
.
property
.
name
===
'
default
'
&&
rightExpression
.
arguments
.
length
===
2
&&
t
.
isObjectExpression
(
rightExpression
.
arguments
[
0
])
)
{
handleComponentsObjectExpression
(
rightExpression
.
arguments
[
0
],
path
,
state
,
true
)
}
},
ExportDefaultDeclaration
(
path
)
{
const
declaration
=
path
.
node
.
declaration
if
(
t
.
isObjectExpression
(
declaration
))
{
// export default {components:{}}
handleObjectExpression
(
declaration
,
path
,
state
)
}
else
if
(
t
.
isIdentifier
(
declaration
))
{
handleIdentifier
(
declaration
,
path
,
state
)
}
else
if
(
t
.
isCallExpression
(
declaration
)
&&
t
.
isMemberExpression
(
declaration
.
callee
)
&&
declaration
.
arguments
.
length
===
1
)
{
// export default Vue.extend({components:{}})
if
(
declaration
.
callee
.
object
.
name
===
'
Vue
'
&&
declaration
.
callee
.
property
.
name
===
'
extend
'
)
{
const
argument
=
declaration
.
arguments
[
0
]
if
(
t
.
isObjectExpression
(
argument
))
{
handleObjectExpression
(
argument
,
path
,
state
)
}
else
if
(
t
.
isIdentifier
(
argument
))
{
handleIdentifier
(
argument
,
path
,
state
)
}
if
(
// exports.default.components = Object.assign({'van-button': VanButton}, exports.default.components || {})
t
.
isMemberExpression
(
leftExpression
)
&&
t
.
isCallExpression
(
rightExpression
)
&&
leftExpression
.
property
.
name
===
'
components
'
&&
t
.
isMemberExpression
(
leftExpression
.
object
)
&&
leftExpression
.
object
.
object
.
name
===
'
exports
'
&&
leftExpression
.
object
.
property
.
name
===
'
default
'
&&
rightExpression
.
arguments
.
length
===
2
&&
t
.
isObjectExpression
(
rightExpression
.
arguments
[
0
])
)
{
handleComponentsObjectExpression
(
rightExpression
.
arguments
[
0
],
path
,
state
,
true
)
}
}
else
if
(
t
.
isClassDeclaration
(
declaration
)
&&
declaration
.
decorators
&&
declaration
.
decorators
.
length
)
{
// export default @Component({components:{}}) class MyComponent extend Vue
const
componentDecorator
=
declaration
.
decorators
[
0
]
if
(
t
.
isCallExpression
(
componentDecorator
.
expression
))
{
const
args
=
componentDecorator
.
expression
.
arguments
if
(
args
&&
args
.
length
&&
t
.
isObjectExpression
(
args
[
0
]))
{
handleObjectExpression
(
args
[
0
],
path
,
state
)
},
ExportDefaultDeclaration
(
path
)
{
const
declaration
=
path
.
node
.
declaration
if
(
t
.
isObjectExpression
(
declaration
))
{
// export default {components:{}}
handleObjectExpression
(
declaration
,
path
,
state
)
}
else
if
(
t
.
isIdentifier
(
declaration
))
{
handleIdentifier
(
declaration
,
path
,
state
)
}
else
if
(
t
.
isCallExpression
(
declaration
)
&&
t
.
isMemberExpression
(
declaration
.
callee
)
&&
declaration
.
arguments
.
length
===
1
)
{
// export default Vue.extend({components:{}})
if
(
declaration
.
callee
.
object
.
name
===
'
Vue
'
&&
declaration
.
callee
.
property
.
name
===
'
extend
'
)
{
const
argument
=
declaration
.
arguments
[
0
]
if
(
t
.
isObjectExpression
(
argument
))
{
handleObjectExpression
(
argument
,
path
,
state
)
}
else
if
(
t
.
isIdentifier
(
argument
))
{
handleIdentifier
(
argument
,
path
,
state
)
}
}
}
else
if
(
t
.
isClassDeclaration
(
declaration
)
&&
declaration
.
decorators
&&
declaration
.
decorators
.
length
)
{
// export default @Component({components:{}}) class MyComponent extend Vue
const
componentDecorator
=
declaration
.
decorators
[
0
]
if
(
t
.
isCallExpression
(
componentDecorator
.
expression
))
{
const
args
=
componentDecorator
.
expression
.
arguments
if
(
args
&&
args
.
length
&&
t
.
isObjectExpression
(
args
[
0
]))
{
handleObjectExpression
(
args
[
0
],
path
,
state
)
}
}
}
}
})
}
catch
(
e
)
{
if
(
state
.
filename
)
{
console
.
error
(
'
at
'
+
normalizePath
(
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
state
.
filename
))
+
'
:1
'
)
}
})
throw
e
}
return
{
ast
,
state
...
...
packages/webpack-uni-mp-loader/lib/main-new.js
浏览文件 @
e6505fde
...
...
@@ -92,12 +92,15 @@ createPage(Page)
components
}
}
=
traverse
(
parser
.
parse
(
content
,
getBabelParserOptions
()),
{
filename
:
this
.
resourcePath
,
components
:
[]
})
const
babelLoader
=
findBabelLoader
(
this
.
loaders
)
if
(
!
babelLoader
)
{
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.findFail
'
,
{
0
:
'
babel-loader
'
}))
throw
new
Error
(
uniI18n
.
__
(
'
mpLoader.findFail
'
,
{
0
:
'
babel-loader
'
}))
}
else
{
addCreateApp
(
babelLoader
)
}
...
...
@@ -144,4 +147,4 @@ createPage(Page)
callback
(
err
,
content
,
map
)
})
}
}
}
packages/webpack-uni-mp-loader/lib/script-new.js
浏览文件 @
e6505fde
...
...
@@ -83,7 +83,8 @@ module.exports = function (content, map) {
}
}
=
traverse
(
parser
.
parse
(
content
,
getBabelParserOptions
()),
{
type
,
components
:
[]
components
:
[],
filename
:
this
.
resourcePath
})
const
callback
=
this
.
async
()
...
...
@@ -126,7 +127,9 @@ module.exports = function (content, map) {
const
babelLoader
=
findBabelLoader
(
this
.
loaders
)
if
(
!
babelLoader
)
{
callback
(
new
Error
(
uniI18n
.
__
(
'
mpLoader.findFail
'
,
{
0
:
'
babel-loader
'
})),
content
)
callback
(
new
Error
(
uniI18n
.
__
(
'
mpLoader.findFail
'
,
{
0
:
'
babel-loader
'
})),
content
)
}
else
{
addDynamicImport
(
babelLoader
,
resourcePath
,
dynamicImports
)
...
...
@@ -136,4 +139,4 @@ module.exports = function (content, map) {
},
err
=>
{
callback
(
err
,
content
,
map
)
})
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录