diff --git a/app.js b/app.js index 6f8898f..7f2faba 100644 --- a/app.js +++ b/app.js @@ -7,13 +7,14 @@ import favicon from 'koa-favicon'; import compress from 'koa-compress'; import staticHandler from 'koa-file-server'; import bodyparser from 'koa-bodyparser'; -import React from 'react'; import co from 'co'; import db from './config/db'; import index from './routes/index'; import search from './routes/search'; import share from './routes/share'; import itunesProxy from './routes/itunes-proxy'; + +import React from 'react'; import { routes } from './views/app'; import createHandler from './lib/react-handler'; import errorHandler from './lib/error-handler'; diff --git a/package.json b/package.json index 3666310..d2096fd 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "npm": "^3.3.0" }, "dependencies": { - "babel": "~5.8.3", + "babel": "~5.8.29", "bluebird": "~2.10.2", "co": "~4.6.0", "debug": "~2.2.0", - "jspm": "~0.16.0", - "koa": "~1.0.0", + "jspm": "~0.16.13", + "koa": "~1.1.1", "koa-bodyparser": "~2.0.0", "koa-compress": "~1.0.8", "koa-favicon": "~1.2.0", @@ -43,13 +43,13 @@ }, "devDependencies": { "co-mocha": "~1.1.0", - "eslint": "~1.3.0", - "eslint-plugin-react": "~3.3.0", - "istanbul": "^0.3.17", + "eslint": "~1.7.3", + "eslint-plugin-react": "~3.6.3", + "istanbul": "^0.4.0", "mocha": "~2.3.0", - "nodemon": "~1.7.1", + "nodemon": "~1.8.0", "parallelshell": "~2.0.0", - "should": "~7.1.0" + "should": "~7.1.1" }, "jspm": { "directories": { diff --git a/public/config.js b/public/config.js index da47c3d..35e4cf3 100644 --- a/public/config.js +++ b/public/config.js @@ -1042,19 +1042,19 @@ System.config({ map: { "react": "npm:react@0.13.3", "react-google-analytics": "npm:react-google-analytics@0.2.0", - "react-router": "npm:react-router@0.13.3", + "react-router": "npm:react-router@0.13.4", "superagent": "npm:superagent@1.2.0", "github:jspm/nodelibs-assert@0.1.0": { "assert": "npm:assert@1.3.0" }, "github:jspm/nodelibs-buffer@0.1.0": { - "buffer": "npm:buffer@3.4.2" + "buffer": "npm:buffer@3.5.1" }, "github:jspm/nodelibs-constants@0.1.0": { "constants-browserify": "npm:constants-browserify@0.0.1" }, "github:jspm/nodelibs-crypto@0.1.0": { - "crypto-browserify": "npm:crypto-browserify@3.9.14" + "crypto-browserify": "npm:crypto-browserify@3.10.0" }, "github:jspm/nodelibs-events@0.1.1": { "events": "npm:events@1.0.2" @@ -1075,7 +1075,7 @@ System.config({ "crypto": "github:jspm/nodelibs-crypto@0.1.0", "http": "github:jspm/nodelibs-http@1.7.1", "net": "github:jspm/nodelibs-net@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "stream": "github:jspm/nodelibs-stream@0.1.0", "timers": "github:jspm/nodelibs-timers@0.1.0", "util": "github:jspm/nodelibs-util@0.1.0" @@ -1086,8 +1086,8 @@ System.config({ "github:jspm/nodelibs-path@0.1.0": { "path-browserify": "npm:path-browserify@0.0.0" }, - "github:jspm/nodelibs-process@0.1.1": { - "process": "npm:process@0.10.1" + "github:jspm/nodelibs-process@0.1.2": { + "process": "npm:process@0.11.2" }, "github:jspm/nodelibs-querystring@0.1.0": { "querystring": "npm:querystring@0.2.0" @@ -1120,9 +1120,9 @@ System.config({ "fs": "github:jspm/nodelibs-fs@0.1.2", "module": "github:jspm/nodelibs-module@0.1.0", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:asn1.js@2.2.0": { + "npm:asn1.js@2.2.1": { "assert": "github:jspm/nodelibs-assert@0.1.0", "bn.js": "npm:bn.js@2.2.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -1134,19 +1134,34 @@ System.config({ "util": "npm:util@0.10.3" }, "npm:async@0.9.2": { - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:browserify-aes@1.0.3": { + "npm:browserify-aes@1.0.5": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "buffer-xor": "npm:buffer-xor@1.0.2", - "create-hash": "npm:create-hash@1.1.1", + "buffer-xor": "npm:buffer-xor@1.0.3", + "cipher-base": "npm:cipher-base@1.0.2", + "create-hash": "npm:create-hash@1.1.2", "crypto": "github:jspm/nodelibs-crypto@0.1.0", + "evp_bytestokey": "npm:evp_bytestokey@1.0.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "inherits": "npm:inherits@2.0.1", - "stream": "github:jspm/nodelibs-stream@0.1.0", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, + "npm:browserify-cipher@1.0.0": { + "browserify-aes": "npm:browserify-aes@1.0.5", + "browserify-des": "npm:browserify-des@1.0.0", + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "crypto": "github:jspm/nodelibs-crypto@0.1.0", + "evp_bytestokey": "npm:evp_bytestokey@1.0.0" + }, + "npm:browserify-des@1.0.0": { + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "cipher-base": "npm:cipher-base@1.0.2", + "crypto": "github:jspm/nodelibs-crypto@0.1.0", + "des.js": "npm:des.js@1.0.0", + "inherits": "npm:inherits@2.0.1" + }, "npm:browserify-rsa@2.0.1": { "bn.js": "npm:bn.js@2.2.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -1154,35 +1169,41 @@ System.config({ "crypto": "github:jspm/nodelibs-crypto@0.1.0", "randombytes": "npm:randombytes@2.0.1" }, - "npm:browserify-sign@3.0.3": { + "npm:browserify-sign@3.0.8": { "bn.js": "npm:bn.js@2.2.0", "browserify-rsa": "npm:browserify-rsa@2.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "create-hash": "npm:create-hash@1.1.1", - "create-hmac": "npm:create-hmac@1.1.3", + "create-hash": "npm:create-hash@1.1.2", + "create-hmac": "npm:create-hmac@1.1.4", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "elliptic": "npm:elliptic@3.1.0", "inherits": "npm:inherits@2.0.1", - "parse-asn1": "npm:parse-asn1@3.0.1", + "parse-asn1": "npm:parse-asn1@3.0.2", "stream": "github:jspm/nodelibs-stream@0.1.0" }, "npm:browserify-zlib@0.1.4": { "assert": "github:jspm/nodelibs-assert@0.1.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "pako": "npm:pako@0.2.7", - "process": "github:jspm/nodelibs-process@0.1.1", + "pako": "npm:pako@0.2.8", + "process": "github:jspm/nodelibs-process@0.1.2", "readable-stream": "npm:readable-stream@1.0.27-1", "util": "github:jspm/nodelibs-util@0.1.0" }, - "npm:buffer-xor@1.0.2": { + "npm:buffer-xor@1.0.3": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:buffer@3.4.2": { + "npm:buffer@3.5.1": { "base64-js": "npm:base64-js@0.0.8", "ieee754": "npm:ieee754@1.1.6", "is-array": "npm:is-array@1.0.1" }, + "npm:cipher-base@1.0.2": { + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "inherits": "npm:inherits@2.0.1", + "stream": "github:jspm/nodelibs-stream@0.1.0", + "string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0" + }, "npm:combined-stream@0.0.7": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "delayed-stream": "npm:delayed-stream@0.0.5", @@ -1195,34 +1216,34 @@ System.config({ "npm:core-util-is@1.0.1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0" }, - "npm:create-ecdh@2.0.1": { + "npm:create-ecdh@2.0.2": { "bn.js": "npm:bn.js@2.2.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "elliptic": "npm:elliptic@3.1.0" }, - "npm:create-hash@1.1.1": { + "npm:create-hash@1.1.2": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "cipher-base": "npm:cipher-base@1.0.2", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "inherits": "npm:inherits@2.0.1", "ripemd160": "npm:ripemd160@1.0.1", - "sha.js": "npm:sha.js@2.4.2", - "stream": "github:jspm/nodelibs-stream@0.1.0" + "sha.js": "npm:sha.js@2.4.4" }, - "npm:create-hmac@1.1.3": { + "npm:create-hmac@1.1.4": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "create-hash": "npm:create-hash@1.1.1", + "create-hash": "npm:create-hash@1.1.2", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "inherits": "npm:inherits@2.0.1", "stream": "github:jspm/nodelibs-stream@0.1.0" }, - "npm:crypto-browserify@3.9.14": { - "browserify-aes": "npm:browserify-aes@1.0.3", - "browserify-sign": "npm:browserify-sign@3.0.3", - "create-ecdh": "npm:create-ecdh@2.0.1", - "create-hash": "npm:create-hash@1.1.1", - "create-hmac": "npm:create-hmac@1.1.3", + "npm:crypto-browserify@3.10.0": { + "browserify-cipher": "npm:browserify-cipher@1.0.0", + "browserify-sign": "npm:browserify-sign@3.0.8", + "create-ecdh": "npm:create-ecdh@2.0.2", + "create-hash": "npm:create-hash@1.1.2", + "create-hmac": "npm:create-hmac@1.1.4", "diffie-hellman": "npm:diffie-hellman@3.0.2", "inherits": "npm:inherits@2.0.1", "pbkdf2": "npm:pbkdf2@3.0.4", @@ -1233,7 +1254,7 @@ System.config({ "fs": "github:jspm/nodelibs-fs@0.1.2", "ms": "npm:ms@0.7.1", "net": "github:jspm/nodelibs-net@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "tty": "github:jspm/nodelibs-tty@0.1.0", "util": "github:jspm/nodelibs-util@0.1.0" }, @@ -1241,6 +1262,11 @@ System.config({ "stream": "github:jspm/nodelibs-stream@0.1.0", "util": "github:jspm/nodelibs-util@0.1.0" }, + "npm:des.js@1.0.0": { + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "inherits": "npm:inherits@2.0.1", + "minimalistic-assert": "npm:minimalistic-assert@1.0.0" + }, "npm:diffie-hellman@3.0.2": { "bn.js": "npm:bn.js@2.2.0", "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -1258,12 +1284,17 @@ System.config({ }, "npm:envify@3.4.0": { "jstransform": "npm:jstransform@10.1.0", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "through": "npm:through@2.3.8" }, "npm:esprima-fb@13001.1001.0-dev-harmony-fb": { "fs": "github:jspm/nodelibs-fs@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" + }, + "npm:evp_bytestokey@1.0.0": { + "buffer": "github:jspm/nodelibs-buffer@0.1.0", + "create-hash": "npm:create-hash@1.1.2", + "crypto": "github:jspm/nodelibs-crypto@0.1.0" }, "npm:form-data@0.2.0": { "async": "npm:async@0.9.2", @@ -1274,7 +1305,7 @@ System.config({ "https": "github:jspm/nodelibs-https@0.1.0", "mime-types": "npm:mime-types@2.0.14", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "url": "github:jspm/nodelibs-url@0.1.0", "util": "github:jspm/nodelibs-util@0.1.0" }, @@ -1287,7 +1318,7 @@ System.config({ "http": "github:jspm/nodelibs-http@1.7.1", "os": "github:jspm/nodelibs-os@0.1.0", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "querystring": "github:jspm/nodelibs-querystring@0.1.0", "stream": "github:jspm/nodelibs-stream@0.1.0", "string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0", @@ -1307,7 +1338,7 @@ System.config({ "buffer": "github:jspm/nodelibs-buffer@0.1.0", "esprima-fb": "npm:esprima-fb@13001.1001.0-dev-harmony-fb", "fs": "github:jspm/nodelibs-fs@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "source-map": "npm:source-map@0.1.31" }, "npm:methods@1.0.1": { @@ -1327,69 +1358,70 @@ System.config({ "assert": "github:jspm/nodelibs-assert@0.1.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, "npm:os-browserify@0.1.2": { "os": "github:jspm/nodelibs-os@0.1.0" }, - "npm:pako@0.2.7": { + "npm:pako@0.2.8": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:parse-asn1@3.0.1": { - "asn1.js": "npm:asn1.js@2.2.0", - "browserify-aes": "npm:browserify-aes@1.0.3", + "npm:parse-asn1@3.0.2": { + "asn1.js": "npm:asn1.js@2.2.1", + "browserify-aes": "npm:browserify-aes@1.0.5", "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "create-hash": "npm:create-hash@1.1.1", + "create-hash": "npm:create-hash@1.1.2", + "evp_bytestokey": "npm:evp_bytestokey@1.0.0", "pbkdf2": "npm:pbkdf2@3.0.4", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, "npm:path-browserify@0.0.0": { - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:pbkdf2@3.0.4": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "child_process": "github:jspm/nodelibs-child_process@0.1.0", - "create-hmac": "npm:create-hmac@1.1.3", + "create-hmac": "npm:create-hmac@1.1.4", "crypto": "github:jspm/nodelibs-crypto@0.1.0", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "systemjs-json": "github:systemjs/plugin-json@0.1.0" }, - "npm:process@0.11.1": { + "npm:process@0.11.2": { "assert": "github:jspm/nodelibs-assert@0.1.0" }, "npm:public-encrypt@2.0.1": { "bn.js": "npm:bn.js@2.2.0", "browserify-rsa": "npm:browserify-rsa@2.0.1", "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "create-hash": "npm:create-hash@1.1.1", + "create-hash": "npm:create-hash@1.1.2", "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "parse-asn1": "npm:parse-asn1@3.0.1", + "parse-asn1": "npm:parse-asn1@3.0.2", "randombytes": "npm:randombytes@2.0.1" }, "npm:punycode@1.3.2": { - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:randombytes@2.0.1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "crypto": "github:jspm/nodelibs-crypto@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:react-google-analytics@0.2.0": { "react": "npm:react@0.13.3" }, - "npm:react-router@0.13.3": { + "npm:react-router@0.13.4": { "object-assign": "npm:object-assign@2.1.1", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "qs": "npm:qs@2.4.1", "react": "npm:react@0.13.3" }, "npm:react@0.13.3": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "envify": "npm:envify@3.4.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:readable-stream@1.0.27-1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -1397,25 +1429,25 @@ System.config({ "events": "github:jspm/nodelibs-events@0.1.1", "inherits": "npm:inherits@2.0.1", "isarray": "npm:isarray@0.0.1", - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "stream": "github:jspm/nodelibs-stream@0.1.0", "string_decoder": "npm:string_decoder@0.10.31" }, "npm:ripemd160@1.0.1": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:sha.js@2.4.2": { + "npm:sha.js@2.4.4": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "inherits": "npm:inherits@2.0.1", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:source-map@0.1.31": { "amdefine": "npm:amdefine@1.0.0", "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:stream-browserify@1.0.0": { "events": "github:jspm/nodelibs-events@0.1.1", @@ -1449,11 +1481,11 @@ System.config({ "zlib": "github:jspm/nodelibs-zlib@0.1.0" }, "npm:through@2.3.8": { - "process": "github:jspm/nodelibs-process@0.1.1", + "process": "github:jspm/nodelibs-process@0.1.2", "stream": "github:jspm/nodelibs-stream@0.1.0" }, "npm:timers-browserify@1.4.1": { - "process": "npm:process@0.11.1" + "process": "npm:process@0.11.2" }, "npm:url@0.10.3": { "assert": "github:jspm/nodelibs-assert@0.1.0", @@ -1463,7 +1495,7 @@ System.config({ }, "npm:util@0.10.3": { "inherits": "npm:inherits@2.0.1", - "process": "github:jspm/nodelibs-process@0.1.1" + "process": "github:jspm/nodelibs-process@0.1.2" }, "npm:vm-browserify@0.0.4": { "indexof": "npm:indexof@0.0.1"