Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
81ee2638
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
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,发现更多精彩内容 >>
提交
81ee2638
编写于
12月 27, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(nvue): preprocess scss
上级
8f917136
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
11 deletion
+21
-11
packages/uni-cli-shared/lib/package.js
packages/uni-cli-shared/lib/package.js
+9
-5
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
+2
-0
packages/vue-cli-plugin-uni/packages/sass-loader/dist/index.js
...ges/vue-cli-plugin-uni/packages/sass-loader/dist/index.js
+5
-2
packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js
...i-plugin-uni/packages/sass-loader/dist/webpackImporter.js
+5
-4
未找到文件。
packages/uni-cli-shared/lib/package.js
浏览文件 @
81ee2638
const
uniI18n
=
require
(
'
@dcloudio/uni-cli-i18n
'
)
function
isPlainObject
(
a
)
{
function
isPlainObject
(
a
)
{
if
(
a
===
null
)
{
return
false
}
...
...
@@ -8,7 +8,7 @@ function isPlainObject(a) {
}
module
.
exports
=
{
initCustomScript
(
name
,
pkgPath
)
{
initCustomScript
(
name
,
pkgPath
)
{
const
pkg
=
require
(
pkgPath
)
const
uniAppOptions
=
pkg
[
'
uni-app
'
]
...
...
@@ -24,7 +24,9 @@ module.exports = {
}
if
(
!
scriptOptions
.
env
||
!
scriptOptions
.
env
.
UNI_PLATFORM
)
{
console
.
error
(
uniI18n
.
__
(
'
cliShared.requireConfigUniPlatform
'
,
{
0
:
`package.json->uni-app->scripts->
${
name
}
->env `
}))
console
.
error
(
uniI18n
.
__
(
'
cliShared.requireConfigUniPlatform
'
,
{
0
:
`package.json->uni-app->scripts->
${
name
}
->env `
}))
process
.
exit
(
0
)
}
...
...
@@ -32,7 +34,9 @@ module.exports = {
Object
.
keys
(
uniAppOptions
.
scripts
).
forEach
(
scriptName
=>
{
if
(
scriptName
!==
name
)
{
const
define
=
uniAppOptions
.
scripts
[
scriptName
].
define
Object
.
keys
(
define
).
forEach
(
name
=>
define
[
name
]
=
false
)
Object
.
keys
(
define
).
forEach
(
name
=>
{
define
[
name
]
=
false
})
Object
.
assign
(
scriptOptions
.
define
,
define
)
}
})
...
...
@@ -46,4 +50,4 @@ module.exports = {
return
scriptOptions
}
}
}
packages/vue-cli-plugin-hbuilderx/build/css-loader.conf.js
浏览文件 @
81ee2638
...
...
@@ -58,6 +58,7 @@ if (isSass) {
const
scssLoader
=
{
loader
:
'
@dcloudio/vue-cli-plugin-uni/packages/sass-loader
'
,
options
:
{
nvue
:
true
,
sourceMap
:
false
}
}
...
...
@@ -65,6 +66,7 @@ const scssLoader = {
const
sassLoader
=
{
loader
:
'
@dcloudio/vue-cli-plugin-uni/packages/sass-loader
'
,
options
:
{
nvue
:
true
,
sourceMap
:
false
}
}
...
...
packages/vue-cli-plugin-uni/packages/sass-loader/dist/index.js
浏览文件 @
81ee2638
...
...
@@ -33,6 +33,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
*/
function
loader
(
content
)
{
const
options
=
(
0
,
_loaderUtils
.
getOptions
)(
this
)
||
{};
// fixed by xxxxxx
const
isNVue
=
!!
options
.
nvue
delete
options
.
nvue
(
0
,
_schemaUtils
.
default
)(
_options
.
default
,
options
,
{
name
:
'
Sass Loader
'
,
baseDataPath
:
'
options
'
...
...
@@ -54,7 +57,7 @@ function loader(content) {
mainFiles
:
[
'
_index
'
,
'
index
'
,
'
...
'
],
extensions
:
[
'
.scss
'
,
'
.sass
'
,
'
.css
'
,
'
...
'
]
});
sassOptions
.
importer
.
push
((
0
,
_webpackImporter
.
default
)(
this
.
resourcePath
,
resolve
,
addNormalizedDependency
));
sassOptions
.
importer
.
push
((
0
,
_webpackImporter
.
default
)(
this
.
resourcePath
,
resolve
,
addNormalizedDependency
,
isNVue
));
}
// Skip empty files, otherwise it will stop webpack, see issue #21
...
...
@@ -111,4 +114,4 @@ function loader(content) {
}
var
_default
=
loader
;
exports
.
default
=
_default
;
\ No newline at end of file
exports
.
default
=
_default
;
packages/vue-cli-plugin-uni/packages/sass-loader/dist/webpackImporter.js
浏览文件 @
81ee2638
...
...
@@ -41,10 +41,11 @@ const matchCss = /\.css$/i;
const
fs
=
require
(
'
fs
'
)
const
preprocessor
=
require
(
'
../../webpack-preprocess-loader/preprocess/lib/preprocess
'
)
const
{
cssPreprocessOptions
cssPreprocessOptions
,
nvueCssPreprocessOptions
}
=
require
(
'
@dcloudio/uni-cli-shared
'
)
function
webpackImporter
(
resourcePath
,
resolve
,
addNormalizedDependency
)
{
// fixed by xxxxxx
function
webpackImporter
(
resourcePath
,
resolve
,
addNormalizedDependency
,
isNVue
)
{
function
dirContextFrom
(
fileContext
)
{
return
_path
.
default
.
dirname
(
// The first file is 'stdin' when we're using the data option
fileContext
===
'
stdin
'
?
resourcePath
:
fileContext
);
...
...
@@ -63,7 +64,7 @@ function webpackImporter(resourcePath, resolve, addNormalizedDependency) {
if
(
contents
.
includes
(
'
#endif
'
))
{
return
{
file
,
contents
:
preprocessor
.
preprocess
(
contents
,
cssPreprocessOptions
.
context
,
{
contents
:
preprocessor
.
preprocess
(
contents
,
isNVue
?
nvueCssPreprocessOptions
.
context
:
cssPreprocessOptions
.
context
,
{
type
:
cssPreprocessOptions
.
type
})
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录