Skip to content

use vm.Script to avoid reparse #4892

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
Feb 13, 2017
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
5 changes: 3 additions & 2 deletions src/server/create-bundle-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
} else {
throw new Error(INVALID_MSG)
}
const evaluate = runInVm(entry, files)
return {
renderToString: (context?: Object, cb: (err: ?Error, res: ?string) => void) => {
if (typeof context === 'function') {
cb = context
context = {}
}
runInVm(entry, files, context).catch(err => {
evaluate(context).catch(err => {
rewriteErrorTrace(err, maps)
cb(err)
}).then(app => {
Expand All @@ -61,7 +62,7 @@ export function createBundleRendererCreator (createRenderer: () => Renderer) {
},
renderToStream: (context?: Object) => {
const res = new PassThrough()
runInVm(entry, files, context).catch(err => {
evaluate(context).catch(err => {
rewriteErrorTrace(err, maps)
// avoid emitting synchronously before user can
// attach error listener
Expand Down
68 changes: 42 additions & 26 deletions src/server/run-in-vm.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,55 @@ function createContext (context) {
return sandbox
}

function evaluateModule (filename, files, context, evaluatedModules) {
if (evaluatedModules[filename]) {
return evaluatedModules[filename]
}
function compileModule (files) {
const compiledScripts = {}

const code = files[filename]
const wrapper = NativeModule.wrap(code)
const compiledWrapper = vm.runInNewContext(wrapper, context, {
filename,
displayErrors: true
})
const m = { exports: {}}
const r = file => {
file = path.join('.', file)
if (files[file]) {
return evaluateModule(file, files, context, evaluatedModules)
} else {
return require(file)
function getCompiledScript (filename) {
if (compiledScripts[filename]) {
return compiledScripts[filename]
}
const code = files[filename]
const wrapper = NativeModule.wrap(code)
const script = new vm.Script(wrapper, {
filename,
displayErrors: true
})
compiledScripts[filename] = script
return script
}
compiledWrapper.call(m.exports, m.exports, r, m)

const res = Object.prototype.hasOwnProperty.call(m.exports, 'default')
? m.exports.default
: m.exports
evaluatedModules[filename] = res
return res
function evaluateModule (filename, context, evaluatedModules) {
if (evaluatedModules[filename]) {
return evaluatedModules[filename]
}

const script = getCompiledScript(filename)
const compiledWrapper = script.runInNewContext(context)
const m = { exports: {}}
const r = file => {
file = path.join('.', file)
if (files[file]) {
return evaluateModule(file, context, evaluatedModules)
} else {
return require(file)
}
}
compiledWrapper.call(m.exports, m.exports, r, m)

const res = Object.prototype.hasOwnProperty.call(m.exports, 'default')
? m.exports.default
: m.exports
evaluatedModules[filename] = res
return res
}
return evaluateModule
}

export default function runInVm (entry, files, _context = {}) {
return new Promise((resolve, reject) => {
export default function runInVm (entry, files) {
const evaluate = compileModule(files)
return (_context = {}) => new Promise((resolve, reject) => {
const context = createContext(_context)
const res = evaluateModule(entry, files, context, {})
const res = evaluate(entry, context, {})
resolve(typeof res === 'function' ? res(_context) : res)
})
}