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

fix jsx support. fixes #30

Browse Source
This commit is contained in:
Kushagra Gour 2017-01-18 03:46:31 +05:30
parent 568eaceb6d
commit a500f2dd13
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/script.js
View File

@ -36,7 +36,7 @@ settingsBtn, onboardModal, notificationsBtn */
modes[HtmlModes.JADE] = { label: 'Jade', cmMode: 'jade', codepenVal: 'jade' }; modes[HtmlModes.JADE] = { label: 'Jade', cmMode: 'jade', codepenVal: 'jade' };
modes[JsModes.JS] = { label: 'JS', cmMode: 'javascript', codepenVal: 'none' }; modes[JsModes.JS] = { label: 'JS', cmMode: 'javascript', codepenVal: 'none' };
modes[JsModes.COFFEESCRIPT] = { label: 'CoffeeScript', cmMode: 'coffeescript', codepenVal: 'coffeescript' }; modes[JsModes.COFFEESCRIPT] = { label: 'CoffeeScript', cmMode: 'coffeescript', codepenVal: 'coffeescript' };
modes[JsModes.ES6] = { label: 'ES6 (Babel)', cmMode: 'javascript', codepenVal: 'babel' }; modes[JsModes.ES6] = { label: 'ES6 (Babel)', cmMode: 'jsx', codepenVal: 'babel' };
modes[CssModes.CSS] = { label: 'CSS', cmMode: 'css', codepenVal: 'none' }; modes[CssModes.CSS] = { label: 'CSS', cmMode: 'css', codepenVal: 'none' };
modes[CssModes.SCSS] = { label: 'SCSS', cmMode: 'sass', codepenVal: 'scss' }; modes[CssModes.SCSS] = { label: 'SCSS', cmMode: 'sass', codepenVal: 'scss' };
modes[CssModes.LESS] = { label: 'LESS', cmMode: 'text/x-less', codepenVal: 'less' }; modes[CssModes.LESS] = { label: 'LESS', cmMode: 'text/x-less', codepenVal: 'less' };
@ -505,15 +505,30 @@ settingsBtn, onboardModal, notificationsBtn */
} else if (jsMode === JsModes.ES6) { } else if (jsMode === JsModes.ES6) {
try { try {
ast = esprima.parse(code, { ast = esprima.parse(code, {
tolerant: true tolerant: 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 {
// No JSX block
// result = escodegen.generate(ast);
if (shouldPreventInfiniteLoops !== false) { if (shouldPreventInfiniteLoops !== false) {
utils.addInfiniteLoopProtection(ast); utils.addInfiniteLoopProtection(ast);
} }
d.resolve(Babel.transform(escodegen.generate(ast), { presets: ['es2015'] }).code); d.resolve(Babel.transform(escodegen.generate(ast), { presets: ['es2015', 'react'] }).code);
} catch (e) {
// If we failed, means probably the AST contains JSX which cannot be parsed by escodegen.
code = Babel.transform(code, { presets: ['es2015', 'react'] }).code;
ast = esprima.parse(code, {
tolerant: true
});
if (shouldPreventInfiniteLoops !== false) {
utils.addInfiniteLoopProtection(ast);
}
d.resolve(escodegen.generate(ast));
}
} }
} }