use cached version in prod mode, add ejs pre renderer loader

sourcejs · Oct 6, 2015 · 9806cd4 · 9806cd4
1 parent c92067b
commit 9806cd4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/core/loaders/preejs-loader.js b/core/loaders/preejs-loader.js
@@ -0,0 +1,12 @@
+
+var path = require('path');
+var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
+
+module.exports = function (source) {
+	try {
+		return ejs.render(source, {info: global.__currentSpecInfo__});
+	} catch(e) {
+		console.log('error prerendering webpack files', e);
+		return source;
+	}
+};
diff --git a/core/middleware/index.js b/core/middleware/index.js
@@ -32,9 +32,19 @@ var processRequest = function (req, res, next) {
         var outputPath = path.join(specPath, 'build/index.js');
         var insertReactTpl = fs.readFileSync(path.join(currentDir, '../templates/insert-react.ejs'), 'utf-8');
 
+        if (
+            (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'presentation') &&
+            fs.existsSync(outputPath)
+        ) {
+            req.specData.renderedHtml += '<script src="build/index.js"></script>';
+            next();
+            return;
+        }
+
         fs.outputFileSync(outputPath, ejs.render(insertReactTpl));
 
-        //if (false) {
+        global.__currentSpecInfo__ = req.specData.info;
+
         if (fs.existsSync(jsxFilePath)) {
             webpack({
                 entry: outputPath,
@@ -45,14 +55,21 @@ var processRequest = function (req, res, next) {
                 devtool: "#inline-source-map",
                 module: {
                     loaders: [
-                        {test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader'}
+                        // TODO: load stripejs only for styleguide
+                        {test: /\.jsx?$/, loader: 'babel-loader!preejs'}
                     ]
                 },
                 resolveLoader: {
-                    root: path.join(currentDir, '../../node_modules')
+                    modulesDirectories: [
+                        path.join(currentDir, '../../node_modules'),
+                        path.join(currentDir, '../loaders'),
+                        'node_modules'
+                    ]
                 }
-            }, function(err) {
+            }, function(err, stats) {
                 if (err) console.log('error', err);
+                if (stats.compilation.errors) console.log(stats.compilation.errors.toString());
+                if (stats.compilation.warnings) console.log(stats.compilation.warnings.toString());
 
                 next();
             });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sourcejs-webpack",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "SourceJS webpack builder middleware.",
   "repository": {
     "type": "git",