add prettier for html support

src/components/ContentWrap.jsx

@@ -12,7 +12,7 @@ import CssSettingsModal from './CssSettingsModal';
 const minCodeWrapSize = 33;
 
 /* global htmlCodeEl, jsCodeEl, cssCodeEl, logCountEl
-*/
+ */
 
 export default class ContentWrap extends Component {
 	constructor(props) {
@@ -222,8 +222,7 @@ export default class ContentWrap extends Component {
 				if (targetFrame.contentDocument.querySelector('#webmakerstyle')) {
 					targetFrame.contentDocument.querySelector(
 						'#webmakerstyle'
-					).textContent =
+					).textContent = result.code || '';
-						result.code || '';
 				}
 			});
 		} else {
@@ -752,6 +751,8 @@ export default class ContentWrap extends Component {
 								gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
 								noAutocomplete: true,
 								matchTags: { bothTags: true },
+								prettier: true,
+								prettierParser: 'html',
 								emmet: true
 							}}
 							prefs={this.props.prefs}

src/components/UserCodeMirror.jsx

@@ -80,12 +80,13 @@ export default class UserCodeMirror extends Component {
 					CodeMirror.commands.goLineDown(editor);
 				},
 				'Shift-Tab': function(editor) {
+					CodeMirror.commands.indentAuto(editor);
+				},
+				'Shift-Ctrl-F': function(editor) {
 					if (options.prettier) {
 						prettify(editor.getValue(), options.prettierParser).then(
 							formattedCode => editor.setValue(formattedCode)
 						);
-					} else {
-						CodeMirror.commands.indentAuto(editor);
 					}
 				},
 				Tab: function(editor) {

src/lib/prettier-worker.js

@@ -2,10 +2,14 @@ importScripts('./prettier/standalone.js');
 
 function prettify({ content, type }) {
 	let plugins, parser;
-	if (type === 'js') {
+	if (type === 'html') {
+		importScripts('./prettier/parser-html.js');
+		parser = 'html';
+	}else if (type === 'js') {
 		parser = 'babylon';
 		importScripts('./prettier/parser-babylon.js');
-	} else if (type === 'css') {
+	}  
+	else if (type === 'css') {
 		parser = 'css';
 		importScripts('./prettier/parser-postcss.js');
 	}

src/utils.js

@@ -465,7 +465,7 @@ export function prettify(content, type = 'js') {
 	const worker = new Worker(
 		chrome.extension
 			? chrome.extension.getURL('lib/prettier-worker.js')
-			: `${BASE_PATH}/lib/prettier-worker.js`
+			: `${BASE_PATH === '/' ? '' : BASEPATH}/lib/prettier-worker.js`
 	);
 	worker.postMessage({ content, type });
 	worker.addEventListener('message', e => {