Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/vue-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v15.0.0-beta.4
Choose a base ref
...
head repository: vuejs/vue-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v15.0.0-beta.5
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 23, 2018

  1. chore: changelog

    @yyx990803
    yyx990803 committed Mar 23, 2018
    Copy the full SHA
    b860b24 View commit details

  2. fix: pass correct args to RuleSet.normalizeRule (fix #1210)

    @yyx990803
    yyx990803 committed Mar 23, 2018
    Copy the full SHA
    1c54dc4 View commit details

  3. 15.0.0-beta.5

    @yyx990803
    yyx990803 committed Mar 23, 2018
    Copy the full SHA
    ca71abe View commit details
Showing with 33 additions and 4 deletions.
  1. +10 −0 CHANGELOG.md
  2. +1 −1 lib/plugin.js
  3. +1 −1 package.json
  4. +21 −2 test/edgeCases.spec.js
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="15.0.0-beta.4"></a>
# [15.0.0-beta.4](https://github.com/vuejs/vue-loader/compare/v15.0.0-beta.3...v15.0.0-beta.4) (2018-03-23)


### Bug Fixes

* avoid babel options validation error (fix [#1209](https://github.com/vuejs/vue-loader/issues/1209)) ([d3e3f5e](https://github.com/vuejs/vue-loader/commit/d3e3f5e))



<a name="15.0.0-beta.3"></a>
# [15.0.0-beta.3](https://github.com/vuejs/vue-loader/compare/v15.0.0-beta.2...v15.0.0-beta.3) (2018-03-23)

2 changes: 1 addition & 1 deletion lib/plugin.js
View file
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-loader",
"version": "15.0.0-beta.4",
"version": "15.0.0-beta.5",
"description": "Vue single-file component loader for Webpack",
"main": "lib/index.js",
"scripts": {
23 changes: 21 additions & 2 deletions test/edgeCases.spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
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)
})