Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Velpro187
uni-app
提交
37bca7d0
U
uni-app
项目概览
Velpro187
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
37bca7d0
编写于
7月 29, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
25d02d13
557c8bee
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
28 deletion
+38
-28
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
+30
-27
packages/vue-cli-plugin-uni/lib/chain-webpack.js
packages/vue-cli-plugin-uni/lib/chain-webpack.js
+4
-0
packages/vue-cli-plugin-uni/lib/env.js
packages/vue-cli-plugin-uni/lib/env.js
+3
-0
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
+1
-1
未找到文件。
packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
浏览文件 @
37bca7d0
...
...
@@ -79,6 +79,9 @@ const plugins = [
new
webpack
.
DefinePlugin
({
'
process.env
'
:
{
NODE_ENV
:
JSON
.
stringify
(
process
.
env
.
NODE_ENV
),
UNI_APP_ID
:
JSON
.
stringify
(
process
.
env
.
UNI_APP_ID
),
UNI_APP_NAME
:
JSON
.
stringify
(
process
.
env
.
UNI_APP_NAME
),
UNI_PLATFORM
:
JSON
.
stringify
(
process
.
env
.
UNI_PLATFORM
),
VUE_APP_PLATFORM
:
JSON
.
stringify
(
process
.
env
.
UNI_PLATFORM
),
UNI_CLOUD_PROVIDER
:
process
.
env
.
UNI_CLOUD_PROVIDER
,
HBX_USER_TOKEN
:
JSON
.
stringify
(
process
.
env
.
HBX_USER_TOKEN
||
''
),
...
...
@@ -179,39 +182,39 @@ rules.unshift({
loader
:
'
@dcloudio/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.recycle
'
}]
})
if
(
process
.
env
.
UNI_USING_V3_NATIVE
)
{
try
{
const
automatorJson
=
require
.
resolve
(
'
@dcloudio/uni-automator/dist/automator.json
'
)
plugins
.
push
(
new
CopyWebpackPlugin
([{
from
:
automatorJson
,
to
:
'
../.automator/
'
+
(
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
)
+
'
/.automator.json
'
,
transform
(
content
)
{
if
(
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
)
{
return
JSON
.
stringify
({
version
:
require
(
'
@dcloudio/uni-automator/package.json
'
).
version
,
wsEndpoint
:
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
})
}
return
''
}
}]))
}
catch
(
e
)
{}
}
if
(
process
.
env
.
UNI_USING_V3_NATIVE
)
{
try
{
const
automatorJson
=
require
.
resolve
(
'
@dcloudio/uni-automator/dist/automator.json
'
)
plugins
.
push
(
new
CopyWebpackPlugin
([{
from
:
automatorJson
,
to
:
'
../.automator/
'
+
(
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
)
+
'
/.automator.json
'
,
transform
(
content
)
{
if
(
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
)
{
return
JSON
.
stringify
({
version
:
require
(
'
@dcloudio/uni-automator/package.json
'
).
version
,
wsEndpoint
:
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
})
}
return
''
}
}]))
}
catch
(
e
)
{}
}
if
(
process
.
env
.
UNI_USING_NATIVE
||
process
.
env
.
UNI_USING_V3_NATIVE
)
{
plugins
.
push
(
new
WebpackUniMPPlugin
())
const
array
=
[{
from
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
static
'
),
to
:
'
static
'
}]
const
hybridHtmlPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
hybrid/html
'
)
if
(
fs
.
existsSync
(
hybridHtmlPath
))
{
array
.
push
({
from
:
hybridHtmlPath
,
to
:
'
hybrid/html
'
})
}]
const
hybridHtmlPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
hybrid/html
'
)
if
(
fs
.
existsSync
(
hybridHtmlPath
))
{
array
.
push
({
from
:
hybridHtmlPath
,
to
:
'
hybrid/html
'
})
}
if
(
process
.
env
.
UNI_USING_NVUE_COMPILER
)
{
array
.
push
({
...
...
packages/vue-cli-plugin-uni/lib/chain-webpack.js
浏览文件 @
37bca7d0
...
...
@@ -93,7 +93,11 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
const
deferredCreated
=
process
.
env
.
UNI_PLATFORM
===
'
mp-toutiao
'
||
process
.
env
.
UNI_PLATFORM
===
'
quickapp-webview
'
const
defines
=
{
// UNI_ENV好像没用
'
process.env.UNI_ENV
'
:
JSON
.
stringify
(
process
.
env
.
UNI_PLATFORM
),
'
process.env.UNI_APP_ID
'
:
JSON
.
stringify
(
process
.
env
.
UNI_APP_ID
),
'
process.env.UNI_APP_NAME
'
:
JSON
.
stringify
(
process
.
env
.
UNI_APP_NAME
),
'
process.env.UNI_PLATFORM
'
:
JSON
.
stringify
(
process
.
env
.
UNI_PLATFORM
),
'
process.env.UNI_CLOUD_PROVIDER
'
:
process
.
env
.
UNI_CLOUD_PROVIDER
,
'
process.env.UNICLOUD_DEBUG
'
:
process
.
env
.
UNICLOUD_DEBUG
,
'
process.env.RUN_BY_HBUILDERX
'
:
process
.
env
.
RUN_BY_HBUILDERX
,
...
...
packages/vue-cli-plugin-uni/lib/env.js
浏览文件 @
37bca7d0
...
...
@@ -20,6 +20,9 @@ process.env.UNI_INPUT_DIR = process.env.UNI_INPUT_DIR || path.resolve(process.cw
const
manifestJsonObj
=
require
(
'
@dcloudio/uni-cli-shared/lib/manifest
'
).
getManifestJson
()
process
.
env
.
UNI_APP_ID
=
manifestJsonObj
.
appid
||
''
process
.
env
.
UNI_APP_NAME
=
manifestJsonObj
.
name
||
''
// 小程序 vue3 标记
if
(
process
.
env
.
UNI_PLATFORM
.
indexOf
(
'
mp-
'
)
===
0
)
{
if
(
manifestJsonObj
.
vueVersion
===
'
3
'
||
manifestJsonObj
.
vueVersion
===
3
)
{
...
...
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
浏览文件 @
37bca7d0
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录