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
1c54dc4b
Commit
1c54dc4b
authored
Mar 23, 2018
by
Evan You
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: pass correct args to RuleSet.normalizeRule (fix #1210)
parent
b860b242
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
3 deletions
+22
-3
plugin.js
lib/plugin.js
+1
-1
edgeCases.spec.js
test/edgeCases.spec.js
+21
-2
No files found.
lib/plugin.js
View file @
1c54dc4b
...
...
@@ -14,7 +14,7 @@ module.exports = class VueLoaderPlugin {
// #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
)
const
normalized
=
RuleSet
.
normalizeRule
(
clone
,
{},
''
)
return
!
rule
.
enforce
&&
normalized
.
resource
&&
normalized
.
resource
(
`foo.vue`
)
})
const
vueRule
=
rawRules
[
vueRuleIndex
]
...
...
test/edgeCases.spec.js
View file @
1c54dc4b
const
{
bundle
,
mockRender
,
mockBundleAndRun
}
=
require
(
'./utils'
)
...
...
@@ -58,7 +59,7 @@ test('test-less oneOf rules', done => {
})
test
(
'babel-loader inline options'
,
done
=>
{
mockBundleAndRun
({
bundle
({
entry
:
'basic.vue'
,
module
:
{
rules
:
[
...
...
@@ -74,5 +75,23 @@ test('babel-loader inline options', done => {
}
]
}
},
res
=>
assertComponent
(
res
,
done
))
},
()
=>
done
(),
true
)
})
// #1210
test
(
'normalize multiple use + options'
,
done
=>
{
bundle
({
entry
:
'basic.vue'
,
modify
:
config
=>
{
config
.
module
.
rules
[
0
]
=
{
test
:
/
\.
vue$/
,
use
:
[
{
loader
:
'vue-loader'
,
options
:
{}
}
]
}
}
},
()
=>
done
(),
true
)
})
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