mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-14 10:36:19 +02:00
Code Issues Releases Wiki Activity

refactor es6 compilation code

Browse Source
This commit is contained in:
Kushagra Gour
2017-04-02 15:30:36 +05:30
parent 699e835204
commit 888d4a6309
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/script.js
View File

@ -599,11 +599,10 @@ onboardDontShowInTabOptionBtn, TextareaAutoComplete, savedItemCountEl, indentati
d.resolve(''); d.resolve('');
return d.promise; return d.promise;
} }
var ast;
if (jsMode === JsModes.JS) { if (jsMode === JsModes.JS) {
try { try {
ast = esprima.parse(code, { esprima.parse(code, {
tolerant: true tolerant: true
}); });
} catch (e) { } catch (e) {
@ -636,30 +635,18 @@ onboardDontShowInTabOptionBtn, TextareaAutoComplete, savedItemCountEl, indentati
return d.promise; return d.promise;
} }
try { try {
ast = esprima.parse(code, { esprima.parse(code, {
tolerant: true, tolerant: true,
jsx: true jsx: true
}); });
} catch (e) { } catch (e) {
showErrors('js', [ { lineNumber: e.lineNumber - 1, message: e.description } ]); showErrors('js', [ { lineNumber: e.lineNumber - 1, message: e.description } ]);
} finally { } finally {
try { code = Babel.transform(code, { presets: ['latest', 'stage-2', 'react'] }).code;
// No JSX block if (shouldPreventInfiniteLoops !== false) {
// result = escodegen.generate(ast); code = utils.addInfiniteLoopProtection(code);
if (shouldPreventInfiniteLoops !== false) {
code = utils.addInfiniteLoopProtection(code);
}
// FIX ME, add jsx for loop protection above
d.resolve(Babel.transform(code, { presets: ['latest', 'stage-2', 'react'] }).code);
} catch (e) {
// If we failed, means probably the AST contains JSX which cannot be parsed by escodegen.
code = Babel.transform(code, { presets: ['latest', 'stage-2', 'react'] }).code;
if (shouldPreventInfiniteLoops !== false) {
code = utils.addInfiniteLoopProtection(code);
}
d.resolve(code);
} }
d.resolve(code);
} }
} else if (jsMode === JsModes.TS) { } else if (jsMode === JsModes.TS) {
try { try {