Skip to content

Commit c6e54ef

Browse files
hawkriveshawkrives
committed
Merge branch 'master' into greenkeeper/eslint-plugin-flowtype-2.47.0
* master: chore(package): update lockfile fix(package): update react-native-calendar-events to version 1.6.0 chore(package): update lockfile chore(package): update js-yaml to version 3.12.0 chore(package): update lockfile fix(package): update moment to version 2.22.2 chore(package): update lockfile fix(package): update redux-thunk to version 2.3.0 chore(package): update lockfile fix(package): update delay to version 3.0.0 chore(package): update lockfile fix(package): update react-navigation-material-bottom-tabs to version 0.2.0 remove blank line update remaining times Update blue-line.yaml chore(package): update lockfile chore(package): update react-test-renderer to version 16.4.0 chore(package): update lockfile chore(package): update pretty-quick to version 1.6.0 # Conflicts: # package.json
2 parents 833a348 + fa96ec8 commit c6e54ef

File tree

3 files changed

+76
-72
lines changed

3 files changed

+76
-72
lines changed

‎data/bus-times/blue-line.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ schedules:
1818
stops:
1919
- City Hall on Washington
2020
- Econo Foods
21-
- Library
2221
- Carleton College
23-
- St. Olaf College
24-
- Greenvale Apartments
2522
- Northfield Estates
2623
- Viking Terrace
27-
- Northfield Retirement Community
24+
- Greenvale Apartments
25+
- South Oak Apartments
2826
- Ensley Apartments
27+
- Northfield Manor
2928
- St. Olaf College
29+
- Library
3030
- City Hall on Washington
3131
times:
32-
- [ '6:00am', '6:01am', '6:03am', '6:05am', '6:12am', '6:17am', '6:19am', '6:21am', false, '6:25am', '6:29am', '6:40am']
33-
- [ '6:45am', '6:46am', '6:48am', '6:50am', '6:57am', '7:02am', '7:04am', '7:06am', false, '7:10am', '7:14am', '7:25am']
34-
- [ '7:30am', '7:31am', '7:33am', '7:35am', '7:42am', '7:47am', '7:49am', '7:51am', '7:53am', '7:55am', '7:59am', '8:10am']
35-
- [ '8:15am', '8:16am', '8:18am', '8:20am', '8:27am', '8:32am', '8:34am', '8:36am', '8:38am', '8:40am', '8:44am', '8:55am']
36-
- [ '9:00am', '9:01am', '9:03am', '9:05am', '9:12am', '9:17am', '9:19am', '9:21am', '9:23am', '9:25am', '9:29am', '9:40am']
37-
- [ '9:45am', '9:46am', '9:48am', '9:50am', '9:57am', '10:02am', '10:04am', '10:06am', '10:08am', '10:10am', '10:14am', '10:25am']
38-
- ['10:30am', '10:31am', '10:33am', '10:35am', '10:42am', '10:47am', '10:49am', '10:51am', '10:53am', '10:55am', '10:59am', '11:10am']
39-
- ['11:15am', '11:16am', '11:18am', '11:20am', '11:27am', '11:32am', '11:34am', '11:36am', '11:38am', '11:40am', '11:44am', '11:55am']
40-
- ['12:00pm', '12:01pm', '12:03pm', '12:05pm', '12:12pm', '12:17pm', '12:19pm', '12:21pm', '12:23pm', '12:25pm', '12:29pm', '12:40pm']
41-
- ['12:45pm', '12:46pm', '12:48pm', '12:50pm', '12:57pm', '1:02pm', '1:04pm', '1:06pm', '1:08pm', '1:10pm', '1:14pm', '1:25pm']
42-
- [ '1:30pm', '1:31pm', '1:33pm', '1:35pm', '1:42pm', '1:47pm', '1:49pm', '1:51pm', '1:53pm', '1:55pm', '1:59pm', '2:10pm']
43-
- [ '2:15pm', '2:16pm', '2:18pm', '2:20pm', '2:27pm', '2:32pm', '2:34pm', '2:36pm', '2:38pm', '2:40pm', '2:44pm', '2:55pm']
44-
- [ '3:00pm', '3:01pm', '3:03pm', '3:05pm', '3:12pm', '3:17pm', '3:19pm', '3:21pm', '3:23pm', '3:25pm', '3:29pm', '3:40pm']
45-
- [ '3:45pm', '3:46pm', '3:48pm', '3:50pm', '3:57pm', '4:02pm', '4:04pm', '4:06pm', '4:08pm', '4:10pm', '4:14pm', '4:25pm']
46-
- [ '4:30pm', '4:31pm', '4:33pm', '4:35pm', '4:42pm', '4:47pm', '4:49pm', '4:51pm', '4:53pm', '4:55pm', '4:59pm', '5:10pm']
47-
- [ '5:15pm', '5:16pm', '5:18pm', '5:20pm', '5:27pm', '5:32pm', '5:34pm', '5:36pm', '5:38pm', '5:40pm', '5:44pm', '5:55pm']
32+
- [ '6:00am', '6:01am', '6:06am', '6:10am', '6:13am', '6:16am', '6:18am', '6:21am', '6:25am', '6:31am', '6:38am', '6:40am']
33+
- [ '6:45am', '6:46am', '6:51am', '6:55am', '6:58am', '7:01am', '7:03am', '7:06am', '7:10am', '7:16am', '7:23am', '7:25am']
34+
- [ '7:30am', '7:31am', '7:36am', '7:40am', '7:43am', '7:46am', '7:48am', '7:51am', '7:55am', '8:01am', '8:08am', '8:10am']
35+
- [ '8:15am', '8:16am', '8:21am', '8:25am', '8:28am', '8:31am', '8:33am', '8:36am', '8:40am', '8:46am', '8:53am', '8:55am']
36+
- [ '9:00am', '9:01am', '9:06am', '9:10am', '9:13am', '9:16am', '9:18am', '9:21am', '9:25am', '9:31am', '9:38am', '9:40am']
37+
- [ '9:45am', '9:46am', '9:51am', '9:55am', '9:58am', '10:01am', '10:03am', '10:06am', '10:10am', '10:16am', '10:23am', '10:25am']
38+
- ['10:30am', '10:31am', '10:36am', '10:40am', '10:43am', '10:46am', '10:48am', '10:51am', '10:55am', '11:01am', '11:08am', '11:10am']
39+
- ['11:15am', '11:16am', '11:21am', '11:25am', '11:28am', '11:31am', '11:33am', '11:36am', '11:40am', '11:46am', '11:53am', '11:55am']
40+
- ['12:00pm', '12:01pm', '12:06pm', '12:10pm', '12:13pm', '12:16pm', '12:18pm', '12:21pm', '12:25pm', '12:31pm', '12:38pm', '12:40pm']
41+
- ['12:45pm', '12:46pm', '12:51pm', '12:55pm', '12:58pm', '1:01pm', '1:03pm', '1:06pm', '1:10pm', '1:16pm', '1:23pm', '1:25pm']
42+
- [ '1:30pm', '1:31pm', '1:36pm', '1:40pm', '1:43pm', '1:46pm', '1:48pm', '1:51pm', '1:55pm', '2:01pm', '2:08pm', '2:10pm']
43+
- [ '2:15pm', '2:16pm', '2:21pm', '2:25pm', '2:28pm', '2:31pm', '2:33pm', '2:36pm', '2:40pm', '2:46pm', '2:53pm', '2:55pm']
44+
- [ '3:00pm', '3:01pm', '3:06pm', '3:10pm', '3:13pm', '3:16pm', '3:18pm', '3:21pm', '3:25pm', '3:31pm', '3:38pm', '3:40pm']
45+
- [ '3:45pm', '3:46pm', '3:51pm', '3:55pm', '3:58pm', '4:01pm', '4:03pm', '4:06pm', '4:10pm', '4:16pm', '4:23pm', '4:25pm']
46+
- [ '4:30pm', '4:31pm', '4:36pm', '4:40pm', '4:43pm', '4:46pm', '4:48pm', '4:51pm', '4:55pm', '5:01pm', '5:08pm', '5:10pm']
47+
- [ '5:15pm', '5:16pm', '5:21pm', '5:25pm', '5:28pm', '5:31pm', '5:33pm', '5:36pm', '5:40pm', '5:46pm', '5:53pm', '5:55pm']

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@
8080
"buffer": "5.1.0",
8181
"bugsnag-react-native": "2.5.1",
8282
"css-select": "2.0.0",
83-
"delay": "2.0.0",
83+
"delay": "3.0.0",
8484
"events": "2.0.0",
8585
"get-urls": "7.2.0",
8686
"glamorous-native": "1.4.0",
8787
"html-entities": "1.2.1",
8888
"htmlparser2": "3.9.2",
8989
"keyword-search": "0.1.1",
9090
"lodash": "4.17.10",
91-
"moment": "2.22.1",
91+
"moment": "2.22.2",
9292
"moment-timezone": "0.5.17",
9393
"p-props": "1.2.0",
9494
"p-retry": "2.0.0",
@@ -97,7 +97,7 @@
9797
"react-markdown": "2.5.1",
9898
"react-native": "0.55.4",
9999
"react-native-button": "2.3.0",
100-
"react-native-calendar-events": "1.5.0",
100+
"react-native-calendar-events": "1.6.0",
101101
"react-native-communications": "2.2.1",
102102
"react-native-custom-tabs": "0.1.7",
103103
"react-native-device-info": "0.21.5",
@@ -113,12 +113,12 @@
113113
"react-native-typography": "1.3.0",
114114
"react-native-vector-icons": "4.6.0",
115115
"react-navigation": "2.0.0",
116-
"react-navigation-material-bottom-tabs": "0.1.2",
116+
"react-navigation-material-bottom-tabs": "0.2.0",
117117
"react-redux": "5.0.7",
118118
"redux": "3.7.2",
119119
"redux-logger": "3.0.6",
120120
"redux-promise": "0.6.0",
121-
"redux-thunk": "2.2.0",
121+
"redux-thunk": "2.3.0",
122122
"semver": "5.5.0",
123123
"sto-sis-time-parser": "2.3.3",
124124
"stream": "0.0.2",
@@ -148,16 +148,16 @@
148148
"flow-bin": "0.67.1",
149149
"jest": "22.4.2",
150150
"jest-junit": "4.0.0",
151-
"js-yaml": "3.11.0",
151+
"js-yaml": "3.12.0",
152152
"junk": "2.1.0",
153153
"minimist": "1.2.0",
154154
"mkdirp": "0.5.1",
155155
"pify": "3.0.0",
156156
"prettier": "1.12.1",
157157
"pretty-bytes": "5.0.0",
158-
"pretty-quick": "1.5.1",
158+
"pretty-quick": "1.6.0",
159159
"prop-types": "15.6.1",
160-
"react-test-renderer": "16.3.2",
160+
"react-test-renderer": "16.4.0",
161161
"string-natural-compare": "2.0.2",
162162
"strip-ansi": "4.0.0",
163163
"xcode": "1.0.0"

‎yarn.lock‎

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,11 +2102,9 @@ del@^2.0.2:
21022102
pinkie-promise "^2.0.0"
21032103
rimraf "^2.2.8"
21042104

2105-
[email protected]:
2106-
version "2.0.0"
2107-
resolved "https://registry.yarnpkg.com/delay/-/delay-2.0.0.tgz#9112eadc03e4ec7e00297337896f273bbd91fae5"
2108-
dependencies:
2109-
p-defer "^1.0.0"
2105+
[email protected]:
2106+
version "3.0.0"
2107+
resolved "https://registry.yarnpkg.com/delay/-/delay-3.0.0.tgz#97fc5c21028e20616e822ab11838c648808534eb"
21102108

21112109
delayed-stream@~1.0.0:
21122110
version "1.0.0"
@@ -3776,9 +3774,9 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
37763774
version "3.0.2"
37773775
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
37783776

3779-
js-yaml@3.11.0:
3780-
version "3.11.0"
3781-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
3777+
js-yaml@3.12.0:
3778+
version "3.12.0"
3779+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
37823780
dependencies:
37833781
argparse "^1.0.7"
37843782
esprima "^4.0.0"
@@ -4563,9 +4561,9 @@ [email protected]:
45634561
dependencies:
45644562
moment ">= 2.9.0"
45654563

4566-
[email protected].1:
4567-
version "2.22.1"
4568-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
4564+
[email protected].2:
4565+
version "2.22.2"
4566+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
45694567

45704568
"moment@>= 2.9.0":
45714569
version "2.20.1"
@@ -4847,10 +4845,6 @@ osenv@^0.1.4:
48474845
os-homedir "^1.0.0"
48484846
os-tmpdir "^1.0.0"
48494847

4850-
p-defer@^1.0.0:
4851-
version "1.0.0"
4852-
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
4853-
48544848
p-finally@^1.0.0:
48554849
version "1.0.0"
48564850
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -5094,9 +5088,9 @@ pretty-format@^4.2.1:
50945088
version "4.3.1"
50955089
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.3.1.tgz#530be5c42b3c05b36414a7a2a4337aa80acd0e8d"
50965090

5097-
pretty-quick@1.5.1:
5098-
version "1.5.1"
5099-
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.5.1.tgz#b36bb4fe7cdb04ed5f4ba4ba530d609cb3be4ac2"
5091+
pretty-quick@1.6.0:
5092+
version "1.6.0"
5093+
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.6.0.tgz#afc3591eb5c4cf37614a305d489a8a40e57c9258"
51005094
dependencies:
51015095
chalk "^2.3.0"
51025096
execa "^0.8.0"
@@ -5209,9 +5203,9 @@ [email protected]:
52095203
shell-quote "^1.6.1"
52105204
ws "^2.0.3"
52115205

5212-
react-is@^16.3.2:
5213-
version "16.3.2"
5214-
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
5206+
react-is@^16.4.0:
5207+
version "16.4.0"
5208+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
52155209

52165210
react-lifecycles-compat@^1.0.2:
52175211
version "1.1.4"
@@ -5221,6 +5215,10 @@ react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.2:
52215215
version "3.0.2"
52225216
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
52235217

5218+
react-lifecycles-compat@^3.0.4:
5219+
version "3.0.4"
5220+
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
5221+
52245222
[email protected]:
52255223
version "2.5.1"
52265224
resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-2.5.1.tgz#f7a6c26a3a5faf5d4c2098155d9775e826fd56ee"
@@ -5235,9 +5233,9 @@ [email protected]:
52355233
dependencies:
52365234
prop-types "^15.5.10"
52375235

5238-
react-native-calendar-events@1.5.0:
5239-
version "1.5.0"
5240-
resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.5.0.tgz#77d1bef17a8061f1188680d5821b952d90827dc0"
5236+
react-native-calendar-events@1.6.0:
5237+
version "1.6.0"
5238+
resolved "https://registry.yarnpkg.com/react-native-calendar-events/-/react-native-calendar-events-1.6.0.tgz#53c3fb9bb7704c33186deead8dfdad0ffa19c998"
52415239

52425240
[email protected]:
52435241
version "2.2.1"
@@ -5285,9 +5283,9 @@ [email protected]:
52855283
version "3.2.2"
52865284
resolved "https://registry.yarnpkg.com/react-native-network-info/-/react-native-network-info-3.2.2.tgz#93625587ab5ae31b7c853f37ec2b75a0af6c936d"
52875285

5288-
react-native-paper@=1.4.0:
5289-
version "1.4.0"
5290-
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-1.4.0.tgz#33bd477cde1468b63e60bdb0c9a500822d03cdca"
5286+
react-native-paper@2.0.0-alpha.0:
5287+
version "2.0.0-alpha.0"
5288+
resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-2.0.0-alpha.0.tgz#20ddb59926a45333841db7bb35911543b390cd2e"
52915289
dependencies:
52925290
color "^2.0.1"
52935291
create-react-context "^0.2.2"
@@ -5334,6 +5332,12 @@ react-native-tab-view@~0.0.77:
53345332
dependencies:
53355333
prop-types "^15.6.0"
53365334

5335+
react-native-tab-view@~0.0.78:
5336+
version "0.0.78"
5337+
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.78.tgz#9b90730d89cbd34a03f0e0ab10e74ca7af945560"
5338+
dependencies:
5339+
prop-types "^15.6.0"
5340+
53375341
[email protected]:
53385342
version "0.17.5"
53395343
resolved "https://registry.yarnpkg.com/react-native-tableview-simple/-/react-native-tableview-simple-0.17.5.tgz#07b3ec325d053e18d72e3d28836f037f96e6cfda"
@@ -5422,14 +5426,14 @@ [email protected]:
54225426
dependencies:
54235427
react-native-tab-view "^0.0.74"
54245428

5425-
react-navigation-material-bottom-tabs@0.1.2:
5426-
version "0.1.2"
5427-
resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-0.1.2.tgz#7571ddea8e3749feb668e589d4b2edef8b02738a"
5429+
react-navigation-material-bottom-tabs@0.2.0:
5430+
version "0.2.0"
5431+
resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-0.2.0.tgz#0e6783a713483f6c6df16e7aa891a00ff283e657"
54285432
dependencies:
54295433
hoist-non-react-statics "^2.5.0"
54305434
prop-types "^15.6.0"
5431-
react-native-paper "=1.4.0"
5432-
react-navigation-tabs "0.2.0-rc.0"
5435+
react-native-paper "2.0.0-alpha.0"
5436+
react-navigation-tabs "^0.3.0"
54335437

54345438
[email protected]:
54355439
version "0.2.0"
@@ -5441,15 +5445,15 @@ [email protected]:
54415445
react-native-safe-area-view "^0.7.0"
54425446
react-native-tab-view "~0.0.77"
54435447

5444-
react-navigation-tabs@0.2.0-rc.0:
5445-
version "0.2.0-rc.0"
5446-
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.2.0-rc.0.tgz#671e8c9914b915796879329752f7240147494038"
5448+
react-navigation-tabs@^0.3.0:
5449+
version "0.3.0"
5450+
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.3.0.tgz#b1fe7ef1c665dd8928fafcc8622616e220ae5efa"
54475451
dependencies:
54485452
hoist-non-react-statics "^2.5.0"
54495453
prop-types "^15.6.0"
5450-
react-lifecycles-compat "^1.0.2"
5454+
react-lifecycles-compat "^3.0.4"
54515455
react-native-safe-area-view "^0.7.0"
5452-
react-native-tab-view "~0.0.77"
5456+
react-native-tab-view "~0.0.78"
54535457

54545458
[email protected]:
54555459
version "2.0.0"
@@ -5484,14 +5488,14 @@ [email protected]:
54845488
loose-envify "^1.1.0"
54855489
prop-types "^15.6.0"
54865490

5487-
react-test-renderer@16.3.2:
5488-
version "16.3.2"
5489-
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.2.tgz#3d1ed74fda8db42521fdf03328e933312214749a"
5491+
react-test-renderer@16.4.0:
5492+
version "16.4.0"
5493+
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3"
54905494
dependencies:
54915495
fbjs "^0.8.16"
54925496
object-assign "^4.1.1"
54935497
prop-types "^15.6.0"
5494-
react-is "^16.3.2"
5498+
react-is "^16.4.0"
54955499

54965500
react-timer-mixin@^0.13.2:
54975501
version "0.13.3"
@@ -5603,9 +5607,9 @@ [email protected]:
56035607
flux-standard-action "^2.0.3"
56045608
is-promise "^2.1.0"
56055609

5606-
redux-thunk@2.2.0:
5607-
version "2.2.0"
5608-
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
5610+
redux-thunk@2.3.0:
5611+
version "2.3.0"
5612+
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
56095613

56105614
[email protected]:
56115615
version "3.7.2"

0 commit comments

Comments
 (0)