[Fix for Webpack 2 Beta 24+] Get loader options from query instead of raw this.options

[JoshTheDerf]

The current way to handle Webpack 2 Beta 24+ involves the use of LoaderOptionsPlugin. This is non-ideal, as LoaderOptionsPlugin actually mangles this.options in loaders to refer to its configuration instead of what webpack normally passes. Because of this, LoaderOptionsPlugin should be used only as a stopgap until a fix is introduced to make the loader compatible with Webpack 2 Beta 24+ by loading its options from this.query instead of this.options.x.

Current Usage (LoaderOptionsPlugin):

module.exports = {
  ...
  module: {
    rules: [
      {
        test: /\.vue$/,
        loader: 'vue'
      },
      ...
    ]
  },
  plugins: [
    new webpack.LoaderOptionsPlugin({
      vue: {
        ...
      }
    })
  ]
}

Recommended Usage (Works after this patch) (Current and Webpack 1.x usages still work and can mix & match):

module.exports = {
  ...
  module: {
    rules: [
      {
        test: /\.vue$/,
        loader: 'vue',
        options: { // query works as well here.
          vue: {
            ...
          }
        }
      },
      ...
    ]
  }
}

I hope this is of use. The removal of references to this.options may cause breakages in Webpack 1.x, though all tests are passing. If someone wants to confirm this, feel free.

[yyx990803]

I think we should

1. keep this.vue for current usage compatibility
2. prioritize query first

So perhaps query || this.vue || this.options.vue || {}

[JoshTheDerf]

Alright, will do. I believe there was a reason I couldn't keep query at the front, I'll check

[JoshTheDerf]

@yyx990803 Alright, so the issue is that query is an empty object by default, and therefore needs to be at the end of the list.
Perhaps we should try merging this.options.vue and this.vue into query?

As of the new commit, it tests the this.query string for emptiness, in which case it skips over query to this.vue and so on. I'm not a huge fan of this as it seems hackish, but it should work for now.
Ideally query and options would be combined into the same object, as in Webpack 2. Any thoughts on this?

[yyx990803]

Agreed, merging makes sense. So something like Object.assign({}, this.options.vue, this.vue, query) should suffice.

[yyx990803]

I'll merge it now and tweak - thanks for the effort!

[JoshTheDerf]

No problem! Thanks for the merge! Great work on Vue. :)