refactor style routing

packages/app/src/client/hackmd-styles.js

@@ -12,7 +12,7 @@
 
 /* eslint-disable no-console  */
 
-const styles = '{{styles}}'; // will be replaced by swig
+const styles = '<%= styles %>'; // will be replaced by ejs
 
 /**
  * Insert link tag to load style file
@@ -20,7 +20,7 @@ const styles = '{{styles}}'; // will be replaced by swig
 function insertStyle() {
   const element = document.createElement('style');
   element.type = 'text/css';
-  element.appendChild(document.createTextNode(unescape(styles)));
+  element.appendChild(document.createTextNode(styles));
   document.getElementsByTagName('head')[0].appendChild(element);
 }
 

packages/app/src/server/routes/hackmd.js

@@ -1,4 +1,4 @@
-import { styles, agent } from '@growi/hackmd';
+import { stylesCSS, styles, agent } from '@growi/hackmd';
 
 import loggerFactory from '~/utils/logger';
 
@@ -78,22 +78,13 @@ module.exports = function(crowi, app) {
    * @param {object} res
    */
   const loadStyles = function(req, res) {
-    // generate swig template
-    if (stylesScriptContentTpl == null) {
-      stylesScriptContentTpl = swig.compileFile(stylesScriptPath);
-    }
-
-    const styleFilePath = path.join(crowi.publicDir, manifest['styles/style-hackmd.css']);
-    const styles = fs
-      .readFileSync(styleFilePath).toString()
-      .replace(/\s+/g, ' ');
 
     // generate definitions to replace
     const definitions = {
-      styles: escape(styles),
+      styles: stylesCSS,
     };
-    // inject
-    const script = stylesScriptContentTpl(definitions);
+    // inject styles to script
+    const script = ejs.render(styles, definitions);
 
     res.set('Content-Type', 'application/javascript');
     res.send(script);