fix #943, should consider path or file name includes dot (#945)

* keep path of source file in source map

* fix #943, regex should consider path or file name includes dot

* use path.extname rather than regex

* add sourceRoot option for SourceMapGenerator

Author: Elevista

lib/parser.js

@@ -6,7 +6,7 @@ var SourceMapGenerator = require('source-map').SourceMapGenerator
 var splitRE = /\r?\n/g
 var emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = function (content, filename, needMap) {
+module.exports = function (content, filename, needMap, sourceRoot) {
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
   var filenameWithHash = filename + '?' + cacheKey
@@ -18,7 +18,8 @@ module.exports = function (content, filename, needMap) {
       output.script.map = generateSourceMap(
         filenameWithHash,
         content,
-        output.script.content
+        output.script.content,
+        sourceRoot
       )
     }
     if (output.styles) {
@@ -27,7 +28,8 @@ module.exports = function (content, filename, needMap) {
           style.map = generateSourceMap(
             filenameWithHash,
             content,
-            style.content
+            style.content,
+            sourceRoot
           )
         }
       })
@@ -37,8 +39,8 @@ module.exports = function (content, filename, needMap) {
   return output
 }
 
-function generateSourceMap (filename, source, generated) {
-  var map = new SourceMapGenerator()
+function generateSourceMap (filename, source, generated, sourceRoot) {
+  var map = new SourceMapGenerator({ sourceRoot })
   map.setSourceContent(filename, source)
   generated.split(splitRE).forEach((line, index) => {
     if (!emptyRE.test(line)) {

lib/selector.js

@@ -10,8 +10,10 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.getOptions(this) || {}
   var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
-  var filename = path.relative(context, this.resourcePath).replace(/\..+$/, '.vue')
-  var parts = parse(content, filename, this.sourceMap)
+  var filename = path.basename(this.resourcePath)
+  filename = filename.substring(0, filename.lastIndexOf(path.extname(filename))) + '.vue'
+  var sourceRoot = path.dirname(path.relative(context, this.resourcePath))
+  var parts = parse(content, filename, this.sourceMap, sourceRoot)
   var part = parts[query.type]
   if (Array.isArray(part)) {
     part = part[query.index]