From ccc6369f28c1cfc9cfb20113fbb98ccec3332572 Mon Sep 17 00:00:00 2001
From: Kyle Poole <2kylepoole@gmail.com>
Date: Mon, 26 Jun 2017 13:09:11 -0700
Subject: [PATCH 1/3] i donno
---
package.json | 18 ++--
src/scenes/Other/Other.js | 2 +
yarn.lock | 198 ++++++++++++++++++++++++++------------
3 files changed, 148 insertions(+), 70 deletions(-)
diff --git a/package.json b/package.json
index d86db22..f7a8f33 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
},
"devDependencies": {
"babel-core": "^6.24.1",
- "babel-eslint": "^7.2.2",
- "babel-loader": "^6.4.1",
+ "babel-eslint": "^7.2.3",
+ "babel-loader": "^7.0.0",
"babel-plugin-react-html-attrs": "^2.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-do-expressions": "^6.22.0",
@@ -48,7 +48,7 @@
"file-loader": "^0.11.1",
"flow-bin": "^0.44.2",
"flow-coverage-report": "^0.3.0",
- "flow-typed": "^2.0.0",
+ "flow-typed": "^2.1.2",
"html-webpack-plugin": "^2.28.0",
"husky": "^0.13.3",
"local-url-qrcode": "^1.1.0",
@@ -59,7 +59,7 @@
"static-site-generator-webpack-plugin": "^3.4.1",
"url-loader": "^0.5.8",
"webpack": "^2.4.1",
- "webpack-dev-server": "^2.4.2",
+ "webpack-dev-server": "^2.4.5",
"why-did-you-update": "^0.0.8"
},
"dependencies": {
@@ -69,7 +69,7 @@
"constelation-style_": "^14.0.0",
"constelation-text": "^12.3.0",
"constelation-transition-group-view": "^14.0.0",
- "constelation-view": "^14.0.0",
+ "constelation-view": "^14.0.3",
"decko": "^1.2.0",
"glamor": "next",
"glamor-react": "^3.0.0-1",
@@ -78,11 +78,11 @@
"lodash": "^4.17.4",
"mobx": "^3.1.9",
"mobx-react": "^4.1.8",
- "react": "^15.4.2",
+ "react": "^15.5.4",
"react-addons-css-transition-group": "^15.5.2",
- "react-dom": "^15.4.2",
+ "react-dom": "^15.5.4",
"react-router": "^3.0.2",
- "react-router-scroll": "0.4.1",
- "react-transition-group": "^1.1.2"
+ "react-router-scroll": "^0.4.2",
+ "react-transition-group": "^1.1.3"
}
}
diff --git a/src/scenes/Other/Other.js b/src/scenes/Other/Other.js
index 69fde2c..5a1e64d 100644
--- a/src/scenes/Other/Other.js
+++ b/src/scenes/Other/Other.js
@@ -15,6 +15,8 @@ export default class Other extends React.Component {
Other
Home
+
+
)
}
diff --git a/yarn.lock b/yarn.lock
index d533304..61cde1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -269,14 +269,14 @@ babel-core@^6.23.1, babel-core@^6.24.1:
slash "^1.0.0"
source-map "^0.5.0"
-babel-eslint@^7.2.2:
- version "7.2.2"
- resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.2.tgz#0da2cbe6554fd0fb069f19674f2db2f9c59270ff"
+babel-eslint@^7.2.3:
+ version "7.2.3"
+ resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.3.tgz#b2fe2d80126470f5c19442dc757253a897710827"
dependencies:
babel-code-frame "^6.22.0"
babel-traverse "^6.23.1"
babel-types "^6.23.0"
- babylon "^6.16.1"
+ babylon "^6.17.0"
babel-generator@^6.24.1:
version "6.24.1"
@@ -445,14 +445,13 @@ babel-helpers@^6.24.1:
babel-runtime "^6.22.0"
babel-template "^6.24.1"
-babel-loader@^6.4.1:
- version "6.4.1"
- resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+babel-loader@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
dependencies:
find-cache-dir "^0.1.1"
- loader-utils "^0.2.16"
+ loader-utils "^1.0.2"
mkdirp "^0.5.1"
- object-assign "^4.0.1"
babel-messages@^6.23.0:
version "6.23.0"
@@ -1107,9 +1106,9 @@ babylon@^6.11.0:
version "6.15.0"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
-babylon@^6.14.0, babylon@^6.15.0, babylon@^6.16.1:
- version "6.16.1"
- resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+babylon@^6.14.0, babylon@^6.15.0, babylon@^6.17.0:
+ version "6.17.0"
+ resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
balanced-match@^0.4.1:
version "0.4.2"
@@ -1141,6 +1140,13 @@ binary-extensions@^1.0.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+"binary@>= 0.3.0 < 1":
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79"
+ dependencies:
+ buffers "~0.1.1"
+ chainsaw "~0.1.0"
+
block-stream@*:
version "0.0.9"
resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -1271,6 +1277,10 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
+buffers@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
+
builtin-modules@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1346,6 +1356,12 @@ chain-function@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
+chainsaw@~0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98"
+ dependencies:
+ traverse ">=0.3.0 <0.4"
+
chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1598,9 +1614,9 @@ constelation-transition-group-view@^14.0.0:
dependencies:
react-addons-css-transition-group "^15.2.1"
-constelation-view@^14.0.0:
- version "14.0.0"
- resolved "https://registry.yarnpkg.com/constelation-view/-/constelation-view-14.0.0.tgz#100e5f06e7356c82e0ecb81fd8808b3ef4ccfec6"
+constelation-view@^14.0.3:
+ version "14.0.3"
+ resolved "https://registry.yarnpkg.com/constelation-view/-/constelation-view-14.0.3.tgz#a470461408984ce23ba19a2b1926125490322174"
optionalDependencies:
glamor "^2.20.24"
glamor-react "^3.0.0-1"
@@ -2330,9 +2346,9 @@ faye-websocket@~0.11.0:
dependencies:
websocket-driver ">=0.5.1"
-fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.8:
- version "0.8.8"
- resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.8.tgz#02f1b6e0ea0d46c24e0b51a2d24df069563a5ad6"
+fbjs@^0.8.4, fbjs@^0.8.9:
+ version "0.8.12"
+ resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
@@ -2342,9 +2358,9 @@ fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.8:
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"
-fbjs@^0.8.9:
- version "0.8.12"
- resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
+fbjs@^0.8.8:
+ version "0.8.8"
+ resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.8.tgz#02f1b6e0ea0d46c24e0b51a2d24df069563a5ad6"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
@@ -2461,22 +2477,23 @@ flow-coverage-report@^0.3.0:
terminal-table "0.0.12"
yargs "5.0.0"
-flow-typed@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.0.0.tgz#b15cfb9b2b4419ab521665f84fa30d9ba646fb33"
+flow-typed@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/flow-typed/-/flow-typed-2.1.2.tgz#468f7a8b6bc18689856a1d101713b23bb39f01e4"
dependencies:
babel-polyfill "^6.6.1"
colors "^1.1.2"
+ fs-extra "^2.0.0"
github "^0.2.4"
glob "^7.0.6"
- lodash "^4.11.2"
md5 "^2.1.0"
mkdirp "^0.5.1"
request "^2.69.0"
- rx-lite "4.0.8"
+ rimraf "^2.6.0"
semver "^5.1.0"
- table "3.7.8"
+ table "^3.7.8"
through "^2.3.8"
+ unzip "^0.1.11"
which "^1.2.11"
yargs "^4.2.0"
@@ -2553,6 +2570,15 @@ fstream-ignore@~1.0.5:
inherits "2"
minimatch "^3.0.0"
+"fstream@>= 0.1.30 < 1":
+ version "0.1.31"
+ resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988"
+ dependencies:
+ graceful-fs "~3.0.2"
+ inherits "~2.0.0"
+ mkdirp "0.5"
+ rimraf "2"
+
fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822"
@@ -2735,6 +2761,12 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6:
version "4.1.10"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131"
+graceful-fs@~3.0.2:
+ version "3.0.11"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+ dependencies:
+ natives "^1.1.0"
+
"graceful-readlink@>= 1.0.0":
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -3466,7 +3498,7 @@ lodash@^3.6.0:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-lodash@^4.0.0, lodash@^4.11.2, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:
+lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -3512,6 +3544,13 @@ map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+"match-stream@>= 0.0.2 < 1":
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf"
+ dependencies:
+ buffers "~0.1.1"
+ readable-stream "~1.0.0"
+
md5@^2.1.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
@@ -3646,7 +3685,7 @@ mitt@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.1.0.tgz#22f0d57e2fedd39620a62bb41b7cdd93667d3c41"
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5, mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
dependencies:
@@ -3686,6 +3725,10 @@ nan@^2.0.0, nan@^2.3.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
+natives@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
+
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -3932,6 +3975,10 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+"over@>= 0.0.5 < 1":
+ version "0.0.5"
+ resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708"
+
p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -4119,7 +4166,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prop-types@^15.5.6:
+prop-types@^15.5.6, prop-types@^15.5.7, prop-types@~15.5.7:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
@@ -4150,6 +4197,15 @@ public-encrypt@^4.0.0:
parse-asn1 "^5.0.0"
randombytes "^2.0.1"
+"pullstream@>= 0.4.1 < 1":
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314"
+ dependencies:
+ over ">= 0.0.5 < 1"
+ readable-stream "~1.0.31"
+ setimmediate ">= 1.0.2 < 2"
+ slice-stream ">= 1.0.0 < 2"
+
punycode@1.3.2, punycode@^1.2.4:
version "1.3.2"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
@@ -4253,13 +4309,14 @@ react-dom@15.3.1:
version "15.3.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.3.1.tgz#6d42cd2b64c8c5e0b693f3ffaec301e6e627e24e"
-react-dom@^15.4.2:
- version "15.4.2"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
+react-dom@^15.5.4:
+ version "15.5.4"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da"
dependencies:
- fbjs "^0.8.1"
+ fbjs "^0.8.9"
loose-envify "^1.1.0"
object-assign "^4.1.0"
+ prop-types "~15.5.7"
react-hot-loader@3.0.0-beta.6:
version "3.0.0-beta.6"
@@ -4285,11 +4342,12 @@ react-proxy@^3.0.0-alpha.0:
dependencies:
lodash "^4.6.1"
-react-router-scroll@0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/react-router-scroll/-/react-router-scroll-0.4.1.tgz#8cafd348d34e54b1127ec0fb7f8323d0d4c489e0"
+react-router-scroll@^0.4.2:
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/react-router-scroll/-/react-router-scroll-0.4.2.tgz#4b90e8707edf96eba7f066d94c5b4338bd6848b7"
dependencies:
- scroll-behavior "^0.9.1"
+ prop-types "^15.5.6"
+ scroll-behavior "^0.9.3"
warning "^3.0.0"
react-router@^3.0.2:
@@ -4313,9 +4371,9 @@ react-transform-hmr@^1.0.3:
global "^4.3.0"
react-proxy "^1.1.7"
-react-transition-group@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.1.2.tgz#374cd778070f74b0a658045fc532edfd471ad836"
+react-transition-group@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.1.3.tgz#5e02cf6e44a863314ff3c68a0c826c2d9d70b221"
dependencies:
chain-function "^1.0.0"
dom-helpers "^3.2.0"
@@ -4330,13 +4388,14 @@ react@15.3.1:
loose-envify "^1.1.0"
object-assign "^4.1.0"
-react@^15.4.1, react@^15.4.2:
- version "15.4.2"
- resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
+react@^15.4.1, react@^15.5.4:
+ version "15.5.4"
+ resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047"
dependencies:
- fbjs "^0.8.4"
+ fbjs "^0.8.9"
loose-envify "^1.1.0"
object-assign "^4.1.0"
+ prop-types "^15.5.7"
read-pkg-up@^1.0.1:
version "1.0.1"
@@ -4353,7 +4412,7 @@ read-pkg@^1.0.0:
normalize-package-data "^2.3.2"
path-type "^1.0.0"
-readable-stream@1.0:
+readable-stream@1.0, readable-stream@~1.0.0, readable-stream@~1.0.31:
version "1.0.34"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
dependencies:
@@ -4581,7 +4640,7 @@ right-align@^0.1.1:
dependencies:
align-text "^0.1.1"
-rimraf@2, rimraf@^2.2.8, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.6.0, rimraf@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
dependencies:
@@ -4607,10 +4666,6 @@ run-async@^0.1.0:
dependencies:
once "^1.3.0"
-rx-lite@4.0.8:
- version "4.0.8"
- resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
rx-lite@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
@@ -4619,7 +4674,7 @@ safe-buffer@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-scroll-behavior@^0.9.1:
+scroll-behavior@^0.9.3:
version "0.9.3"
resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.3.tgz#e48bcc8af364f3f07176e8dbca3968bd5e71557b"
dependencies:
@@ -4729,7 +4784,7 @@ set-immediate-shim@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-setimmediate@^1.0.4, setimmediate@^1.0.5:
+"setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2", setimmediate@^1.0.4, setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -4781,6 +4836,12 @@ slice-ansi@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+"slice-stream@>= 1.0.0 < 2":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0"
+ dependencies:
+ readable-stream "~1.0.31"
+
slide@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -5019,7 +5080,7 @@ supports-color@^3.1.0, supports-color@^3.1.1:
dependencies:
has-flag "^1.0.0"
-table@3.7.8, table@^3.7.8:
+table@^3.7.8:
version "3.7.8"
resolved "https://registry.yarnpkg.com/table/-/table-3.7.8.tgz#b424433ef596851922b2fd77224a69a1951618eb"
dependencies:
@@ -5125,6 +5186,10 @@ tough-cookie@~2.3.0:
dependencies:
punycode "^1.4.1"
+"traverse@>=0.3.0 <0.4":
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+
trim-newlines@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -5218,6 +5283,17 @@ unzip-response@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+unzip@^0.1.11:
+ version "0.1.11"
+ resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0"
+ dependencies:
+ binary ">= 0.3.0 < 1"
+ fstream ">= 0.1.30 < 1"
+ match-stream ">= 0.0.2 < 1"
+ pullstream ">= 0.4.1 < 1"
+ readable-stream "~1.0.31"
+ setimmediate ">= 1.0.1 < 2"
+
update-notifier@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.1.0.tgz#ec0c1e53536b76647a24b77cb83966d9315123d9"
@@ -5352,18 +5428,18 @@ wbuf@^1.1.0, wbuf@^1.4.0:
dependencies:
minimalistic-assert "^1.0.0"
-webpack-dev-middleware@^1.9.0:
- version "1.9.0"
- resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.9.0.tgz#a1c67a3dfd8a5c5d62740aa0babe61758b4c84aa"
+webpack-dev-middleware@^1.10.2:
+ version "1.10.2"
+ resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
dependencies:
memory-fs "~0.4.1"
mime "^1.3.4"
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
-webpack-dev-server@^2.4.2:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be"
+webpack-dev-server@^2.4.5:
+ version "2.4.5"
+ resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
dependencies:
ansi-html "0.0.7"
chokidar "^1.6.0"
@@ -5380,7 +5456,7 @@ webpack-dev-server@^2.4.2:
spdy "^3.4.1"
strip-ansi "^3.0.0"
supports-color "^3.1.1"
- webpack-dev-middleware "^1.9.0"
+ webpack-dev-middleware "^1.10.2"
yargs "^6.0.0"
webpack-sources@^0.1.0, webpack-sources@^0.1.4:
From 663fef9dc2a49c535122fa61581b28fc66edf067 Mon Sep 17 00:00:00 2001
From: Kyle Poole <2kylepoole@gmail.com>
Date: Mon, 26 Jun 2017 13:21:00 -0700
Subject: [PATCH 2/3] try out `nps`
---
package-scripts.js | 31 ++++++++++
package.json | 25 +-------
yarn.lock | 144 +++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 174 insertions(+), 26 deletions(-)
create mode 100644 package-scripts.js
diff --git a/package-scripts.js b/package-scripts.js
new file mode 100644
index 0000000..696b2c6
--- /dev/null
+++ b/package-scripts.js
@@ -0,0 +1,31 @@
+module.exports = {
+ scripts: {
+ precommit: 'yarn run lint',
+ prepush: 'yarn run lint',
+ flow: 'flow',
+ flowCoverage: 'flow-coverage-report -i \'src/**/*.js\'',
+ lint: 'eslint src lib',
+ lintFix: 'eslint --fix src lib',
+ reinstall: 'rimraf node_modules && npm install',
+ sourceExplorer: 'nps buildJs.prod && source-map-explorer public/main.js public/main.js.map',
+ qr: 'local-url-qrcode 8080',
+ clean: 'rimraf public',
+ buildHtml: {
+ default: 'webpack --env.buildSite',
+ dev: 'nps buildHtml -- --env.dev --progress',
+ prod: 'nps buildHtml -- --env.prod -p --progress',
+ },
+ buildJs: {
+ dev: 'webpack --env.dev --env.buildJS --progress',
+ prod: 'webpack --env.prod -p --progress',
+ },
+ server: {
+ dev: 'webpack-dev-server --env.dev --host 0.0.0.0',
+ prod: 'serve public/ -p 8080',
+ },
+ prod: 'nps clean && nps buildHtml.prod && nps buildJs.prod && nps qr && nps server.prod',
+ dev: 'nps clean && nps buildHtml.dev && nps buildJs.dev && nps qr && nps server.dev',
+ default: 'nps clean && nps buildJs.dev && nps qr && nps server.dev',
+ deploy: 'nps clean && nps buildHtml.prod && nps buildJs.prod && rimraf docs && cp -r public docs',
+ },
+}
diff --git a/package.json b/package.json
index f7a8f33..d6b83b9 100644
--- a/package.json
+++ b/package.json
@@ -1,27 +1,7 @@
{
"private": true,
"scripts": {
- "precommit": "yarn run lint",
- "prepush": "yarn run lint",
- "flow": "flow",
- "flow-coverage": "flow-coverage-report -i 'src/**/*.js'",
- "lint": "eslint src lib",
- "lint-fix": "eslint --fix src lib",
- "reinstall": "rimraf node_modules && npm install",
- "source-explorer": "npm run build-js:prod && source-map-explorer public/main.js public/main.js.map",
- "qr": "local-url-qrcode 8080",
- "clean": "rimraf public",
- "build-html": "webpack --env.buildSite",
- "build-html:dev": "npm run build-html -- --env.dev --progress",
- "build-html:prod": "npm run build-html -- --env.prod -p --progress",
- "build-js:dev": "webpack --env.dev --env.buildJS --progress",
- "build-js:prod": "webpack --env.prod -p --progress",
- "server:dev": "webpack-dev-server --env.dev --host 0.0.0.0",
- "server:prod": "serve public/ -p 8080",
- "prod": "npm run clean && npm run build-html:prod && npm run build-js:prod && npm run qr && npm run server:prod",
- "dev": "npm run clean && npm run build-html:dev && npm run build-js:dev && npm run qr && npm run server:dev",
- "start": "npm run clean && npm run build-js:dev && npm run qr && npm run server:dev",
- "deploy": "npm run clean && npm run build-html:prod && npm run build-js:prod && rimraf docs && cp -r public docs"
+ "start": "nps"
},
"devDependencies": {
"babel-core": "^6.24.1",
@@ -52,6 +32,7 @@
"html-webpack-plugin": "^2.28.0",
"husky": "^0.13.3",
"local-url-qrcode": "^1.1.0",
+ "nps": "^5.3.2",
"react-hot-loader": "3.0.0-beta.6",
"rimraf": "^2.6.1",
"serve": "^5.1.4",
@@ -85,4 +66,4 @@
"react-router-scroll": "^0.4.2",
"react-transition-group": "^1.1.3"
}
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 61cde1b..c40f48a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -166,7 +166,7 @@ array.prototype.find@^2.0.1:
define-properties "^1.1.2"
es-abstract "^1.5.0"
-arrify@^1.0.0:
+arrify@^1.0.0, arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -1503,6 +1503,12 @@ commander@2.9.x, commander@^2.8.1, commander@^2.9.0:
dependencies:
graceful-readlink ">= 1.0.0"
+common-tags@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0"
+ dependencies:
+ babel-runtime "^6.18.0"
+
commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1940,6 +1946,10 @@ duplexer3@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+duplexer@~0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
duplicate-package-checker-webpack-plugin@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-1.2.4.tgz#ad0ec3d41c759880ec2329f6a1fcb4de3b948350"
@@ -2226,6 +2236,18 @@ event-emitter@~0.3.4:
d "~0.1.1"
es5-ext "~0.10.7"
+event-stream@~3.3.0:
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
+ dependencies:
+ duplexer "~0.1.1"
+ from "~0"
+ map-stream "~0.1.0"
+ pause-stream "0.0.11"
+ split "0.3"
+ stream-combiner "~0.0.4"
+ through "~2.3.1"
+
eventemitter3@1.x.x:
version "1.2.0"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
@@ -2447,6 +2469,12 @@ find-up@^1.0.0:
path-exists "^2.0.0"
pinkie-promise "^2.0.0"
+find-up@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+ dependencies:
+ locate-path "^2.0.0"
+
flat-cache@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -2535,6 +2563,10 @@ 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.7"
+ resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+
fs-extra@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600"
@@ -3180,6 +3212,10 @@ is-obj@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+is-object@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+
is-path-cwd@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -3285,7 +3321,7 @@ js-tokens@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
-js-yaml@^3.5.1:
+js-yaml@^3.5.1, js-yaml@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
dependencies:
@@ -3434,6 +3470,13 @@ local-url-qrcode@^1.1.0:
ip "^0.3.2"
qrcode-terminal "^0.9.5"
+locate-path@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+ dependencies:
+ p-locate "^2.0.0"
+ path-exists "^3.0.0"
+
lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.1.0, lodash.assign@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
@@ -3540,10 +3583,18 @@ magic-string@^0.19.0:
dependencies:
vlq "^0.2.1"
+manage-path@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/manage-path/-/manage-path-2.0.0.tgz#f4cf8457b926eeee2a83b173501414bc76eb9597"
+
map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+map-stream@~0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+
"match-stream@>= 0.0.2 < 1":
version "0.0.2"
resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf"
@@ -3855,6 +3906,23 @@ npmlog@^4.0.1:
gauge "~2.7.1"
set-blocking "~2.0.0"
+nps@^5.3.2:
+ version "5.3.2"
+ resolved "https://registry.yarnpkg.com/nps/-/nps-5.3.2.tgz#2b5e39bd63928b7a538a1f2d0ea5906409908303"
+ dependencies:
+ arrify "^1.0.1"
+ chalk "^1.1.3"
+ common-tags "^1.4.0"
+ find-up "^2.1.0"
+ js-yaml "^3.7.0"
+ lodash "^4.17.4"
+ manage-path "^2.0.0"
+ prefix-matches "^1.0.1"
+ readline-sync "^1.4.6"
+ spawn-command-with-kill "^1.0.0"
+ type-detect "^4.0.0"
+ yargs "^6.6.0"
+
nth-check@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
@@ -3983,6 +4051,16 @@ p-finally@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+p-limit@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+
+p-locate@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+ dependencies:
+ p-limit "^1.1.0"
+
package-json@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/package-json/-/package-json-3.1.0.tgz#ce281900fe8052150cc6709c6c006c18fdb2f379"
@@ -4041,6 +4119,10 @@ path-exists@^2.0.0:
dependencies:
pinkie-promise "^2.0.0"
+path-exists@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
path-is-absolute@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -4075,6 +4157,12 @@ path-type@^1.0.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
+pause-stream@0.0.11:
+ version "0.0.11"
+ resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
+ dependencies:
+ through "~2.3"
+
pbkdf2@^3.0.3:
version "3.0.9"
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
@@ -4121,6 +4209,13 @@ portfinder@^1.0.9:
debug "^2.2.0"
mkdirp "0.5.x"
+prefix-matches@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/prefix-matches/-/prefix-matches-1.0.1.tgz#02e34ce27f33af48e68bbfce2aac2a004bc2b76c"
+ dependencies:
+ is-object "^1.0.1"
+ starts-with "^1.0.2"
+
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -4183,6 +4278,12 @@ prr@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+ps-tree@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
+ dependencies:
+ event-stream "~3.3.0"
+
pseudomap@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -4454,6 +4555,10 @@ readdirp@^2.0.0:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"
+readline-sync@^1.4.6:
+ version "1.4.7"
+ resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.7.tgz#001bfdd4c06110c3c084c63bf7c6a56022213f30"
+
readline2@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
@@ -4911,6 +5016,17 @@ source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@~0.5.1, sour
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+spawn-command-with-kill@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/spawn-command-with-kill/-/spawn-command-with-kill-1.0.0.tgz#803ad79f2f56e44dd926183768aac2faec7d0ce6"
+ dependencies:
+ ps-tree "^1.1.0"
+ spawn-command "^0.0.2-1"
+
+spawn-command@^0.0.2-1:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
+
spdx-correct@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -4945,6 +5061,12 @@ spdy@^3.4.1:
select-hose "^2.0.0"
spdy-transport "^2.0.15"
+split@0.3:
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
+ 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"
@@ -4968,6 +5090,10 @@ stackframe@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
+starts-with@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/starts-with/-/starts-with-1.0.2.tgz#16793a729d89d4cf3d4fb2eda2f908ae357f196f"
+
static-site-generator-webpack-plugin@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-3.4.1.tgz#6ee22468830bc546798a37e0fca6fd699cc93b81"
@@ -4989,6 +5115,12 @@ stream-browserify@^2.0.1:
inherits "~2.0.1"
readable-stream "^2.0.2"
+stream-combiner@~0.0.4:
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+ dependencies:
+ duplexer "~0.1.1"
+
stream-http@^2.3.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.1.tgz#7d20fcdfebc16b16e4174e31dd94cd9c70f10e89"
@@ -5154,7 +5286,7 @@ thenify-all@^1.0.0, thenify-all@^1.6.0:
dependencies:
any-promise "^1.0.0"
-through@^2.3.6, through@^2.3.8:
+through@2, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1:
version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -5224,6 +5356,10 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
+type-detect@^4.0.0:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
+
type-is@~1.6.13:
version "1.6.14"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2"
@@ -5671,7 +5807,7 @@ yargs@^4.2.0:
y18n "^3.2.1"
yargs-parser "^2.4.1"
-yargs@^6.0.0:
+yargs@^6.0.0, yargs@^6.6.0:
version "6.6.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
dependencies:
From 8aafa59b1ec652aa23c1cd585fc87c9111e08d67 Mon Sep 17 00:00:00 2001
From: Kyle Poole <2kylepoole@gmail.com>
Date: Mon, 26 Jun 2017 14:18:36 -0700
Subject: [PATCH 3/3] fix scripts
---
package-scripts.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package-scripts.js b/package-scripts.js
index 696b2c6..039c85e 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -12,8 +12,8 @@ module.exports = {
clean: 'rimraf public',
buildHtml: {
default: 'webpack --env.buildSite',
- dev: 'nps buildHtml -- --env.dev --progress',
- prod: 'nps buildHtml -- --env.prod -p --progress',
+ dev: 'nps "buildHtml --env.dev --progress"',
+ prod: 'nps "buildHtml --env.prod -p --progress"',
},
buildJs: {
dev: 'webpack --env.dev --env.buildJS --progress',