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
bffacd5e
Commit
bffacd5e
authored
Apr 24, 2018
by
Evan You
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: prioritize .vue rules in plugin (fix #1246)
parent
4359bf38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
plugin.js
lib/plugin.js
+12
-6
No files found.
lib/plugin.js
View file @
bffacd5e
...
...
@@ -9,17 +9,23 @@ module.exports = class VueLoaderPlugin {
// use webpack's RuleSet utility to normalize user rules
const
rawNormalizedRules
=
new
RuleSet
(
rawRules
).
rules
// find the rule that applies to vue files
const
vueRuleIndex
=
rawRules
.
findIndex
((
rule
,
i
)
=>
{
const
createMatcher
=
fakeFile
=>
(
rule
,
i
)
=>
{
// #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
&&
(
normalized
.
resource
(
`foo.vue`
)
||
normalized
.
resource
(
`foo.vue.html`
)
return
(
!
rule
.
enforce
&&
normalized
.
resource
&&
normalized
.
resource
(
fakeFile
)
)
})
}
// find the rule that applies to vue files
let
vueRuleIndex
=
rawRules
.
findIndex
(
createMatcher
(
`foo.vue`
))
if
(
vueRuleIndex
<
0
)
{
vueRuleIndex
=
rawRules
.
findIndex
(
createMatcher
(
`foo.vue.html`
))
}
const
vueRule
=
rawRules
[
vueRuleIndex
]
if
(
!
vueRule
)
{
...
...
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