From ab80a0b0473f64e6e1fe2d1acbfd46bb1fd54b24 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Wed, 26 Apr 2017 22:25:52 -0700 Subject: [PATCH] Upgraded koa --- package.json | 15 ++--- yarn.lock | 182 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index a5e4ac77..6727132b 100644 --- a/package.json +++ b/package.json @@ -96,19 +96,17 @@ "js-tree": "1.1.0", "json-loader": "0.5.4", "jsonwebtoken": "7.0.1", - "koa": "2.0.0", + "koa": "^2.2.0", "koa-bodyparser": "2.0.1", "koa-compress": "2.0.0", "koa-connect": "1.0.0", "koa-convert": "1.2.0", "koa-helmet": "1.0.0", - "koa-jwt": "1.2.0", - "koa-logger": "2.0.0", - "koa-mount": "2.0.0", + "koa-jwt": "^3.2.1", + "koa-logger": "^2.0.1", + "koa-mount": "^3.0.0", "koa-router": "7.0.1", "koa-sendfile": "2.0.0", - "koa-webpack-dev-middleware": "1.2.0", - "koa-webpack-hot-middleware": "1.0.3", "localenv": "0.2.2", "lodash": "^4.17.4", "lodash.orderby": "4.4.0", @@ -120,7 +118,6 @@ "moment": "2.13.0", "node-dev": "3.1.0", "node-sass": "3.8.0", - "nodemon": "^1.11.0", "normalize.css": "4.1.1", "normalizr": "2.0.1", "pg": "^6.1.5", @@ -164,11 +161,11 @@ "identity-obj-proxy": "^3.0.0", "ignore-loader": "0.1.1", "jest-cli": "^15.1.1", - "koa-webpack-dev-middleware": "1.2.0", + "koa-webpack-dev-middleware": "1.4.5", "koa-webpack-hot-middleware": "1.0.3", "lint-staged": "^3.4.0", "node-dev": "3.1.0", - "nodemon": "1.9.1", + "nodemon": "1.11.0", "prettier": "^1.2.2", "react-addons-test-utils": "^15.3.1", "react-test-renderer": "^15.3.1" diff --git a/yarn.lock b/yarn.lock index 31b80670..9dab6916 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1083,6 +1083,10 @@ base64-url@^1.2.1: version "1.3.2" resolved "https://registry.yarnpkg.com/base64-url/-/base64-url-1.3.2.tgz#4b08113b49d23889f306be64372762d31412f7a8" +base64url@2.0.0, base64url@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb" + base64url@~1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/base64url/-/base64url-1.0.6.tgz#d64d375d68a7c640d912e2358d170dca5bb54681" @@ -1264,7 +1268,7 @@ bser@^1.0.2: dependencies: node-int64 "^0.4.0" -buffer-equal-constant-time@^1.0.1: +buffer-equal-constant-time@1.0.1, buffer-equal-constant-time@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" @@ -1841,12 +1845,12 @@ cookie@0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.1.3.tgz#e734a5c1417fce472d5aef82c381cabb64d1a435" -cookies@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.6.1.tgz#ef693b1bc6f01f567d46e2f504e9c15fb70cba90" +cookies@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.0.tgz#0bc961d910c35254980fc7c9eff5da12011bbf00" dependencies: depd "~1.1.0" - keygrip "~1.0.0" + keygrip "~1.0.1" copy-to@~2.0.1: version "2.0.1" @@ -2143,6 +2147,12 @@ debug@*, debug@2.2.0, debug@^2.1.1, debug@^2.2.0, debug@~2.2.0: dependencies: ms "0.7.1" +debug@^2.6.1: + version "2.6.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0" + dependencies: + ms "0.7.3" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2282,14 +2292,14 @@ domain-browser@^1.1.1: version "1.1.7" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" -domelementtype@1, domelementtype@~1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" - -domelementtype@^1.3.0: +domelementtype@1, domelementtype@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" +domelementtype@~1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" + domhandler@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594" @@ -2368,6 +2378,13 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" +ecdsa-sig-formatter@1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz#4bc926274ec3b5abb5016e7e1d60921ac262b2a1" + dependencies: + base64url "^2.0.0" + safe-buffer "^5.0.1" + ecdsa-sig-formatter@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz#3137e976a1d6232517e2513e04e32f79bcbdf126" @@ -3111,10 +3128,14 @@ frameguard@1.1.0: dependencies: lodash.isstring "4.0.1" -fresh@0.3.0, fresh@^0.3.0: +fresh@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f" +fresh@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e" + from@~0: version "0.1.3" resolved "https://registry.yarnpkg.com/from/-/from-0.1.3.tgz#ef63ac2062ac32acf7862e0d40b44b896f22f3bc" @@ -3729,7 +3750,7 @@ https-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" -humanize-number@~0.0.1: +humanize-number@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/humanize-number/-/humanize-number-0.0.2.tgz#11c0af6a471643633588588048f1799541489c18" @@ -4412,7 +4433,7 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" -joi@~6.10.1: +joi@^6.10.1, joi@~6.10.1: version "6.10.1" resolved "https://registry.yarnpkg.com/joi/-/joi-6.10.1.tgz#4d50c318079122000fe5f16af1ff8e1917b77e06" dependencies: @@ -4543,14 +4564,6 @@ jsonpointer@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5" -jsonwebtoken@5.x.x: - version "5.7.0" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz#1c90f9a86ce5b748f5f979c12b70402b4afcddb4" - dependencies: - jws "^3.0.0" - ms "^0.7.1" - xtend "^4.0.1" - jsonwebtoken@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.0.1.tgz#4aba9fea3552c8f1d415d4117ab80aa09d6af55e" @@ -4560,6 +4573,16 @@ jsonwebtoken@7.0.1: ms "^0.7.1" xtend "^4.0.1" +jsonwebtoken@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-7.3.0.tgz#85118d6a70e3fccdf14389f4e7a1c3f9c8a9fbba" + dependencies: + joi "^6.10.1" + jws "^3.1.4" + lodash.once "^4.0.0" + ms "^0.7.1" + xtend "^4.0.1" + jsprim@^1.2.2: version "1.3.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252" @@ -4587,6 +4610,15 @@ jwa@^1.1.2: buffer-equal-constant-time "^1.0.1" ecdsa-sig-formatter "^1.0.0" +jwa@^1.1.4: + version "1.1.5" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5" + dependencies: + base64url "2.0.0" + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.9" + safe-buffer "^5.0.1" + jws@^3.0.0: version "3.1.3" resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.3.tgz#b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c" @@ -4594,7 +4626,15 @@ jws@^3.0.0: base64url "~1.0.4" jwa "^1.1.2" -keygrip@~1.0.0: +jws@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2" + dependencies: + base64url "^2.0.0" + jwa "^1.1.4" + safe-buffer "^5.0.1" + +keygrip@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.1.tgz#b02fa4816eef21a8c4b35ca9e52921ffc89a30e9" @@ -4621,6 +4661,12 @@ koa-compose@^3.0.0: dependencies: any-promise "^1.1.0" +koa-compose@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-3.2.1.tgz#a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7" + dependencies: + any-promise "^1.1.0" + koa-compress@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-2.0.0.tgz#7b7eb2921b847746b5e122ba9f5cd8a671e8ea3a" @@ -4653,29 +4699,28 @@ koa-is-json@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/koa-is-json/-/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14" -koa-jwt@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/koa-jwt/-/koa-jwt-1.2.0.tgz#c0589c2c27d7e0b497a22cb28575d0bc7dc0f959" +koa-jwt@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/koa-jwt/-/koa-jwt-3.2.1.tgz#15a6c9a148c18826f12b9a74185571db2a18dcee" dependencies: - jsonwebtoken "5.x.x" - koa-unless "0.0.1" - thunkify "~2.1.x" + jsonwebtoken "7.3.0" + koa-unless "1.0.0" -koa-logger@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/koa-logger/-/koa-logger-2.0.0.tgz#003d29b4bf37dbc0020e509e37b7ff2574695f30" +koa-logger@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/koa-logger/-/koa-logger-2.0.1.tgz#3ee42f457c40fb4d4a19a131c8022504b5b232b8" dependencies: bytes "1" - chalk "^1.0.0" - humanize-number "~0.0.1" + chalk "^1.1.3" + humanize-number "0.0.2" passthrough-counter "^1.0.0" -koa-mount@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-2.0.0.tgz#728b7d01ab23e7e58dc588e52fc554d67ee981db" +koa-mount@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/koa-mount/-/koa-mount-3.0.0.tgz#08cab3b83d31442ed8b7e75c54b1abeb922ec197" dependencies: - debug "*" - koa-compose "^3.0.0" + debug "^2.6.1" + koa-compose "^3.2.1" koa-router@7.0.1: version "7.0.1" @@ -4695,15 +4740,15 @@ koa-sendfile@2.0.0: etag "^1.5.1" mz "2" -koa-unless@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/koa-unless/-/koa-unless-0.0.1.tgz#cfcdd1cdfbaf066e05d843e6a412df8a7c69b218" +koa-unless@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/koa-unless/-/koa-unless-1.0.0.tgz#5aa57384bc882568afc90ac04852a3d58658aeeb" -koa-webpack-dev-middleware@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/koa-webpack-dev-middleware/-/koa-webpack-dev-middleware-1.2.0.tgz#44714171f974a736166124926c09aefcfaf3af7f" +koa-webpack-dev-middleware@1.4.5: + version "1.4.5" + resolved "https://registry.yarnpkg.com/koa-webpack-dev-middleware/-/koa-webpack-dev-middleware-1.4.5.tgz#78e50668bb6d8c063fbc858ff2bc235b7464550d" dependencies: - webpack-dev-middleware "1.5.x" + webpack-dev-middleware "^1.10.0" koa-webpack-hot-middleware@1.0.3: version "1.0.3" @@ -4711,21 +4756,21 @@ koa-webpack-hot-middleware@1.0.3: dependencies: webpack-hot-middleware "2.x" -koa@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/koa/-/koa-2.0.0.tgz#da865ae8ee4afae070425290455d2cdf4885f9dc" +koa@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.2.0.tgz#b055933187849d540ad8b9f731baaa4be97c652d" dependencies: accepts "^1.2.2" content-disposition "~0.5.0" content-type "^1.0.0" - cookies "~0.6.1" + cookies "~0.7.0" debug "*" delegates "^1.0.0" depd "^1.1.0" destroy "^1.0.3" error-inject "~1.0.0" escape-html "~1.0.1" - fresh "^0.3.0" + fresh "^0.5.0" http-assert "^1.1.0" http-errors "^1.2.8" is-generator-function "^1.0.3" @@ -5133,6 +5178,10 @@ lodash.merge@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + lodash.orderby@4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.4.0.tgz#af46cd37867c42f2c32d3be6b9fc681c99cba98d" @@ -5370,6 +5419,13 @@ memory-fs@~0.3.0: errno "^0.1.3" readable-stream "^2.0.1" +memory-fs@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" + dependencies: + errno "^0.1.3" + readable-stream "^2.0.1" + meow@^3.3.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -5535,6 +5591,10 @@ ms@0.7.1, ms@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" +ms@0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff" + multimatch@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" @@ -5767,7 +5827,7 @@ node-uuid@~1.4.4, node-uuid@~1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f" -nodemon@^1.11.0: +nodemon@1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c" dependencies: @@ -6701,7 +6761,7 @@ randomstring@1.1.5: dependencies: array-uniq "1.0.2" -range-parser@~1.0.3: +range-parser@^1.0.3, range-parser@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz#6872823535c692e2c2a0103826afd82c2e0ff175" @@ -7234,6 +7294,10 @@ rxjs@^5.0.0-beta.11: dependencies: symbol-observable "^1.0.1" +safe-buffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7" + safestart@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/safestart/-/safestart-0.8.0.tgz#f6716cb863afa54db7fb2169c29ce85e30b5654d" @@ -7848,10 +7912,6 @@ through@2, through@^2.3.6, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -thunkify@~2.1.x: - version "2.1.2" - resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d" - tildify@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" @@ -8260,12 +8320,14 @@ webpack-core@~0.6.0: source-list-map "~0.1.0" source-map "~0.4.1" -webpack-dev-middleware@1.5.x: - version "1.5.1" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.5.1.tgz#c46e075467881211e3fca34af1cdadf47163c89a" +webpack-dev-middleware@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1" dependencies: - memory-fs "~0.3.0" + memory-fs "~0.4.1" mime "^1.3.4" + path-is-absolute "^1.0.0" + range-parser "^1.0.3" webpack-hot-middleware@2.x: version "2.13.0"