提交 377955e4 编写于 作者: fxy060608's avatar fxy060608

Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

......@@ -186,29 +186,17 @@ if (process.env.UNI_PLATFORM === 'app-plus') {
if (platformOptions.nvueCompiler === 'weex') {
isNVueCompiler = false
}
if (
!hasOwn(platformOptions, 'compilerVersion') ||
(
platformOptions.compilerVersion === '3' ||
platformOptions.compilerVersion === 3
)
) {
delete process.env.UNI_USING_CACHE
if (platformOptions.renderer === 'native') {
process.env.UNI_USING_V3_NATIVE = true
} else {
process.env.UNI_USING_V3 = true
platformOptions.usingComponents = true
}
process.env.UNI_OUTPUT_TMP_DIR = ''
// isNVueCompiler = true // v3 目前仅支持 uni-app 模式
} else if (platformOptions.renderer === 'native') {
// 纯原生目前不提供 cache
delete process.env.UNI_USING_CACHE
process.env.UNI_USING_NATIVE = true
process.env.UNI_USING_V8 = true
process.env.UNI_OUTPUT_TMP_DIR = ''
delete process.env.UNI_USING_CACHE
if (platformOptions.renderer === 'native') {
process.env.UNI_USING_V3_NATIVE = true
} else {
process.env.UNI_USING_V3 = true
platformOptions.usingComponents = true
}
process.env.UNI_OUTPUT_TMP_DIR = ''
// isNVueCompiler = true // v3 目前仅支持 uni-app 模式
// v3 支持指定 js 混淆(仅发行模式)
if (
process.env.NODE_ENV === 'production' &&
......@@ -418,4 +406,4 @@ runByHBuilderX && console.log('正在编译中...')
module.exports = {
manifestPlatformOptions: platformOptions
}
}
......@@ -158,7 +158,15 @@ module.exports = function generateJson (compilation) {
const jsFile = name.replace('.json', '.js')
if (
!['app.js', 'manifest.js', 'mini.project.js', 'project.config.js', 'project.swan.js'].includes(jsFile) &&
![
'app.js',
'manifest.js',
'mini.project.js',
'quickapp.config.js',
'project.config.js',
'project.swan.js'
].includes(
jsFile) &&
!compilation.assets[jsFile]
) {
const jsFileAsset = {
......@@ -187,4 +195,4 @@ module.exports = function generateJson (compilation) {
require('@dcloudio/uni-cli-shared/lib/cache').store()
}, 50)
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册