Skip to content

Commit 58239f6

Browse files
committed
feat: respect user compiler / compilerOptions
1 parent 3e4bf14 commit 58239f6

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

Diff for: lib/template-loader/index.js

+10-13
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,21 @@ function actuallyCompile (sourceTemplate, options, loaderContext, query) {
6767
const hasComment = query.comment != null
6868
const hasFunctionalTemplate = query.functional != null
6969

70-
const {
71-
preserveWhitespace,
72-
modules,
73-
directives
74-
} = options.compilerOptions || {}
70+
const userCompilerOptions = options.compilerOptions || {}
7571

76-
const compilerOptions = {
72+
const compilerOptions = Object.assign({}, userCompilerOptions, {
7773
scopeId: query.scoped != null ? `data-v-${id}` : null,
78-
preserveWhitespace,
79-
modules: defaultModules.concat(modules || []),
80-
directives: directives || {},
74+
modules: defaultModules.concat(userCompilerOptions.modules || []),
8175
comments: hasComment
82-
}
76+
})
77+
78+
// support user compiler
79+
const compilerToUse = options.compiler || compiler
8380

8481
const compile =
85-
isServer && compiler.ssrCompile && options.optimizeSSR !== false
86-
? compiler.ssrCompile
87-
: compiler.compile
82+
isServer && compilerToUse.ssrCompile && options.optimizeSSR !== false
83+
? compilerToUse.ssrCompile
84+
: compilerToUse.compile
8885

8986
const compiled = compile(sourceTemplate, compilerOptions)
9087

0 commit comments

Comments
 (0)