Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
432625a2
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,发现更多精彩内容 >>
提交
432625a2
编写于
4月 23, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(h5): automator
上级
3eb5e84d
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
33 addition
and
22 deletion
+33
-22
packages/uni-automator/dist/index.js
packages/uni-automator/dist/index.js
+2
-2
packages/vue-cli-plugin-uni/commands/build.js
packages/vue-cli-plugin-uni/commands/build.js
+1
-11
packages/vue-cli-plugin-uni/commands/serve.js
packages/vue-cli-plugin-uni/commands/serve.js
+6
-2
packages/vue-cli-plugin-uni/commands/util.js
packages/vue-cli-plugin-uni/commands/util.js
+15
-0
packages/vue-cli-plugin-uni/lib/h5/index.js
packages/vue-cli-plugin-uni/lib/h5/index.js
+3
-2
packages/vue-cli-plugin-uni/lib/mp/index.js
packages/vue-cli-plugin-uni/lib/mp/index.js
+2
-5
packages/vue-cli-plugin-uni/lib/util.js
packages/vue-cli-plugin-uni/lib/util.js
+4
-0
未找到文件。
packages/uni-automator/dist/index.js
浏览文件 @
432625a2
此差异已折叠。
点击以展开。
packages/vue-cli-plugin-uni/commands/build.js
浏览文件 @
432625a2
...
@@ -35,17 +35,7 @@ module.exports = (api, options) => {
...
@@ -35,17 +35,7 @@ module.exports = (api, options) => {
}
}
}
}
const
port
=
args
[
'
auto-port
'
]
||
process
.
env
.
UNI_AUTOMATOR_PORT
require
(
'
./util
'
).
initAutomator
(
args
)
if
(
port
)
{
const
host
=
args
[
'
auto-host
'
]
||
process
.
env
.
UNI_AUTOMATOR_HOST
||
'
0.0.0.0
'
const
prepareURLs
=
require
(
'
@vue/cli-service/lib/util/prepareURLs
'
)
const
urls
=
prepareURLs
(
'
ws
'
,
host
,
port
,
''
)
if
(
urls
.
lanUrlForConfig
)
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
'
ws://
'
+
urls
.
lanUrlForConfig
+
'
:
'
+
port
}
else
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
urls
.
localUrlForBrowser
}
}
args
.
entry
=
args
.
entry
||
args
.
_
[
0
]
args
.
entry
=
args
.
entry
||
args
.
_
[
0
]
...
...
packages/vue-cli-plugin-uni/commands/serve.js
浏览文件 @
432625a2
...
@@ -21,10 +21,14 @@ module.exports = (api, options) => {
...
@@ -21,10 +21,14 @@ module.exports = (api, options) => {
'
--host
'
:
`specify host (default:
${
defaults
.
host
}
)`
,
'
--host
'
:
`specify host (default:
${
defaults
.
host
}
)`
,
'
--port
'
:
`specify port (default:
${
defaults
.
port
}
)`
,
'
--port
'
:
`specify port (default:
${
defaults
.
port
}
)`
,
'
--https
'
:
`use https (default:
${
defaults
.
https
}
)`
,
'
--https
'
:
`use https (default:
${
defaults
.
https
}
)`
,
'
--public
'
:
'
specify the public network URL for the HMR client
'
'
--public
'
:
'
specify the public network URL for the HMR client
'
,
'
--auto-host
'
:
'
specify automator host
'
,
'
--auto-port
'
:
'
specify automator port
'
}
}
},
async
function
serve
(
args
)
{
},
async
function
serve
(
args
)
{
info
(
'
Starting development server...
'
)
info
(
'
Starting development server...
'
)
require
(
'
./util
'
).
initAutomator
(
args
)
// although this is primarily a dev server, it is possible that we
// although this is primarily a dev server, it is possible that we
// are running it in a mode with a production env, e.g. in E2E tests.
// are running it in a mode with a production env, e.g. in E2E tests.
...
...
packages/vue-cli-plugin-uni/commands/util.js
0 → 100644
浏览文件 @
432625a2
module
.
exports
=
{
initAutomator
(
args
)
{
const
port
=
args
[
'
auto-port
'
]
||
process
.
env
.
UNI_AUTOMATOR_PORT
if
(
port
)
{
const
host
=
args
[
'
auto-host
'
]
||
process
.
env
.
UNI_AUTOMATOR_HOST
||
'
0.0.0.0
'
const
prepareURLs
=
require
(
'
@vue/cli-service/lib/util/prepareURLs
'
)
const
urls
=
prepareURLs
(
'
ws
'
,
host
,
port
,
''
)
if
(
urls
.
lanUrlForConfig
)
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
'
ws://
'
+
urls
.
lanUrlForConfig
+
'
:
'
+
port
}
else
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
urls
.
localUrlForBrowser
}
}
}
}
packages/vue-cli-plugin-uni/lib/h5/index.js
浏览文件 @
432625a2
...
@@ -116,7 +116,8 @@ module.exports = {
...
@@ -116,7 +116,8 @@ module.exports = {
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
options
:
{
options
:
{
before
:
[
before
:
[
beforeCode
+
statCode
+
getGlobalUsingComponentsCode
()
beforeCode
+
require
(
'
../util
'
).
getAutomatorCode
()
+
statCode
+
getGlobalUsingComponentsCode
()
]
]
}
}
}]
}]
...
@@ -179,4 +180,4 @@ module.exports = {
...
@@ -179,4 +180,4 @@ module.exports = {
require
(
'
./cssnano-options
'
)(
webpackConfig
)
require
(
'
./cssnano-options
'
)(
webpackConfig
)
}
}
}
}
}
}
packages/vue-cli-plugin-uni/lib/mp/index.js
浏览文件 @
432625a2
...
@@ -81,9 +81,6 @@ module.exports = {
...
@@ -81,9 +81,6 @@ module.exports = {
const
beforeCode
=
'
import
\'
uni-pages
\'
;
'
const
beforeCode
=
'
import
\'
uni-pages
\'
;
'
const
automator
=
`@dcloudio/uni-
${
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
}
/dist/automator`
const
automatorCode
=
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
?
`import '
${
automator
}
';`
:
''
return
{
return
{
mode
:
process
.
env
.
NODE_ENV
===
'
production
'
?
'
production
'
:
'
development
'
,
mode
:
process
.
env
.
NODE_ENV
===
'
production
'
?
'
production
'
:
'
development
'
,
entry
()
{
entry
()
{
...
@@ -112,7 +109,7 @@ module.exports = {
...
@@ -112,7 +109,7 @@ module.exports = {
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
options
:
{
options
:
{
before
:
[
before
:
[
beforeCode
+
automatorCode
+
statCode
beforeCode
+
require
(
'
../util
'
).
getAutomatorCode
()
+
statCode
]
]
}
}
},
{
},
{
...
@@ -200,4 +197,4 @@ module.exports = {
...
@@ -200,4 +197,4 @@ module.exports = {
webpackConfig
.
plugins
.
delete
(
'
preload
'
)
webpackConfig
.
plugins
.
delete
(
'
preload
'
)
webpackConfig
.
plugins
.
delete
(
'
prefetch
'
)
webpackConfig
.
plugins
.
delete
(
'
prefetch
'
)
}
}
}
}
packages/vue-cli-plugin-uni/lib/util.js
浏览文件 @
432625a2
...
@@ -12,5 +12,9 @@ module.exports = {
...
@@ -12,5 +12,9 @@ module.exports = {
})
})
}
}
return
partialIdentifier
return
partialIdentifier
},
getAutomatorCode
()
{
const
automator
=
`@dcloudio/uni-
${
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
}
/dist/automator`
return
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
?
`import '
${
automator
}
';`
:
''
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录