jonathan/combine.fm
jonathan/combine.fm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Restore postinstall

Browse source
This commit is contained in:
Jonathan Cremin 2015-07-23 08:51:00 +01:00
parent e01a0757f0
commit 1625b507d6
5 changed files with 54 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
public/jspm_packages public/jspm_packages
public/views
node_modules node_modules
public/**/*.gz public/**/*.gz
.DS_Store .DS_Store

2
Procfile
View file

@ -1 +1 @@
web: npm run build && npm start web: npm start

7
app.js
View file

@ -28,7 +28,7 @@ app.use(function* (next) {
yield next; yield next;
} catch (err) { } catch (err) {
if (!err.status) { if (!err.status) {
console.error(err.stack); debug('Error: %o', err);
} else if (err.status === 404) { } else if (err.status === 404) {
let Handler = yield createHandler(routes, this.request.url); let Handler = yield createHandler(routes, this.request.url);
@ -37,6 +37,7 @@ app.use(function* (next) {
this.body = '<!doctype html>\n' + content; this.body = '<!doctype html>\n' + content;
} else { } else {
debug('Error: %o', err);
throw err; throw err;
} }
} }
@ -89,10 +90,6 @@ app.use(route.get('/recent', function* () {
this.body = {recents: recents}; this.body = {recents: recents};
})); }));
app.use(route.get('*', function* () {
this.throw(404);
}));
module.exports = app; module.exports = app;
if (!module.parent) { if (!module.parent) {

95
package.json
View file

@ -4,68 +4,71 @@
"private": true, "private": true,
"scripts": { "scripts": {
"build": "babel -d public/views views && npm run jspm", "build": "babel -d public/views views && npm run jspm",
"cover": "istanbul cover _mocha -- --require babel/register --require co-mocha test/**/*.js",
"jspm": "./node_modules/.bin/jspm config registries.github.auth $JSPM_GITHUB_AUTH_TOKEN && jspm install", "jspm": "./node_modules/.bin/jspm config registries.github.auth $JSPM_GITHUB_AUTH_TOKEN && jspm install",
"start": "node -r 'babel/register' app.js", "start": "node -r babel/register app.js",
"postinstall": "npm run build",
"test": "mocha --require co-mocha --compilers js:babel/register test/**/*.js --timeout=10000", "test": "mocha --require co-mocha --compilers js:babel/register test/**/*.js --timeout=10000",
"watch": "parallelshell \"npm run watch-js\" \"npm run watch-server\"", "watch": "parallelshell \"npm run watch-js\" \"npm run watch-server\"",
"watch-js": "babel --modules system -wd public/views views", "watch-js": "babel --modules system -wd public/views views",
"watch-server": "nodemon -x \"node -r 'babel/register'\" -e js,jsx -i public/ app.js" "watch-server": "nodemon -x \"node -r babel/register\" -e js,jsx -i public/ app.js"
}, },
"engines": { "engines": {
"iojs": "~2.3.0" "iojs": "~2.3.0"
}, },
"dependencies": { "dependencies": {
"babel": "^5.5.8", "babel": "~5.6.14",
"babelify": "^6.0.2", "babelify": "~6.0.2",
"bluebird": "^2.9.30", "bluebird": "~2.9.30",
"browserify": "^10.1.3", "browserify": "~10.1.3",
"co": "^4.5.4", "co": "~4.6.0",
"debug": "^2.1.1", "debug": "~2.1.1",
"jspm": "^0.16.0-beta.3", "jspm": "~0.16.0-beta.3",
"koa": "^0.21.0", "koa": "~0.21.0",
"koa-bodyparser": "^2.0.0", "koa-bodyparser": "~2.0.0",
"koa-compress": "^1.0.8", "koa-compress": "~1.0.8",
"koa-favicon": "^1.2.0", "koa-favicon": "~1.2.0",
"koa-file-server": "^2.3.1", "koa-file-server": "~2.3.1",
"koa-logger": "^1.2.2", "koa-logger": "~1.2.2",
"koa-route": "^2.4.0", "koa-route": "~2.4.0",
"moment": "^2.10.3", "moment": "~2.10.3",
"mongodb-promisified": "^1.0.2", "mongodb-promisified": "~1.0.2",
"node-uuid": "^1.4.2", "node-uuid": "~1.4.2",
"playmusic": "^2.0.0", "playmusic": "~2.0.0",
"rdio": "^2.0.0", "rdio": "~2.0.0",
"react": "^0.13.3", "react": "~0.13.3",
"react-google-analytics": "^0.2.0", "react-google-analytics": "~0.2.0",
"react-router": "^0.13.3", "react-router": "~0.13.3",
"reactify": "^1.1.1", "reactify": "~1.1.1",
"spotify": "^0.3.0", "spotify": "~0.3.0",
"superagent": "^1.2.0", "superagent": "~1.2.0",
"superagent-bluebird-promise": "^2.0.2" "superagent-bluebird-promise": "~2.0.2"
}, },
"devDependencies": { "devDependencies": {
"co-mocha": "^1.1.0", "co-mocha": "~1.1.0",
"eslint": "^0.24.0", "eslint": "~0.24.0",
"eslint-plugin-react": "^2.5.1", "eslint-plugin-react": "~2.7.0",
"mocha": "^2.1.0", "istanbul": "^0.3.17",
"nodemon": "^1.3.7", "mocha": "~2.1.0",
"parallelshell": "^1.1.1", "nodemon": "~1.3.7",
"should": "^7.0.1", "parallelshell": "~1.1.1",
"spdy": "^1.32.0" "should": "~7.0.1",
"spdy": "~1.32.0"
}, },
"jspm": { "jspm": {
"directories": {
"baseURL": "public"
},
"dependencies": {
"react": "npm:react@^0.13.3",
"react-google-analytics": "npm:react-google-analytics@^0.2.0",
"react-router": "npm:react-router@^0.13.3",
"superagent": "npm:superagent@^1.2.0"
},
"devDependencies": {},
"buildConfig": { "buildConfig": {
"minify": true, "minify": true,
"transpileES6": true "transpileES6": true
},
"dependencies": {
"react": "npm:react@~0.13.3",
"react-google-analytics": "npm:react-google-analytics@~0.2.0",
"react-router": "npm:react-router@~0.13.3",
"superagent": "npm:superagent@~1.2.0"
},
"devDependencies": {},
"directories": {
"baseURL": "public"
} }
} }
} }

2
views/error.js
View file

@ -24,7 +24,7 @@ export default React.createClass({
<div className='col-md-6 col-md-offset-3'> <div className='col-md-6 col-md-offset-3'>
<h2>{this.props.status}</h2> <h2>{this.props.status}</h2>
<h1>{this.props.message}</h1> <h1>{this.props.message}</h1>
<pre>{this.props.error.stack || ''}</pre> <pre>{this.props.error || ''}</pre>
</div> </div>
</div> </div>
</div> </div>