Commit 58239f64 authored by Evan You's avatar Evan You

feat: respect user compiler / compilerOptions

parent 3e4bf145
...@@ -67,24 +67,21 @@ function actuallyCompile (sourceTemplate, options, loaderContext, query) { ...@@ -67,24 +67,21 @@ function actuallyCompile (sourceTemplate, options, loaderContext, query) {
const hasComment = query.comment != null const hasComment = query.comment != null
const hasFunctionalTemplate = query.functional != null const hasFunctionalTemplate = query.functional != null
const { const userCompilerOptions = options.compilerOptions || {}
preserveWhitespace,
modules,
directives
} = options.compilerOptions || {}
const compilerOptions = { const compilerOptions = Object.assign({}, userCompilerOptions, {
scopeId: query.scoped != null ? `data-v-${id}` : null, scopeId: query.scoped != null ? `data-v-${id}` : null,
preserveWhitespace, modules: defaultModules.concat(userCompilerOptions.modules || []),
modules: defaultModules.concat(modules || []),
directives: directives || {},
comments: hasComment comments: hasComment
} })
// support user compiler
const compilerToUse = options.compiler || compiler
const compile = const compile =
isServer && compiler.ssrCompile && options.optimizeSSR !== false isServer && compilerToUse.ssrCompile && options.optimizeSSR !== false
? compiler.ssrCompile ? compilerToUse.ssrCompile
: compiler.compile : compilerToUse.compile
const compiled = compile(sourceTemplate, compilerOptions) const compiled = compile(sourceTemplate, compilerOptions)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment