Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vue-loader
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pi-plusplus
fork-from-github
vue-loader
Commits
2be55078
Commit
2be55078
authored
Mar 23, 2018
by
Evan You
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: handle vue rule with include (fix #1201)
parent
d3642e26
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
1 deletion
+39
-1
plugin.js
lib/plugin.js
+5
-1
edgeCases.spec.js
test/edgeCases.spec.js
+34
-0
No files found.
lib/plugin.js
View file @
2be55078
...
@@ -11,7 +11,11 @@ module.exports = class VueLoaderPlugin {
...
@@ -11,7 +11,11 @@ module.exports = class VueLoaderPlugin {
// find the rule that applies to vue files
// find the rule that applies to vue files
const
vueRuleIndex
=
rawRules
.
findIndex
((
rule
,
i
)
=>
{
const
vueRuleIndex
=
rawRules
.
findIndex
((
rule
,
i
)
=>
{
return
!
rule
.
enforce
&&
rawNormalizedRules
[
i
].
resource
(
`foo.vue`
)
// #1201 we need to skip the `include` check when locating the vue rule
const
clone
=
Object
.
assign
({},
rule
)
delete
clone
.
include
const
normalized
=
RuleSet
.
normalizeRule
(
clone
)
return
!
rule
.
enforce
&&
normalized
.
resource
(
`foo.vue`
)
})
})
const
vueRule
=
rawRules
[
vueRuleIndex
]
const
vueRule
=
rawRules
[
vueRuleIndex
]
...
...
test/edgeCases.spec.js
0 → 100644
View file @
2be55078
const
{
mockRender
,
mockBundleAndRun
}
=
require
(
'./utils'
)
const
normalizeNewline
=
require
(
'normalize-newline'
)
test
(
'vue rule with include'
,
done
=>
{
mockBundleAndRun
({
entry
:
'basic.vue'
,
modify
:
config
=>
{
config
.
module
.
rules
[
0
]
=
{
test
:
/
\.
vue$/
,
include
:
/fixtures/
,
loader
:
'vue-loader'
}
}
},
({
window
,
module
,
rawModule
})
=>
{
const
vnode
=
mockRender
(
module
,
{
msg
:
'hi'
})
// <h2 class="red">{{msg}}</h2>
expect
(
vnode
.
tag
).
toBe
(
'h2'
)
expect
(
vnode
.
data
.
staticClass
).
toBe
(
'red'
)
expect
(
vnode
.
children
[
0
].
text
).
toBe
(
'hi'
)
expect
(
module
.
data
().
msg
).
toContain
(
'Hello from Component A!'
)
let
style
=
window
.
document
.
querySelector
(
'style'
).
textContent
style
=
normalizeNewline
(
style
)
expect
(
style
).
toContain
(
'comp-a h2 {
\
n color: #f00;
\
n}'
)
done
()
})
})
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment