moved hook to the template engine

Alexey Litvinov · Alexey Litvinov · commit 67922283376c · 2016-02-24T19:20:35.000+03:00
and small update for styles
diff --git a/demo/app/view-engine.js b/demo/app/view-engine.js
@@ -1,28 +1,19 @@
 'use strict';
 
 const babel = require('babel-core/register');
-const lodash = require('lodash');
+const forEach = require('lodash').forEach;
 const React = require('react');
 const ReactDOM = require('react-dom/server');
 
 const doctype = '<!doctype html>';
 
-/**
- * @param {object} view
- */
-function dropCache(view) {
-  const detectView = new RegExp(`^${view}`);
-
-  lodash.forEach(require.cache, (view, identity) => {
-    detectView.test(view.filename)
-      && delete require.cache[identity];
-  });
-}
-
 babel({
   only: /components/,
 });
 
+// teaches node.js to load css files
+require('css-modules-require-hook/preset');
+
 /**
  * @param {string}   file
  * @param {object}   opts
@@ -44,3 +35,15 @@ module.exports = function viewEngine(file, opts, cb) {
   dropCache(opts.settings.views);
   cb(null, markup);
 };
+
+/**
+ * @param {object} view
+ */
+function dropCache(view) {
+  const detectView = new RegExp(`^${view}`);
+
+  forEach(require.cache, (view, identity) => {
+    detectView.test(view.filename)
+      && delete require.cache[identity];
+  });
+}
diff --git a/demo/app/worker.js b/demo/app/worker.js
@@ -7,9 +7,6 @@ const viewEngine = require('./view-engine');
 const config = require('../package').config;
 const app = express();
 
-// teaches node.js to load css files
-require('css-modules-require-hook/preset');
-
 // sets react rendering engine
 app.engine('js', viewEngine);
 app.set('views', path.join(__dirname, '../components'));
diff --git a/demo/components/Button/Button.css b/demo/components/Button/Button.css
@@ -3,6 +3,7 @@
 {
   display: inline-block;
 
+  margin: 0 0 20px;
   padding: 0 11px;
 
   cursor: pointer;
diff --git a/demo/components/Title/Title.css b/demo/components/Title/Title.css
@@ -1,6 +1,6 @@
 .common
 {
-  margin: 20px 0;
+  margin: 0 0 20px;
 
   color: #333;
 
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -30,6 +30,7 @@ module.exports = {
   },
 
   postcss: [
+    // small sugar for CSS
     require('postcss-font-magician'),
     require('autoprefixer'),
   ],

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`display: inline-block;`
`5`	`5`
	`6`	`+ margin: 0 0 20px;`
`6`	`7`	`padding: 0 11px;`
`7`	`8`
`8`	`9`	`cursor: pointer;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`.common`
`2`	`2`	`{`
`3`		`- margin: 20px 0;`
	`3`	`+ margin: 0 0 20px;`
`4`	`4`
`5`	`5`	`color: #333;`
`6`	`6`