Skip to content

use correct source map names for script files imported over src #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions lib/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,23 @@ function processScript(scriptPart, filePath, config) {

module.exports = function(src, filePath, config) {
const vueJestConfig = getVueJestConfig(config)
var parts = vueCompiler.parseComponent(src, { pad: true })
let parts = vueCompiler.parseComponent(src, { pad: true })
let scriptSrc = src
let sourceMapPath = filePath

if (parts.script && parts.script.src) {
parts.script.content = fs.readFileSync(
join(filePath, '..', parts.script.src),
'utf8'
)
const externalScrPath = join(filePath, '..', parts.script.src)

parts.script.content = fs.readFileSync(externalScrPath, 'utf8')
scriptSrc = parts.script.content
sourceMapPath = externalScrPath
}

const result = processScript(parts.script, filePath, config)
const script = result.code
const inputMap = result.map

let scriptSrc = src
if (parts.script && parts.script.src) {
scriptSrc = parts.script.content
}

const map = generateSourceMap(script, '', filePath, scriptSrc, inputMap)
const map = generateSourceMap(script, '', sourceMapPath, scriptSrc, inputMap)

let output =
';(function(){\n' +
Expand Down
3 changes: 3 additions & 0 deletions test/resources/SourceMapsSrc.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<template src="./BasicSrc.html"></template>

<script src="./BasicSrc.js"></script>
51 changes: 51 additions & 0 deletions test/sourceMaps.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { resolve } from 'path'
import { readFileSync } from 'fs'
import clearModule from 'clear-module'
import cache from '../lib/cache'
import jestVue from '../vue-jest'

beforeEach(() => {
cache.flushAll()
clearModule.all()
})

const getSourceMaps = code => {
const sourceMapBase64 = /\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,(.*)/gim

let matches
let values = []

while ((matches = sourceMapBase64.exec(code)) !== null) {
values.push(JSON.parse(Buffer.from(matches[1], 'base64').toString('ascii')))
}

return values
}

test('generates source maps for .vue files', () => {
const filePath = resolve(__dirname, './resources/Basic.vue')
const fileString = readFileSync(filePath, { encoding: 'utf8' })

const { code } = jestVue.process(fileString, filePath, {
moduleFileExtensions: ['js', 'vue']
})

const [template, js] = getSourceMaps(code)

expect(js.sources[0]).toBe('Basic.vue')
expect(template.sources[0]).toBe('Basic.vue')
})

test('generates source maps using src attributes', () => {
const filePath = resolve(__dirname, './resources/SourceMapsSrc.vue')
const fileString = readFileSync(filePath, { encoding: 'utf8' })

const { code } = jestVue.process(fileString, filePath, {
moduleFileExtensions: ['js', 'vue']
})

const [template, js] = getSourceMaps(code)

expect(js.sources[0]).toBe('BasicSrc.js')
expect(template.sources[0]).toBe('SourceMapsSrc.vue')
})