Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MuGuiLin
uni-app
提交
0719fd21
U
uni-app
项目概览
MuGuiLin
/
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,发现更多精彩内容 >>
提交
0719fd21
编写于
1月 04, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: pre script with src (question/137466)
上级
bfecd5e6
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
38 addition
and
20 deletion
+38
-20
packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/asset.ts
...s/uni-cli-shared/src/vite/plugins/vitejs/plugins/asset.ts
+5
-4
packages/uni-cli-shared/src/vite/utils/index.ts
packages/uni-cli-shared/src/vite/utils/index.ts
+1
-0
packages/uni-cli-shared/src/vite/utils/utils.ts
packages/uni-cli-shared/src/vite/utils/utils.ts
+8
-0
packages/uni-mp-vite/src/plugins/mainJs.ts
packages/uni-mp-vite/src/plugins/mainJs.ts
+2
-1
packages/uni-mp-vite/src/plugins/usingComponents.ts
packages/uni-mp-vite/src/plugins/usingComponents.ts
+2
-1
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
+2
-2
packages/vite-plugin-uni/src/configResolved/plugins/pre.ts
packages/vite-plugin-uni/src/configResolved/plugins/pre.ts
+8
-6
packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts
...ages/vite-plugin-uni/src/configResolved/plugins/preCss.ts
+7
-4
packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts
packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts
+3
-2
未找到文件。
packages/uni-cli-shared/src/vite/plugins/vitejs/plugins/asset.ts
浏览文件 @
0719fd21
...
...
@@ -2,12 +2,13 @@ import path from 'path'
import
{
parse
as
parseUrl
}
from
'
url
'
import
mime
from
'
mime/lite
'
import
fs
,
{
promises
as
fsp
}
from
'
fs
'
import
MagicString
from
'
magic-string
'
import
{
createHash
}
from
'
crypto
'
import
type
{
OutputOptions
,
PluginContext
,
RenderedChunk
}
from
'
rollup
'
import
{
Plugin
}
from
'
../plugin
'
import
{
ResolvedConfig
}
from
'
../config
'
import
{
cleanUrl
,
normalizePath
}
from
'
../utils
'
import
type
{
OutputOptions
,
PluginContext
,
RenderedChunk
}
from
'
rollup
'
import
MagicString
from
'
magic-string
'
import
{
createHash
}
from
'
crypto
'
import
{
withSourcemap
}
from
'
../../../../vite/utils/utils
'
export
const
assetUrlRE
=
/__VITE_ASSET__
([
a-z
\d]{8})
__
(?:\$
_
(
.*
?)
__
)?
/g
...
...
@@ -100,7 +101,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
if
(
s
)
{
return
{
code
:
s
.
toString
(),
map
:
config
.
build
.
sourcemap
?
s
.
generateMap
({
hires
:
true
})
:
null
,
map
:
withSourcemap
(
config
)
?
s
.
generateMap
({
hires
:
true
})
:
null
,
}
}
else
{
return
null
...
...
packages/uni-cli-shared/src/vite/utils/index.ts
浏览文件 @
0719fd21
...
...
@@ -3,6 +3,7 @@ import type { ResolvedConfig } from 'vite'
export
*
from
'
./ast
'
export
*
from
'
./url
'
export
*
from
'
./plugin
'
export
*
from
'
./utils
'
// 内置组件css列表,h5平台需要合并进去首页css中
export
const
buildInCssSet
=
new
Set
<
string
>
()
...
...
packages/uni-cli-shared/src/vite/utils/utils.ts
0 → 100644
浏览文件 @
0719fd21
import
type
{
ResolvedConfig
}
from
'
vite
'
export
function
withSourcemap
(
config
:
ResolvedConfig
)
{
if
(
config
.
command
===
'
serve
'
)
{
return
true
}
return
!!
config
.
build
.
sourcemap
}
packages/uni-mp-vite/src/plugins/mainJs.ts
浏览文件 @
0719fd21
...
...
@@ -3,6 +3,7 @@ import {
parseProgram
,
transformDynamicImports
,
updateMiniProgramGlobalComponents
,
withSourcemap
,
}
from
'
@dcloudio/uni-cli-shared
'
import
type
{
SFCScriptCompileOptions
}
from
'
@vue/compiler-sfc
'
import
{
dynamicImport
}
from
'
./usingComponents
'
...
...
@@ -33,7 +34,7 @@ export function uniMainJsPlugin(
)
const
{
code
,
map
}
=
await
transformDynamicImports
(
source
,
imports
,
{
id
,
sourceMap
:
!!
opts
.
resolvedConfig
.
build
.
sourcemap
,
sourceMap
:
withSourcemap
(
opts
.
resolvedConfig
)
,
dynamicImport
,
})
return
{
...
...
packages/uni-mp-vite/src/plugins/usingComponents.ts
浏览文件 @
0719fd21
...
...
@@ -13,6 +13,7 @@ import {
transformDynamicImports
,
updateMiniProgramComponentsByScriptFilename
,
updateMiniProgramComponentsByTemplateFilename
,
withSourcemap
,
}
from
'
@dcloudio/uni-cli-shared
'
import
{
virtualComponentPath
,
virtualPagePath
}
from
'
./entry
'
...
...
@@ -37,7 +38,7 @@ export function uniUsingComponentsPlugin(
if
(
filename
.
endsWith
(
'
App.vue
'
))
{
return
null
}
const
sourceMap
=
!!
resolvedConfig
.
build
.
sourcemap
const
sourceMap
=
withSourcemap
(
resolvedConfig
)
const
dynamicImportOptions
=
{
id
,
sourceMap
,
...
...
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
浏览文件 @
0719fd21
...
...
@@ -42,14 +42,14 @@ export function initPlugins(
addPlugin
(
plugins
,
uniPrePlugin
(
extend
(
uniPrePluginOptions
,
options
)),
uniPrePlugin
(
config
,
extend
(
uniPrePluginOptions
,
options
)),
0
,
'
pre
'
)
addPlugin
(
plugins
,
uniPreCssPlugin
(
extend
(
uniPreCssPluginOptions
,
options
)),
uniPreCssPlugin
(
config
,
extend
(
uniPreCssPluginOptions
,
options
)),
'
vite:css
'
)
addPlugin
(
plugins
,
uniPreVuePlugin
(),
'
vite:vue
'
,
'
pre
'
)
...
...
packages/vite-plugin-uni/src/configResolved/plugins/pre.ts
浏览文件 @
0719fd21
import
path
from
'
path
'
import
debug
from
'
debug
'
import
{
Plugin
}
from
'
vite
'
import
{
Plugin
,
ResolvedConfig
}
from
'
vite
'
import
{
createFilter
}
from
'
@rollup/pluginutils
'
import
{
preJs
,
...
...
@@ -8,6 +8,7 @@ import {
EXTNAME_JS
,
EXTNAME_VUE
,
parseVueRequest
,
withSourcemap
,
}
from
'
@dcloudio/uni-cli-shared
'
import
{
UniPluginFilterOptions
}
from
'
.
'
...
...
@@ -17,8 +18,12 @@ const debugPreJsTry = debug('vite:uni:pre-js-try')
const
PRE_JS_EXTNAME
=
[
'
.json
'
,
'
.css
'
].
concat
(
EXTNAME_VUE
).
concat
(
EXTNAME_JS
)
const
PRE_HTML_EXTNAME
=
EXTNAME_VUE
export
function
uniPrePlugin
(
options
:
UniPluginFilterOptions
):
Plugin
{
export
function
uniPrePlugin
(
config
:
ResolvedConfig
,
options
:
UniPluginFilterOptions
):
Plugin
{
const
filter
=
createFilter
(
options
.
include
,
options
.
exclude
)
return
{
name
:
'
vite:uni-pre
'
,
transform
(
code
,
id
)
{
...
...
@@ -26,9 +31,6 @@ export function uniPrePlugin(options: UniPluginFilterOptions): Plugin {
return
}
const
{
filename
,
query
}
=
parseVueRequest
(
id
)
if
(
query
.
vue
&&
query
.
type
!==
'
template
'
)
{
return
}
const
extname
=
path
.
extname
(
filename
)
const
isHtml
=
query
.
type
===
'
template
'
||
PRE_HTML_EXTNAME
.
includes
(
extname
)
...
...
@@ -51,7 +53,7 @@ export function uniPrePlugin(options: UniPluginFilterOptions): Plugin {
}
return
{
code
,
map
:
this
.
getCombinedSourcemap
()
,
map
:
withSourcemap
(
config
)
?
this
.
getCombinedSourcemap
()
:
null
,
}
},
}
...
...
packages/vite-plugin-uni/src/configResolved/plugins/preCss.ts
浏览文件 @
0719fd21
import
debug
from
'
debug
'
import
{
Plugin
}
from
'
vite
'
import
{
Plugin
,
ResolvedConfig
}
from
'
vite
'
import
{
createFilter
}
from
'
@rollup/pluginutils
'
import
{
preJs
}
from
'
@dcloudio/uni-cli-shared
'
import
{
preJs
,
withSourcemap
}
from
'
@dcloudio/uni-cli-shared
'
import
{
UniPluginFilterOptions
}
from
'
.
'
...
...
@@ -13,7 +13,10 @@ const cssLangRE = new RegExp(cssLangs)
* preprocess css
* @param options
*/
export
function
uniPreCssPlugin
(
options
:
UniPluginFilterOptions
):
Plugin
{
export
function
uniPreCssPlugin
(
config
:
ResolvedConfig
,
options
:
UniPluginFilterOptions
):
Plugin
{
const
filter
=
createFilter
(
options
.
include
,
options
.
exclude
)
return
{
name
:
'
vite:uni-pre-css
'
,
...
...
@@ -31,7 +34,7 @@ export function uniPreCssPlugin(options: UniPluginFilterOptions): Plugin {
debugPre
(
id
)
return
{
code
:
preJs
(
code
),
map
:
this
.
getCombinedSourcemap
()
,
map
:
withSourcemap
(
config
)
?
this
.
getCombinedSourcemap
()
:
null
,
}
},
}
...
...
packages/vite-plugin-uni/src/configResolved/plugins/ssr.ts
浏览文件 @
0719fd21
...
...
@@ -11,6 +11,7 @@ import {
isIdentifier
,
isCallExpression
,
isMemberExpression
,
withSourcemap
,
}
from
'
@dcloudio/uni-cli-shared
'
import
{
UniPluginFilterOptions
}
from
'
.
'
...
...
@@ -19,7 +20,7 @@ const debugSSR = debug('vite:uni:ssr')
const
KEYED_FUNC_RE
=
/
(
ssrRef|shallowSsrRef
)
/
export
function
uniSSRPlugin
(
_
config
:
ResolvedConfig
,
config
:
ResolvedConfig
,
options
:
UniPluginFilterOptions
):
Plugin
{
const
filter
=
createFilter
(
options
.
include
,
options
.
exclude
)
...
...
@@ -58,7 +59,7 @@ export function uniSSRPlugin(
})
return
{
code
:
s
.
toString
(),
map
:
s
.
generateMap
().
toString
()
,
map
:
withSourcemap
(
config
)
?
s
.
generateMap
().
toString
()
:
null
,
}
},
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录