Skip to content

Enable loading locally installed Vue compiler #314

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.

Sign up for GitHub

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
May 13, 2018
Merged

Enable loading locally installed Vue compiler #314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions packages/vue-component/plugin/vue-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ import { Meteor } from 'meteor/meteor'
import _ from 'lodash'
import 'colors'

let templateCompiler, transpile

if (vueVersion === 2) {
templateCompiler = require('vue-template-compiler')
transpile = require('vue-template-es2015-compiler')
}
let defaultTemplateCompiler, defaultTranspile
const loadDefaultTemplateCompiler = () => defaultTemplateCompiler || (defaultTemplateCompiler = require('vue-template-compiler'));
const loadDefaultTranspiler = () => defaultTranspile || (defaultTranspile = require('vue-template-es2015-compiler'));

function toFunction (code) {
return 'function (){' + code + '}'
Expand Down Expand Up @@ -546,8 +543,8 @@ function compileTags (inputFile, sfcDescriptor, parts, babelOptions, dependencyM
function compileOneFileWithContents (inputFile, contents, parts, babelOptions) {
try {
const cache = Cache.getCache(inputFile)

const sfcDescriptor = templateCompiler.parseComponent(contents, { pad: 'line' })
const compiler = loadPackage(inputFile, 'vue-template-compiler', loadDefaultTemplateCompiler)
const sfcDescriptor = compiler.parseComponent(contents, { pad: 'line' })

return compileTags(inputFile, sfcDescriptor, parts, babelOptions, cache.dependencyManager)
} catch (e) {
Expand Down Expand Up @@ -589,7 +586,8 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
// Template option
js += `__vue_options__.template = __vue_template__;\n`
} else if (vueVersion === 2) {
const templateCompilationResult = templateCompiler.compile(compileResult.template, {
const compiler = loadPackage(inputFile, 'vue-template-compiler', loadDefaultTemplateCompiler)
const templateCompilationResult = compiler.compile(compileResult.template, {
id: vueId,
warn: (message) => {
const msg = `${inputFilePath}: ${message}`
Expand Down Expand Up @@ -617,6 +615,7 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
staticRenderFns = `[${templateCompilationResult.staticRenderFns.map(toFunction).join(',')}]`
let renderJs = `__vue_options__.render = ${render};\n`
renderJs += `__vue_options__.staticRenderFns = ${staticRenderFns};\n`
const transpile = loadPackage(inputFile, 'vue-template-es2015-compiler', loadDefaultTranspiler)
renderJs = transpile(renderJs)
if (isDev) {
renderJs += `__vue_options__.render._withStripped = true;\n`
Expand Down Expand Up @@ -699,3 +698,15 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
staticRenderFns,
}
}

function loadPackage(inputFile, packageName, loadDefaultPackage) {
try {
return inputFile.require(packageName)
} catch (err) {
// console.log(`Unable to locally load package ${packageName}: ${err.toString().substring(0,40)}`)
/**
* If the user doesn't have the package installed, fallback to the one bundled with this plugin.
**/
return loadDefaultPackage()
}
}