Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lzb_79
uni-app
提交
848606b9
U
uni-app
项目概览
lzb_79
/
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,发现更多精彩内容 >>
提交
848606b9
编写于
3月 13, 2020
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(cli): normalize absolute paths in css URLs
上级
7e3c7e15
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
133 addition
and
74 deletion
+133
-74
.eslintignore
.eslintignore
+0
-1
packages/uni-cli-shared/lib/manifest.js
packages/uni-cli-shared/lib/manifest.js
+1
-2
packages/uni-cli-shared/lib/url-loader.js
packages/uni-cli-shared/lib/url-loader.js
+64
-0
packages/uni-cli-shared/package.json
packages/uni-cli-shared/package.json
+1
-0
packages/uni-template-compiler/lib/asset-url.js
packages/uni-template-compiler/lib/asset-url.js
+9
-5
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
+19
-8
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
+3
-0
packages/vue-cli-plugin-uni/lib/app-plus/index.js
packages/vue-cli-plugin-uni/lib/app-plus/index.js
+1
-34
packages/vue-cli-plugin-uni/lib/chain-webpack.js
packages/vue-cli-plugin-uni/lib/chain-webpack.js
+3
-4
packages/vue-cli-plugin-uni/lib/configure-webpack.js
packages/vue-cli-plugin-uni/lib/configure-webpack.js
+1
-0
packages/vue-cli-plugin-uni/lib/env.js
packages/vue-cli-plugin-uni/lib/env.js
+0
-1
packages/vue-cli-plugin-uni/packages/postcss/index.js
packages/vue-cli-plugin-uni/packages/postcss/index.js
+19
-13
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
+10
-2
src/platforms/app-plus/service/framework/app.js
src/platforms/app-plus/service/framework/app.js
+2
-4
未找到文件。
.eslintignore
浏览文件 @
848606b9
...
...
@@ -4,4 +4,3 @@ build/rollup-plugin-require-context
packages/*/packages
packages/*/template/**/*
qh-api.js
touch-emulator.js
packages/uni-cli-shared/lib/manifest.js
浏览文件 @
848606b9
...
...
@@ -76,7 +76,6 @@ function getH5Options (manifestJson) {
h5
.
publicPath
=
h5
.
publicPath
+
'
/
'
}
}
else
{
// 其他模式,启用 base
if
(
base
.
startsWith
(
'
./
'
))
{
// 在开发模式, publicPath 如果为 './' webpack-dev-server 匹配文件时会失败
h5
.
publicPath
=
base
.
substr
(
1
)
...
...
packages/uni-cli-shared/lib/url-loader.js
0 → 100644
浏览文件 @
848606b9
const
path
=
require
(
'
path
'
)
const
defaultOptions
=
{
limit
:
-
1
,
fallback
:
{
loader
:
'
file-loader
'
,
options
:
{
publicPath
(
url
,
resourcePath
,
context
)
{
if
(
process
.
env
.
UNI_PLATFORM
===
'
app-plus
'
&&
process
.
env
.
UNI_USING_V3
)
{
// app-plus v3 下路径不能以/开头
return
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
resourcePath
)
}
return
'
/
'
+
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
resourcePath
)
},
outputPath
(
url
,
resourcePath
,
context
)
{
return
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
resourcePath
)
}
}
}
}
const
inlineLimit
=
process
.
env
.
UNI_PLATFORM
===
'
mp-weixin
'
||
process
.
env
.
UNI_PLATFORM
===
'
mp-qq
'
||
process
.
env
.
UNI_PLATFORM
===
'
mp-toutiao
'
||
process
.
env
.
UNI_PLATFORM
===
'
app-plus
'
// v2需要base64,v3需要rewriteUrl
// mp-weixin,mp-qq,app-plus 非v3(即:需要base64的平台)
// 将/static/logo.png转换为~@/static/logo.png
// @import,src,background,background-image
const
rewriteUrl
=
inlineLimit
?
require
(
'
postcss-urlrewrite
'
)({
imports
:
true
,
properties
:
[
'
src
'
,
'
background
'
,
'
background-image
'
],
rules
:
[{
from
:
/^@
\/
/
,
to
:
'
~@/
'
},
{
from
:
/^
\/([^/])
/
,
to
:
'
~@/$1
'
}]
})
:
()
=>
{}
module
.
exports
=
{
loader
:
'
url-loader
'
,
options
()
{
if
(
process
.
env
.
UNI_PLATFORM
===
'
h5
'
)
{
// h5平台,不对 url-loader 作调整,默认limit:4096,也不修改file-loader输出路径
return
{}
}
if
(
inlineLimit
)
{
return
{
...
defaultOptions
,
limit
:
process
.
env
.
UNI_USING_V3
?
-
1
:
40960
// (主要用于background-image)
}
}
return
{
...
defaultOptions
}
},
rewriteUrl
}
packages/uni-cli-shared/package.json
浏览文件 @
848606b9
...
...
@@ -20,6 +20,7 @@
"license"
:
"Apache-2.0"
,
"dependencies"
:
{
"hash-sum"
:
"^1.0.2"
,
"postcss-urlrewrite"
:
"^0.2.2"
,
"strip-json-comments"
:
"^2.0.1"
},
"gitHead"
:
"84e9cb1ca1898054d161f1514efadd1ab24fd804"
...
...
packages/uni-template-compiler/lib/asset-url.js
浏览文件 @
848606b9
...
...
@@ -4,10 +4,14 @@ const transformAssetUrls = {
'
img
'
:
'
src
'
,
'
image
'
:
'
src
'
,
'
cover-image
'
:
'
src
'
,
// h5
'
v-uni-audio
'
:
'
src
'
,
'
v-uni-video
'
:
[
'
src
'
,
'
poster
'
],
'
v-uni-image
'
:
'
src
'
,
'
v-uni-cover-image
'
:
'
src
'
'
v-uni-cover-image
'
:
'
src
'
,
// nvue
'
u-image
'
:
'
src
'
,
'
u-video
'
:
[
'
src
'
,
'
poster
'
]
}
function
rewrite
(
attr
,
name
)
{
...
...
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
浏览文件 @
848606b9
...
...
@@ -26,7 +26,18 @@ const postcssLoader = {
sourceMap
:
false
,
parser
:
require
(
'
postcss-comment
'
),
plugins
:
[
require
(
'
postcss-import
'
),
require
(
'
postcss-import
'
)({
resolve
(
id
,
basedir
,
importOptions
)
{
if
(
id
.
startsWith
(
'
~@/
'
))
{
return
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
id
.
substr
(
3
))
}
else
if
(
id
.
startsWith
(
'
@/
'
))
{
return
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
id
.
substr
(
2
))
}
else
if
(
id
.
startsWith
(
'
/
'
)
&&
!
id
.
startsWith
(
'
//
'
))
{
return
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
id
.
substr
(
1
))
}
return
id
}
}),
require
(
'
@dcloudio/vue-cli-plugin-uni/packages/postcss
'
)
]
}
...
...
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
浏览文件 @
848606b9
...
...
@@ -104,6 +104,9 @@ const compiler = require('weex-template-compiler')
const
oldCompile
=
compiler
.
compile
compiler
.
compile
=
function
(
source
,
options
=
{})
{
(
options
.
modules
||
(
options
.
modules
=
[])).
push
(
autoComponentsModule
)
options
.
modules
.
push
(
require
(
'
@dcloudio/uni-template-compiler/lib/asset-url
'
))
options
.
isUnaryTag
=
isUnaryTag
// 将 autoComponents 挂在 isUnaryTag 上边
options
.
isUnaryTag
.
autoComponents
=
new
Set
()
...
...
packages/vue-cli-plugin-uni/lib/app-plus/index.js
浏览文件 @
848606b9
...
...
@@ -2,8 +2,7 @@ const path = require('path')
const
webpack
=
require
(
'
webpack
'
)
const
{
getMainEntry
,
isInHBuilderX
getMainEntry
}
=
require
(
'
@dcloudio/uni-cli-shared
'
)
const
vueLoader
=
require
(
'
@dcloudio/uni-cli-shared/lib/vue-loader
'
)
...
...
@@ -200,38 +199,6 @@ const v3 = {
const
isAppService
=
!!
vueOptions
.
pluginOptions
[
'
uni-app-plus
'
][
'
service
'
]
const
isAppView
=
!!
vueOptions
.
pluginOptions
[
'
uni-app-plus
'
][
'
view
'
]
const
fileLoaderOptions
=
isInHBuilderX
?
{
emitFile
:
isAppView
,
name
:
'
[path][name].[ext]
'
,
context
:
process
.
env
.
UNI_INPUT_DIR
}
:
{
emitFile
:
isAppView
,
outputPath
(
url
,
resourcePath
,
context
)
{
return
path
.
relative
(
process
.
env
.
UNI_INPUT_DIR
,
resourcePath
)
}
}
// 处理静态资源
webpackConfig
.
module
.
rule
(
'
svg
'
)
.
use
(
'
file-loader
'
)
.
options
(
fileLoaderOptions
)
const
staticTypes
=
[
'
images
'
,
'
media
'
,
'
fonts
'
]
staticTypes
.
forEach
(
staticType
=>
{
webpackConfig
.
module
.
rule
(
staticType
)
.
use
(
'
url-loader
'
)
.
loader
(
'
url-loader
'
)
.
tap
(
options
=>
Object
.
assign
(
options
,
{
limit
:
1
,
fallback
:
{
loader
:
'
file-loader
'
,
options
:
fileLoaderOptions
}
}))
})
const
cacheConfig
=
{
cacheDirectory
:
false
,
cacheIdentifier
:
false
...
...
packages/vue-cli-plugin-uni/lib/chain-webpack.js
浏览文件 @
848606b9
...
...
@@ -20,15 +20,14 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
return
function
(
webpackConfig
)
{
// 处理静态资源 limit
const
urlLoader
=
require
(
'
@dcloudio/uni-cli-shared/lib/url-loader
'
)
const
staticTypes
=
[
'
images
'
,
'
media
'
,
'
fonts
'
]
staticTypes
.
forEach
(
staticType
=>
{
webpackConfig
.
module
.
rule
(
staticType
)
.
use
(
'
url-loader
'
)
.
loader
(
'
url-loader
'
)
.
tap
(
options
=>
Object
.
assign
(
options
,
{
limit
:
40960
}))
.
loader
(
urlLoader
.
loader
)
.
tap
(
options
=>
Object
.
assign
(
options
,
urlLoader
.
options
()))
})
// 条件编译 vue 文件统一直接过滤html,js,css三种类型,单独资源文件引用各自过滤
...
...
packages/vue-cli-plugin-uni/lib/configure-webpack.js
浏览文件 @
848606b9
...
...
@@ -239,6 +239,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
resolve
:
{
alias
:
{
'
@
'
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
),
'
./@
'
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
),
// css中的'@/static/logo.png'会被转换成'./@/static/logo.png'加载
'
vue$
'
:
getPlatformVue
(
vueOptions
),
'
uni-pages
'
:
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
pages.json
'
),
'
@dcloudio/uni-stat
'
:
require
.
resolve
(
'
@dcloudio/uni-stat
'
),
...
...
packages/vue-cli-plugin-uni/lib/env.js
浏览文件 @
848606b9
...
...
@@ -48,7 +48,6 @@ if (
console
.
warn
(
`发布H5,需要在uniCloud后台操作,绑定安全域名,否则会因为跨域问题而无法访问。教程参考:https://uniapp.dcloud.io/uniCloud/quickstart-H5`
)
}
// 初始化环境变量
const
defaultInputDir
=
'
../../../../src
'
const
defaultOutputDir
=
'
../../../../dist/
'
+
...
...
packages/vue-cli-plugin-uni/packages/postcss/index.js
浏览文件 @
848606b9
...
...
@@ -150,6 +150,7 @@ if (process.env.UNI_USING_V3) {
'
background-attachment
'
]
let
rewriteUrl
/**
* 转换 upx
* 转换 px
...
...
@@ -160,6 +161,11 @@ if (process.env.UNI_USING_V3) {
...
opts
}
return
function
(
root
,
result
)
{
if
(
!
rewriteUrl
)
{
rewriteUrl
=
require
(
'
@dcloudio/uni-cli-shared/lib/url-loader
'
).
rewriteUrl
}
rewriteUrl
(
root
)
if
(
process
.
env
.
UNI_PLATFORM
===
'
h5
'
)
{
// Transform CSS AST here
...
...
packages/vue-cli-plugin-uni/packages/postcss/index.v3.js
浏览文件 @
848606b9
...
...
@@ -11,8 +11,16 @@ const isInsideKeyframes = function (rule) {
rule
.
parent
&&
rule
.
parent
.
type
===
'
atrule
'
&&
/^
(
-
\w
+-
)?
keyframes$/
.
test
(
rule
.
parent
.
name
)
)
}
let
rewriteUrl
module
.
exports
=
postcss
.
plugin
(
'
postcss-uniapp-plugin
'
,
function
(
opts
)
{
return
function
(
root
,
result
)
{
if
(
!
rewriteUrl
)
{
rewriteUrl
=
require
(
'
@dcloudio/uni-cli-shared/lib/url-loader
'
).
rewriteUrl
}
rewriteUrl
(
root
)
root
.
walkRules
(
rule
=>
{
// Transform each rule here
if
(
!
isInsideKeyframes
(
rule
))
{
...
...
src/platforms/app-plus/service/framework/app.js
浏览文件 @
848606b9
...
...
@@ -6,6 +6,8 @@ import initOn from 'uni-core/service/bridge/on'
import
{
requireNativePlugin
,
publish
}
from
'
../bridge
'
import
{
...
...
@@ -22,10 +24,6 @@ import {
import
tabBar
from
'
./tab-bar
'
import
{
publish
}
from
'
../bridge
'
import
{
initSubscribeHandlers
}
from
'
./subscribe-handlers
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录