Merge pull request #45 from samsel/working_master

bumped version

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.7.0 (June 22, 2015)
+
+* Windows path fix (https://github.com/paypal/react-engine/pull/41)
+
 ## 1.6.0 (May 13, 2015)
 
 * expose state/data on the client side using additional function called data. Helps in flux implementations, which need data even before booting.

lib/server.js

@@ -15,6 +15,7 @@
 
 'use strict';
 
+var path = require('path');
 var util = require('./util');
 var assert = require('assert');
 var Config = require('./config');
@@ -34,9 +35,6 @@ var TEMPLATE = ['<script id="%s" type="application/javascript">var ',
                 ' = %s;</script>'
               ].join('');
 
-// path utility to make path string compatible in different os
-var path = require('path');
-
 exports.create = function create(createOptions) {
 
   createOptions = createOptions || {};
@@ -104,6 +102,8 @@ exports.create = function create(createOptions) {
         });
       }
       else {
+        // path utility to make path string compatible in different OS
+        // ------------------------------------------------------------
         // use `path.normalize()` to normalzie absolute view file path and absolute base directory path
         // to prevent path strings like `/folder1/folder2/../../folder3/exampleFile`
         // then, derive relative view file path

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-engine",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "a composite render engine for express apps to render both plain react views and react-router views",
   "main": "index.js",
   "scripts": {