commit a539f53bc80eefe46d33c236b69b00e87ee9a4ee
parent 2a7587fec9e7ee8e041896b491cf19ed0a8ce5de
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Mon, 9 Feb 2015 01:57:07 +0300
Update npm module(s)
- Remove director
- Update bootstrap from 3.3.1 to 3.3.2
- Update express from 4.10.7 to 4.11.2
- Update jade from 1.9.0 to 1.9.2
- Update lodash from 2.4.1 to 3.1.0
- Update browser-sync from ^1.9.0 to ^2.0.0
- Update gulp-autoprefixer from ^2.0.0 to ^2.1.0
- Update gulp-changed from ^1.1.0 to ^1.1.1
- Update gulp-jshint from ^1.9.0 to ^1.9.2
- Update gulp-minify-css from ^0.3.11 to ^0.4.5
- Update gulp-replace from ^0.5.0 to ^0.5.2
- Update gulp-uglify from ^1.0.2 to ^1.1.0
- Update gulp-util from ^3.0.2 to ^3.0.3
- Update jest-cli from ^0.2.1 to ^0.2.2
- Update jshint from ^2.5.11 to ^2.6.0
- Update jshint-loader from ^0.8.0 to ^0.8.2
- Update less from ^2.2.0 to ^2.4.0
- Update nodemon from ^1.2.1 to ^1.3.6
- Update protractor from ^1.6.0 to ^1.6.1
- Update psi from ^1.0.4 to ^1.0.5
- Update style-loader from ^0.8.2 to ^0.8.3
- Update webpack from ^1.4.15 to ^1.5.3
- Update server.js to make it compatible with lodash 3.0
Diffstat:
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/package.json b/package.json
@@ -7,14 +7,13 @@
"license": "MIT",
"dependencies": {
"6to5": "3.5.3",
- "bootstrap": "3.3.1",
- "director": "1.2.7",
+ "bootstrap": "3.3.2",
"eventemitter3": "0.1.6",
- "express": "4.10.7",
+ "express": "4.11.2",
"flux": "2.0.1",
"front-matter": "0.2.1",
- "jade": "1.9.0",
- "lodash": "2.4.1",
+ "jade": "1.9.2",
+ "lodash": "3.1.0",
"react": "0.12.2",
"superagent": "0.21.0"
},
@@ -23,45 +22,45 @@
"6to5-jest": "^3.0.0",
"6to5-loader": "^3.0.0",
"autoprefixer-loader": "^1.1.0",
- "browser-sync": "^1.9.0",
+ "browser-sync": "^2.0.0-rc10",
"css-loader": "^0.9.1",
"del": "^1.1.1",
"gulp": "^3.8.10",
- "gulp-autoprefixer": "^2.0.0",
+ "gulp-autoprefixer": "^2.1.0",
"gulp-cache": "^0.2.4",
- "gulp-changed": "^1.1.0",
+ "gulp-changed": "^1.1.1",
"gulp-csscomb": "^3.0.3",
"gulp-gh-pages": "^0.4.0",
"gulp-htmlmin": "^1.0.0",
"gulp-if": "^1.2.5",
"gulp-imagemin": "^2.1.0",
"gulp-jsbeautifier": "^0.0.4",
- "gulp-jshint": "^1.9.0",
+ "gulp-jshint": "^1.9.2",
"gulp-less": "^2.0.1",
"gulp-load-plugins": "^0.8.0",
- "gulp-minify-css": "^0.3.11",
+ "gulp-minify-css": "^0.4.5",
"gulp-plumber": "^0.6.6",
"gulp-rename": "^1.2.0",
"gulp-render": "^0.2.2",
- "gulp-replace": "^0.5.0",
+ "gulp-replace": "^0.5.2",
"gulp-size": "^1.2.0",
- "gulp-uglify": "^1.0.2",
- "gulp-util": "^3.0.2",
- "jest-cli": "^0.2.1",
- "jshint": "^2.5.11",
- "jshint-loader": "^0.8.0",
+ "gulp-uglify": "^1.1.0",
+ "gulp-util": "^3.0.3",
+ "jest-cli": "^0.2.2",
+ "jshint": "^2.6.0",
+ "jshint-loader": "^0.8.2",
"jshint-stylish": "^1.0.0",
- "less": "^2.2.0",
+ "less": "^2.4.0",
"less-loader": "^2.0.0",
"minimist": "^1.1.0",
- "nodemon": "^1.2.1",
- "protractor": "^1.6.0",
- "psi": "^1.0.4",
+ "nodemon": "^1.3.6",
+ "protractor": "^1.6.1",
+ "psi": "^1.0.5",
"react-tools": "^0.12.2",
"run-sequence": "^1.0.2",
- "style-loader": "^0.8.2",
+ "style-loader": "^0.8.3",
"url-loader": "^0.5.5",
- "webpack": "^1.4.15",
+ "webpack": "^1.5.3",
"webpack-dev-server": "^1.7.0"
},
"jest": {
diff --git a/src/content/index.jade b/src/content/index.jade
@@ -7,8 +7,8 @@ div.row
dl
dt <a href="https://facebook.github.io/react/">React</a>
dd A JavaScript library for building user interfaces, developed by Facebook
- dt <a href="https://github.com/flatiron/director">Director</a>
- dd A tiny and isomorphic URL router for JavaScript
+ dt <a href="http://facebook.github.io/flux/">Flux</a>
+ dd Application architecture for building user interfaces
dt <a href="http://getbootstrap.com/">Bootstrap</a>
dd CSS framework for developing responsive, mobile first interfaces
div.col-sm-4
diff --git a/src/server.js b/src/server.js
@@ -21,7 +21,7 @@ global.__SERVER__ = true;
// The top-level React component + HTML template for it
var App = React.createFactory(require('./components/App'));
var templateFile = path.join(__dirname, 'templates/index.html');
-var template = fs.readFileSync(templateFile, 'utf8');
+var template = _.template(fs.readFileSync(templateFile, 'utf8'));
var Dispatcher = require('./core/Dispatcher');
var ActionTypes = require('./constants/ActionTypes');
var AppStore = require('./stores/AppStore');
@@ -48,11 +48,11 @@ server.get('*', function(req, res) {
onPageNotFound: function() { res.status(404); }
});
data.body = React.renderToString(app);
- var html = _.template(template, data);
+ var html = template(data);
res.send(html);
});
-// Load pages from the `/src/pages/` folder into the AppStore
+// Load pages from the `/src/content/` folder into the AppStore
(function() {
var assign = require('react/lib/Object.assign');
var fm = require('front-matter');
