Skip to content

Commit 4fa8259

Browse files
committed
Bug fix.
1 parent f7f72f1 commit 4fa8259

File tree

5 files changed

+87
-35
lines changed

5 files changed

+87
-35
lines changed

app/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
"diffsvn2git": "^0.0.25",
1919
"loaders.css": "^0.1.2",
2020
"moment": "^2.18.1",
21-
"prop-types": "^15.5.10",
2221
"react-datepicker": "^0.47.0",
23-
"react-dom": "^15.6.1",
2422
"react-loaders": "^2.5.0",
2523
"svn-spawn": "^0.1.5"
2624
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
"react-router-redux": "^5.0.0-alpha.6",
200200
"redux": "^3.6.0",
201201
"redux-thunk": "^2.2.0",
202+
"prop-types": "^15.5.10",
202203
"source-map-support": "^0.4.14"
203204
},
204205
"devEngines": {

webpack.config.base.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import path from 'path';
66
import webpack from 'webpack';
7-
import ExtractTextPlugin from 'extract-text-webpack-plugin';
87
import { dependencies as externals } from './app/package.json';
98

109
export default {
@@ -20,13 +19,7 @@ export default {
2019
cacheDirectory: true
2120
}
2221
}
23-
}],
24-
loaders: [
25-
{
26-
test: /\.scss$/,
27-
loaders: ['style', 'css', 'sass']
28-
}
29-
]
22+
}]
3023
},
3124

3225
output: {

webpack.config.main.prod.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ export default merge.smart(baseConfig, {
1313

1414
target: 'electron-main',
1515

16-
entry: ['babel-polyfill', './app/main.development'],
16+
entry: ['babel-polyfill', './app/main.dev'],
1717

1818
// 'main.js' in root
1919
output: {
2020
path: __dirname,
21-
filename: './app/main.js'
21+
filename: './app/main.prod.js'
2222
},
2323

2424
plugins: [

yarn.lock

Lines changed: 83 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,10 @@ clap@^1.0.9:
17881788
dependencies:
17891789
chalk "^1.1.3"
17901790

1791+
classnames@^2.2.5:
1792+
version "2.2.5"
1793+
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
1794+
17911795
clean-css@4.0.x:
17921796
version "4.0.12"
17931797
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.0.12.tgz#a02e61707f1840bd3338f54dbc9acbda4e772fa3"
@@ -1830,14 +1834,13 @@ cliui@^3.0.3, cliui@^3.2.0:
18301834
strip-ansi "^3.0.1"
18311835
wrap-ansi "^2.0.0"
18321836

1833-
clone-deep@^0.2.4:
1834-
version "0.2.4"
1835-
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
1837+
clone-deep@^0.3.0:
1838+
version "0.3.0"
1839+
resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
18361840
dependencies:
1837-
for-own "^0.1.3"
1841+
for-own "^1.0.0"
18381842
is-plain-object "^2.0.1"
1839-
kind-of "^3.0.2"
1840-
lazy-cache "^1.0.3"
1843+
kind-of "^3.2.2"
18411844
shallow-clone "^0.1.2"
18421845

18431846
clone-regexp@^1.0.0:
@@ -2131,7 +2134,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
21312134
create-hash "^1.1.0"
21322135
inherits "^2.0.1"
21332136

2134-
create-react-class@^15.5.1:
2137+
create-react-class@^15.5.1, create-react-class@^15.5.x:
21352138
version "15.5.2"
21362139
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.2.tgz#6a8758348df660b88326a0e764d569f274aad681"
21372140
dependencies:
@@ -2208,13 +2211,14 @@ css-color-names@0.0.4:
22082211
version "0.0.4"
22092212
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
22102213

2211-
css-loader@^0.28.0:
2212-
version "0.28.0"
2213-
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad"
2214+
css-loader@^0.28.4:
2215+
version "0.28.4"
2216+
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
22142217
dependencies:
22152218
babel-code-frame "^6.11.0"
22162219
css-selector-tokenizer "^0.7.0"
22172220
cssnano ">=2.6.1 <4"
2221+
icss-utils "^2.1.0"
22182222
loader-utils "^1.0.2"
22192223
lodash.camelcase "^4.3.0"
22202224
object-assign "^4.0.1"
@@ -2223,6 +2227,7 @@ css-loader@^0.28.0:
22232227
postcss-modules-local-by-default "^1.0.1"
22242228
postcss-modules-scope "^1.0.0"
22252229
postcss-modules-values "^1.1.0"
2230+
postcss-value-parser "^3.3.0"
22262231
source-list-map "^0.1.7"
22272232

22282233
css-parse@~2.0.0:
@@ -3577,12 +3582,18 @@ for-in@^1.0.1:
35773582
version "1.0.2"
35783583
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
35793584

3580-
for-own@^0.1.3, for-own@^0.1.4:
3585+
for-own@^0.1.4:
35813586
version "0.1.5"
35823587
resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
35833588
dependencies:
35843589
for-in "^1.0.1"
35853590

3591+
for-own@^1.0.0:
3592+
version "1.0.0"
3593+
resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
3594+
dependencies:
3595+
for-in "^1.0.1"
3596+
35863597
foreach@^2.0.5:
35873598
version "2.0.5"
35883599
resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -4167,6 +4178,12 @@ icss-replace-symbols@^1.0.2:
41674178
version "1.0.2"
41684179
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
41694180

4181+
icss-utils@^2.1.0:
4182+
version "2.1.0"
4183+
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
4184+
dependencies:
4185+
postcss "^6.0.1"
4186+
41704187
identity-obj-proxy@^3.0.0:
41714188
version "3.0.0"
41724189
resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
@@ -4301,7 +4318,7 @@ is-binary-path@^1.0.0:
43014318
dependencies:
43024319
binary-extensions "^1.0.0"
43034320

4304-
is-buffer@^1.0.2, is-buffer@~1.1.1:
4321+
is-buffer@^1.0.2, is-buffer@^1.1.5, is-buffer@~1.1.1:
43054322
version "1.1.5"
43064323
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
43074324

@@ -4955,11 +4972,11 @@ kind-of@^2.0.1:
49554972
dependencies:
49564973
is-buffer "^1.0.2"
49574974

4958-
kind-of@^3.0.2:
4959-
version "3.1.0"
4960-
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
4975+
kind-of@^3.0.2, kind-of@^3.2.2:
4976+
version "3.2.2"
4977+
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
49614978
dependencies:
4962-
is-buffer "^1.0.2"
4979+
is-buffer "^1.1.5"
49634980

49644981
klaw@^1.0.0:
49654982
version "1.3.1"
@@ -5472,6 +5489,10 @@ mksnapshot@^0.3.0:
54725489
fs-extra "0.26.7"
54735490
request "^2.79.0"
54745491

5492+
moment@^2.17.1:
5493+
version "2.18.1"
5494+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
5495+
54755496
ms@0.7.1:
54765497
version "0.7.1"
54775498
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -6065,10 +6086,14 @@ performance-now@^0.2.0:
60656086
version "0.2.0"
60666087
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
60676088

6068-
pify@^2.0.0, pify@^2.3.0:
6089+
pify@^2.0.0:
60696090
version "2.3.0"
60706091
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
60716092

6093+
pify@^3.0.0:
6094+
version "3.0.0"
6095+
resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
6096+
60726097
pinkie-promise@^2.0.0:
60736098
version "2.0.1"
60746099
resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -6400,6 +6425,14 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.
64006425
source-map "^0.5.6"
64016426
supports-color "^3.2.3"
64026427

6428+
postcss@^6.0.1:
6429+
version "6.0.2"
6430+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.2.tgz#5c4fea589f0ac3b00caa75b1cbc3a284195b7e5d"
6431+
dependencies:
6432+
chalk "^1.1.3"
6433+
source-map "^0.5.6"
6434+
supports-color "^3.2.3"
6435+
64036436
prelude-ls@~1.1.2:
64046437
version "1.1.2"
64056438
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6465,12 +6498,19 @@ promise@^7.1.1:
64656498
dependencies:
64666499
asap "~2.0.3"
64676500

6468-
prop-types@^15.0.0, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@~15.5.7:
6501+
prop-types@^15.0.0, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7:
64696502
version "15.5.8"
64706503
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
64716504
dependencies:
64726505
fbjs "^0.8.9"
64736506

6507+
prop-types@^15.5.10:
6508+
version "15.5.10"
6509+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
6510+
dependencies:
6511+
fbjs "^0.8.9"
6512+
loose-envify "^1.3.1"
6513+
64746514
proxy-addr@~1.1.3:
64756515
version "1.1.4"
64766516
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
@@ -6571,6 +6611,16 @@ react-addons-test-utils@^15.5.1:
65716611
fbjs "^0.8.4"
65726612
object-assign "^4.1.0"
65736613

6614+
react-datepicker@^0.47.0:
6615+
version "0.47.0"
6616+
resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-0.47.0.tgz#bb002929e870e6bd7c9a92f95d5cd7c95051f629"
6617+
dependencies:
6618+
classnames "^2.2.5"
6619+
moment "^2.17.1"
6620+
prop-types "^15.5.8"
6621+
react-onclickoutside "^5.11.1"
6622+
tether "^1.4.0"
6623+
65746624
react-deep-force-update@^1.0.0:
65756625
version "1.0.1"
65766626
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.0.1.tgz#f911b5be1d2a6fe387507dd6e9a767aa2924b4c7"
@@ -6599,6 +6649,12 @@ react-hot-loader@3.0.0-beta.6:
65996649
redbox-react "^1.2.5"
66006650
source-map "^0.4.4"
66016651

6652+
react-onclickoutside@^5.11.1:
6653+
version "5.11.1"
6654+
resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-5.11.1.tgz#00314e52567cf55faba94cabbacd119619070623"
6655+
dependencies:
6656+
create-react-class "^15.5.x"
6657+
66026658
react-proxy@^1.1.7:
66036659
version "1.1.8"
66046660
resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -7082,15 +7138,15 @@ sass-graph@^2.1.1:
70827138
lodash "^4.0.0"
70837139
yargs "^4.7.1"
70847140

7085-
sass-loader@^6.0.3:
7086-
version "6.0.3"
7087-
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.3.tgz#33983b1f90d27ddab0e57d0dac403dce9bc7ecfd"
7141+
sass-loader@^6.0.6:
7142+
version "6.0.6"
7143+
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
70887144
dependencies:
70897145
async "^2.1.5"
7090-
clone-deep "^0.2.4"
7146+
clone-deep "^0.3.0"
70917147
loader-utils "^1.0.1"
70927148
lodash.tail "^4.1.1"
7093-
pify "^2.3.0"
7149+
pify "^3.0.0"
70947150

70957151
sax@^1.2.1, sax@~1.2.1:
70967152
version "1.2.2"
@@ -7756,6 +7812,10 @@ test-exclude@^4.0.3:
77567812
read-pkg-up "^1.0.1"
77577813
require-main-filename "^1.0.1"
77587814

7815+
tether@^1.4.0:
7816+
version "1.4.0"
7817+
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
7818+
77597819
text-encoding@0.6.4:
77607820
version "0.6.4"
77617821
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"

0 commit comments

Comments
 (0)