Skip to content

Commit 8e6a36c

Browse files
committed
chore: fix error reporting
1 parent e90d870 commit 8e6a36c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/loaders/templateLoader.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ module.exports = function (source) {
6363

6464
// errors
6565
if (compiled.errors && compiled.errors.length) {
66+
const generateCodeFrame =
67+
(templateCompiler && templateCompiler.generateCodeFrame) ||
68+
compiler.generateCodeFrame
6669
// 2.6 compiler outputs errors as objects with range
67-
if (
68-
compiler.generateCodeFrame &&
69-
finalOptions.compilerOptions.outputSourceRange
70-
) {
70+
if (generateCodeFrame && finalOptions.compilerOptions.outputSourceRange) {
7171
// TODO account for line offset in case template isn't placed at top
7272
// of the file
7373
loaderContext.emitError(
7474
`\n\n Errors compiling template:\n\n` +
7575
compiled.errors
7676
.map(({ msg, start, end }) => {
77-
const frame = compiler.generateCodeFrame(source, start, end)
77+
const frame = generateCodeFrame(source, start, end)
7878
return ` ${msg}\n\n${pad(frame)}`
7979
})
8080
.join(`\n\n`) +

0 commit comments

Comments
 (0)