Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
16cc9992
U
uni-app
项目概览
DCloud
/
uni-app
大约 1 个月 前同步成功
通知
702
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,发现更多精彩内容 >>
提交
16cc9992
编写于
3月 13, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore(cli): remove unused
上级
97426838
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
81 deletion
+31
-81
packages/uni-cli-shared/lib/manifest.js
packages/uni-cli-shared/lib/manifest.js
+1
-10
packages/uni-cli-shared/lib/platform.js
packages/uni-cli-shared/lib/platform.js
+2
-14
packages/vue-cli-plugin-uni/generator.js
packages/vue-cli-plugin-uni/generator.js
+4
-6
packages/vue-cli-plugin-uni/lib/env.js
packages/vue-cli-plugin-uni/lib/env.js
+21
-31
packages/vue-cli-plugin-uni/lib/h5/index.js
packages/vue-cli-plugin-uni/lib/h5/index.js
+2
-10
packages/webpack-uni-pages-loader/lib/platforms/h5.js
packages/webpack-uni-pages-loader/lib/platforms/h5.js
+1
-10
未找到文件。
packages/uni-cli-shared/lib/manifest.js
浏览文件 @
16cc9992
...
...
@@ -50,11 +50,7 @@ function getH5Options (manifestJson) {
h5
.
title
=
h5
.
title
||
manifestJson
.
name
||
''
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
// 360 小程序仅支持 hash 模式
h5
.
router
=
Object
.
assign
({},
defaultRouter
)
}
else
{
h5
.
router
=
Object
.
assign
({},
defaultRouter
,
h5
.
router
||
{})
}
h5
.
router
=
Object
.
assign
({},
defaultRouter
,
h5
.
router
||
{})
h5
[
'
async
'
]
=
Object
.
assign
({},
defaultAsync
,
h5
[
'
async
'
]
||
{})
...
...
@@ -79,11 +75,6 @@ function getH5Options (manifestJson) {
h5
.
publicPath
=
base
}
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
h5
.
router
.
base
=
'
/
'
h5
.
publicPath
=
'
/
'
}
/* eslint-disable no-mixed-operators */
h5
.
template
=
h5
.
template
&&
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
h5
.
template
)
||
path
.
resolve
(
__dirname
,
'
../../../../public/index.html
'
)
...
...
packages/uni-cli-shared/lib/platform.js
浏览文件 @
16cc9992
...
...
@@ -340,10 +340,6 @@ const PLATFORMS = {
}
}
// 解决 vue-cli-service lint 时 UNI_PLATFORM 不存在
if
(
process
.
env
.
UNI_PLATFORM
===
'
mp-360
'
)
{
process
.
env
.
UNI_PLATFORM
=
'
h5
'
process
.
env
.
UNI_SUB_PLATFORM
=
'
mp-360
'
}
process
.
env
.
UNI_PLATFORM
=
process
.
env
.
UNI_PLATFORM
||
'
h5
'
const
platform
=
PLATFORMS
[
process
.
env
.
UNI_PLATFORM
]
...
...
@@ -379,14 +375,6 @@ if (process.env.UNI_PLATFORM.indexOf('app-') === 0) {
preprocessContext
[
'
APP
'
]
=
true
}
preprocessContext
[
'
MP-360
'
]
=
false
preprocessContext
[
'
MP_360
'
]
=
false
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
preprocessContext
[
'
H5
'
]
=
false
preprocessContext
[
'
MP-360
'
]
=
true
preprocessContext
[
'
MP_360
'
]
=
true
}
if
(
process
.
UNI_SCRIPT_DEFINE
&&
Object
.
keys
(
process
.
UNI_SCRIPT_DEFINE
).
length
)
{
Object
.
keys
(
process
.
UNI_SCRIPT_DEFINE
).
forEach
(
name
=>
{
preprocessContext
[
name
]
=
process
.
UNI_SCRIPT_DEFINE
[
name
]
...
...
@@ -579,7 +567,7 @@ module.exports = {
mergeLonghand
:
false
,
mergeRules
:
false
,
cssDeclarationSorter
:
false
,
uniqueSelectors
:
false
,
// 标签排序影响头条小程序
uniqueSelectors
:
false
,
// 标签排序影响头条小程序
minifySelectors
:
false
,
// 标签排序影响头条小程序
discardComments
:
false
,
discardDuplicates
:
false
// 条件编译会导致重复
...
...
@@ -612,4 +600,4 @@ module.exports = {
]
}
}
}
}
packages/vue-cli-plugin-uni/generator.js
浏览文件 @
16cc9992
...
...
@@ -14,15 +14,13 @@ module.exports = (api, options, rootOptions) => {
'
dev:mp-weixin
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch
'
,
'
dev:mp-baidu
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch
'
,
'
dev:mp-alipay
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch
'
,
'
dev:mp-toutiao
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch
'
,
'
dev:mp-360
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch
'
,
'
dev:mp-toutiao
'
:
'
cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch
'
,
'
build:h5
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build
'
,
'
build:mp-qq
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build
'
,
'
build:mp-weixin
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build
'
,
'
build:mp-baidu
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build
'
,
'
build:mp-alipay
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build
'
,
'
build:mp-toutiao
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build
'
,
'
build:mp-360
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build
'
,
'
build:mp-toutiao
'
:
'
cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build
'
,
'
dev:custom
'
:
'
cross-env NODE_ENV=development uniapp-cli custom
'
,
'
build:custom
'
:
'
cross-env NODE_ENV=production uniapp-cli custom
'
},
...
...
@@ -42,7 +40,7 @@ module.exports = (api, options, rootOptions) => {
'
vuex
'
:
'
^3.0.1
'
},
devDependencies
:
{
'
@dcloudio/uni-cli-shared
'
:
version
,
'
@dcloudio/uni-cli-shared
'
:
version
,
'
@dcloudio/uni-migration
'
:
version
,
'
@dcloudio/uni-template-compiler
'
:
version
,
'
@dcloudio/vue-cli-plugin-hbuilderx
'
:
version
,
...
...
@@ -58,4 +56,4 @@ module.exports = (api, options, rootOptions) => {
]
}
})
}
}
packages/vue-cli-plugin-uni/lib/env.js
浏览文件 @
16cc9992
...
...
@@ -18,27 +18,27 @@ if (process.env.UNI_CLOUD_SPACES) {
if
(
spaces
.
length
===
1
)
{
const
space
=
spaces
[
0
]
console
.
log
(
`本项目的uniCloud使用的默认服务空间spaceId为:
${
space
.
id
}
`
)
}
process
.
env
.
UNI_CLOUD_PROVIDER
=
JSON
.
stringify
(
spaces
.
map
(
space
=>
{
if
(
space
.
clientSecret
)
{
return
{
provider
:
'
aliyun
'
,
spaceName
:
space
.
name
,
spaceId
:
space
.
id
,
clientSecret
:
space
.
clientSecret
,
endpoint
:
space
.
apiEndpoint
}
}
else
{
return
{
provider
:
'
tencent
'
,
spaceName
:
space
.
name
,
spaceId
:
space
.
id
}
}
}
process
.
env
.
UNI_CLOUD_PROVIDER
=
JSON
.
stringify
(
spaces
.
map
(
space
=>
{
if
(
space
.
clientSecret
)
{
return
{
provider
:
'
aliyun
'
,
spaceName
:
space
.
name
,
spaceId
:
space
.
id
,
clientSecret
:
space
.
clientSecret
,
endpoint
:
space
.
apiEndpoint
}
}
else
{
return
{
provider
:
'
tencent
'
,
spaceName
:
space
.
name
,
spaceId
:
space
.
id
}
}
}))
}
}
catch
(
e
)
{}
}
}
if
(
process
.
UNI_CLOUD
&&
...
...
@@ -48,11 +48,6 @@ if (
console
.
warn
(
`发布H5,需要在uniCloud后台操作,绑定安全域名,否则会因为跨域问题而无法访问。教程参考:https://uniapp.dcloud.io/uniCloud/quickstart-H5`
)
}
if
(
process
.
env
.
UNI_PLATFORM
===
'
mp-360
'
)
{
process
.
env
.
UNI_PLATFORM
=
'
h5
'
process
.
env
.
UNI_SUB_PLATFORM
=
'
mp-360
'
}
// 初始化环境变量
const
defaultInputDir
=
'
../../../../src
'
const
defaultOutputDir
=
'
../../../../dist/
'
+
...
...
@@ -71,11 +66,6 @@ process.env.VUE_APP_PLATFORM = process.env.UNI_PLATFORM
process
.
env
.
UNI_INPUT_DIR
=
process
.
env
.
UNI_INPUT_DIR
||
path
.
resolve
(
__dirname
,
defaultInputDir
)
process
.
env
.
UNI_OUTPUT_DIR
=
process
.
env
.
UNI_OUTPUT_DIR
||
path
.
resolve
(
__dirname
,
defaultOutputDir
)
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
const
outputDir
=
process
.
env
.
UNI_OUTPUT_DIR
process
.
env
.
UNI_OUTPUT_DIR
=
path
.
resolve
(
outputDir
.
substr
(
0
,
outputDir
.
lastIndexOf
(
'
h5
'
)),
'
mp-360/dist
'
)
}
if
(
process
.
env
.
UNI_PLATFORM
===
'
app-plus
'
)
{
process
.
env
.
UNI_OUTPUT_TMP_DIR
=
path
.
resolve
(
process
.
env
.
UNI_OUTPUT_DIR
,
'
../.tmp/app-plus
'
)
}
...
...
@@ -88,7 +78,7 @@ if (process.env.NODE_ENV === 'production') { // 发行模式,不启用 cache
delete
process
.
env
.
UNI_USING_CACHE
}
const
{
const
{
normalizePath
,
isSupportSubPackages
,
runByHBuilderX
,
...
...
@@ -212,7 +202,7 @@ if (process.env.UNI_PLATFORM === 'app-plus') {
normalizePath
(
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
filepath
))
)
}
}
}
}
else
{
// 其他平台,待确认配置方案
if
(
manifestJsonObj
[
'
app-plus
'
]
&&
...
...
@@ -397,4 +387,4 @@ runByHBuilderX && console.log(`正在编译中...`)
module
.
exports
=
{
manifestPlatformOptions
:
platformOptions
}
}
packages/vue-cli-plugin-uni/lib/h5/index.js
浏览文件 @
16cc9992
...
...
@@ -104,14 +104,6 @@ module.exports = {
const
beforeCode
=
(
useBuiltIns
===
'
entry
'
?
`import '@babel/polyfill';`
:
''
)
+
`import 'uni-pages';import 'uni-
${
process
.
env
.
UNI_PLATFORM
}
';`
const
qihooCode
=
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
?
`
import 'uni-touch-emulator';
import qh from 'uni-qh';
global.qh = qh;
global.onAppShow = function(){};
`
:
''
return
{
devtool
:
process
.
env
.
NODE_ENV
===
'
production
'
?
false
:
'
cheap-module-eval-source-map
'
,
resolve
:
{
...
...
@@ -130,7 +122,7 @@ global.onAppShow = function(){};
loader
:
'
wrap-loader
'
,
options
:
{
before
:
[
qihooCode
+
beforeCode
+
statCode
+
getGlobalUsingComponentsCode
()
beforeCode
+
statCode
+
getGlobalUsingComponentsCode
()
]
}
}]
...
...
@@ -186,4 +178,4 @@ global.onAppShow = function(){};
require
(
'
./cssnano-options
'
)(
webpackConfig
)
}
}
}
}
packages/webpack-uni-pages-loader/lib/platforms/h5.js
浏览文件 @
16cc9992
...
...
@@ -66,10 +66,6 @@ const getPageComponents = function (inputDir, pagesJson) {
globalStyle
[
'
h5
'
]
||
{}
)
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
Object
.
assign
(
globalStyle
,
globalStyle
[
'
mp-360
'
]
||
{})
}
process
.
UNI_H5_PAGES_JSON
=
{
pages
:
{},
globalStyle
...
...
@@ -94,10 +90,6 @@ const getPageComponents = function (inputDir, pagesJson) {
// 解析 titleNView,pullToRefresh
const
h5Options
=
Object
.
assign
({},
props
[
'
app-plus
'
]
||
{},
props
[
'
h5
'
]
||
{})
if
(
process
.
env
.
UNI_SUB_PLATFORM
===
'
mp-360
'
)
{
Object
.
assign
(
h5Options
,
props
[
'
mp-360
'
]
||
{})
Object
.
assign
(
props
,
props
[
'
mp-360
'
]
||
{})
}
removePlatformStyle
(
h5Options
)
if
(
h5Options
.
hasOwnProperty
(
'
titleNView
'
))
{
...
...
@@ -130,7 +122,6 @@ const getPageComponents = function (inputDir, pagesJson) {
// 删除 app-plus 平台配置
delete
props
[
'
app-plus
'
]
delete
props
[
'
h5
'
]
delete
props
[
'
mp-360
'
]
process
.
UNI_H5_PAGES_JSON
.
pages
[
page
.
path
]
=
props
...
...
@@ -361,4 +352,4 @@ global.__uniConfig.nvue = ${JSON.stringify({ 'flex-direction': getFlexDirection(
${
genRegisterPageVueComponentsCode
(
pageComponents
)}
global.__uniRoutes=[
${
genPageRoutes
(
pageComponents
).
concat
(
genSystemRoutes
()).
join
(
'
,
'
)}
]
`
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录