Skip to content

Commit

Permalink
Merge pull request #2930 from weaveworks/optional-deps
Browse files Browse the repository at this point in the history 
Remove optional dependencies
  • Loading branch information
@jpellizzari
jpellizzari authored Nov 13, 2017
2 parents 7863c3e + d684d0d commit b281f64
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 125 deletions.
13 changes: 5 additions & 8 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-env": "1.6.1",
"babel-preset-react": "6.24.1",
"browser-perf": "1.4.11",
"clean-webpack-plugin": "0.1.17",
"css-loader": "0.28.7",
"eslint": "4.9.0",
Expand All @@ -66,16 +67,18 @@
"eslint-plugin-import": "2.7.0",
"eslint-plugin-jsx-a11y": "6.0.2",
"eslint-plugin-react": "7.4.0",
"express": "4.15.2",
"extract-text-webpack-plugin": "2.1.0",
"file-loader": "1.1.5",
"html-webpack-plugin": "2.30.1",
"http-proxy": "1.16.2",
"http-proxy-rules": "1.1.1",
"immutable-devtools": "0.0.7",
"jest": "21.2.1",
"jest-cli": "21.2.1",
"json-loader": "0.5.7",
"mockdate": "2.0.2",
"node-sass": "4.5.3",
"node-sass": "^4.6.0",
"postcss-loader": "1.3.3",
"react-addons-perf": "15.4.2",
"redux-devtools": "3.4.0",
Expand All @@ -85,13 +88,7 @@
"style-loader": "0.19.0",
"url": "0.11.0",
"url-loader": "0.6.2",
"webpack": "2.4.1"
},
"optionalDependencies": {
"browser-perf": "1.4.11",
"express": "4.15.2",
"http-proxy": "1.16.2",
"perfjankie": "2.1.2",
"webpack": "2.4.1",
"webpack-dev-middleware": "1.10.2",
"webpack-hot-middleware": "2.18.0"
},
Expand Down
149 changes: 32 additions & 117 deletions client/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ brorand@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"

browser-perf@1.4.11, browser-perf@~1.4.0:
browser-perf@1.4.11:
version "1.4.11"
resolved "https://registry.yarnpkg.com/browser-perf/-/browser-perf-1.4.11.tgz#3d73394331438aa0dbf3455a98ab2306a035b2aa"
dependencies:
Expand All @@ -1184,10 +1184,6 @@ browser-perf@1.4.11, browser-perf@~1.4.0:
request "^2.65.0"
wd "^0.4.0"

browser-request@~0.3.0:
version "0.3.3"
resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"

browser-resolve@^1.11.2:
version "1.11.2"
resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
Expand Down Expand Up @@ -1562,12 +1558,6 @@ commander@2.11.x, commander@^2.11.0, commander@^2.8.1, commander@^2.9.0, command
version "2.11.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"

commander@~2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
dependencies:
graceful-readlink ">= 1.0.0"

commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
Expand Down Expand Up @@ -1980,7 +1970,7 @@ debug@2.6.1:
dependencies:
ms "0.7.2"

debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
debug@2.6.9, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
Expand Down Expand Up @@ -2049,7 +2039,7 @@ delegates@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"

depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
depd@1.1.1, depd@~1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"

Expand Down Expand Up @@ -2223,10 +2213,6 @@ error-ex@^1.2.0:
dependencies:
is-arrayish "^0.2.1"

errs@^0.3.0:
version "0.3.2"
resolved "https://registry.yarnpkg.com/errs/-/errs-0.3.2.tgz#798099b2dbd37ca2bc749e538a7c1307d0b50499"

es-abstract@^1.7.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
Expand Down Expand Up @@ -2429,7 +2415,7 @@ esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"

etag@~1.8.0, etag@~1.8.1:
etag@~1.8.0:
version "1.8.1"
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"

Expand Down Expand Up @@ -2692,14 +2678,6 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"

follow@^0.12.1:
version "0.12.1"
resolved "https://registry.yarnpkg.com/follow/-/follow-0.12.1.tgz#2c0efabbcd91613b0bb7382640f390ede8cab958"
dependencies:
browser-request "~0.3.0"
debug "^2.1.0"
request "~2.55.0"

font-awesome@4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
Expand Down Expand Up @@ -2764,10 +2742,6 @@ fresh@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"

fresh@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"

from@~0:
version "0.1.7"
resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
Expand Down Expand Up @@ -2902,16 +2876,6 @@ glob@~4.3.0:
minimatch "^2.0.1"
once "^1.3.0"

glob@~5.0.14:
version "5.0.15"
resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
dependencies:
inflight "^1.0.4"
inherits "2"
minimatch "2 || 3"
once "^1.3.0"
path-is-absolute "^1.0.0"

globals@^10.0.0:
version "10.1.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-10.1.0.tgz#4425a1881be0d336b4a823a82a7be725d5dd987c"
Expand Down Expand Up @@ -2943,10 +2907,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"

"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

graphlib@^1.0.5:
version "1.0.7"
resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-1.0.7.tgz#0cab2df0ffe6abe070b2625bfa1edb6ec967b8b1"
Expand Down Expand Up @@ -3163,7 +3123,7 @@ htmlparser2@~3.3.0:
domutils "1.1"
readable-stream "1.0"

http-errors@~1.6.1, http-errors@~1.6.2:
http-errors@~1.6.1:
version "1.6.2"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
dependencies:
Expand Down Expand Up @@ -4309,7 +4269,7 @@ mime@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"

mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
mime@^1.3.4, mime@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

Expand Down Expand Up @@ -4386,16 +4346,6 @@ nan@^2.3.0, nan@^2.3.2:
version "2.7.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"

nano@~6.1.5:
version "6.1.5"
resolved "https://registry.yarnpkg.com/nano/-/nano-6.1.5.tgz#e08359de7531ffd744cbd59fe4fbf9e8fc475d1f"
dependencies:
debug "^2.0.0"
errs "^0.3.0"
follow "^0.12.1"
request "^2.53.0"
underscore "^1.7.0"

natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
Expand Down Expand Up @@ -4531,6 +4481,29 @@ node-sass@4.5.3:
sass-graph "^2.1.1"
stdout-stream "^1.4.0"

node-sass@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.6.0.tgz#1a54f5f4502e3cde310a26d6346266fd667271d9"
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
cross-spawn "^3.0.0"
gaze "^1.0.0"
get-stdin "^4.0.1"
glob "^7.0.3"
in-publish "^2.0.0"
lodash.assign "^4.2.0"
lodash.clonedeep "^4.3.2"
lodash.mergewith "^4.6.0"
meow "^3.7.0"
mkdirp "^0.5.1"
nan "^2.3.2"
node-gyp "^3.3.1"
npmlog "^4.0.0"
request "^2.79.0"
sass-graph "^2.2.4"
stdout-stream "^1.4.0"

node-uuid@~1.4.0:
version "1.4.8"
resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
Expand Down Expand Up @@ -4854,19 +4827,6 @@ pbkdf2@^3.0.3:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

perfjankie@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/perfjankie/-/perfjankie-2.1.2.tgz#9034ef20cc7390848e157c890ab2034689b6dcd6"
dependencies:
browser-perf "~1.4.0"
commander "~2.8.1"
glob "~5.0.14"
nano "~6.1.5"
q "~1.4.1"
sauce-tunnel "^2.2.3"
semver "^5.0.1"
serve-static "^1.10.0"

performance-now@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
Expand Down Expand Up @@ -5703,7 +5663,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"

request@2, request@^2.53.0, request@^2.65.0, request@^2.72.0, request@^2.79.0:
request@2, request@^2.65.0, request@^2.79.0:
version "2.83.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
dependencies:
Expand Down Expand Up @@ -5889,7 +5849,7 @@ sane@^2.0.0:
optionalDependencies:
fsevents "^1.1.1"

sass-graph@^2.1.1:
sass-graph@^2.1.1, sass-graph@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
dependencies:
Expand All @@ -5908,14 +5868,6 @@ sass-loader@6.0.6:
lodash.tail "^4.1.1"
pify "^3.0.0"

sauce-tunnel@^2.2.3:
version "2.5.0"
resolved "https://registry.yarnpkg.com/sauce-tunnel/-/sauce-tunnel-2.5.0.tgz#0ee4c4ff9b47e013e8b072cbfac495b7fed8e8eb"
dependencies:
chalk "^1.1.3"
request "^2.72.0"
split "^1.0.0"

sax@^1.2.1, sax@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
Expand All @@ -5933,7 +5885,7 @@ scss-tokenizer@^0.2.3:
js-base64 "^2.1.8"
source-map "^0.4.2"

"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0:
"semver@2 || 3 || 4 || 5", semver@^5.3.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"

Expand All @@ -5959,24 +5911,6 @@ send@0.15.1:
range-parser "~1.2.0"
statuses "~1.3.1"

send@0.16.1:
version "0.16.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
dependencies:
debug "2.6.9"
depd "~1.1.1"
destroy "~1.0.4"
encodeurl "~1.0.1"
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
http-errors "~1.6.2"
mime "1.4.1"
ms "2.0.0"
on-finished "~2.3.0"
range-parser "~1.2.0"
statuses "~1.3.1"

serve-static@1.12.1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.1.tgz#7443a965e3ced647aceb5639fa06bf4d1bbe0039"
Expand All @@ -5986,15 +5920,6 @@ serve-static@1.12.1:
parseurl "~1.3.1"
send "0.15.1"

serve-static@^1.10.0:
version "1.13.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
dependencies:
encodeurl "~1.0.1"
escape-html "~1.0.3"
parseurl "~1.3.2"
send "0.16.1"

set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
Expand Down Expand Up @@ -6135,12 +6060,6 @@ split@0.3:
dependencies:
through "2"

split@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
dependencies:
through "2"

sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
Expand Down Expand Up @@ -6517,10 +6436,6 @@ underscore.string@~3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.0.3.tgz#4617b8c1a250cf6e5064fbbb363d0fa96cf14552"

underscore@^1.7.0:
version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"

uniq@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
Expand Down

0 comments on commit b281f64

Please sign in to comment.