Skip to content
This repository was archived by the owner on Sep 2, 2023. It is now read-only.

Commit d93cba7

Browse files
committed
cleanups and handling package dependencies
1 parent 463143b commit d93cba7

File tree

4 files changed

+34
-55
lines changed

4 files changed

+34
-55
lines changed

build/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"gulp-replace": "^0.5.4",
3030
"gulp-run": "^1.7.1",
3131
"run-sequence": "^1.2.2",
32+
"yargs": "^6.4.0",
3233
"webpack": "^3.0.0"
3334
}
3435
}

package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
"lodash.head": "^4.0.1",
119119
"lodash.throttle": "^4.1.1",
120120
"moment": "^2.19.1",
121+
"prop-types": "^15.6.0",
121122
"react": "^15.4.0",
122123
"react-addons-css-transition-group": "^15.4.0",
123124
"react-dom": "^15.4.0",
@@ -148,8 +149,6 @@
148149
"babel-core": "^6.18.2",
149150
"babel-eslint": "^7.1.0",
150151
"babel-loader": "7.1.2",
151-
"babel-plugin-tcomb": "^0.3.22",
152-
"babel-plugin-transform-async-to-generator": "^6.16.0",
153152
"babel-plugin-transform-decorators-legacy": "^1.3.4",
154153
"babel-plugin-transform-inline-environment-variables": "^6.8.0",
155154
"babel-plugin-transform-react-constant-elements": "^6.9.1",
@@ -159,8 +158,8 @@
159158
"babel-preset-react": "^6.16.0",
160159
"babel-preset-stage-0": "^6.16",
161160
"babel-preset-stage-3": "^6.24.1",
162-
"bundle-loader": "^0.5.5",
163161
"binary-test-data": "^1.2.0",
162+
"bundle-loader": "^0.5.5",
164163
"coveralls": "^2.11.15",
165164
"css-loader": "^0.26.0",
166165
"enhanced-resolve": "^3.4.1",
@@ -186,7 +185,7 @@
186185
"react-addons-test-utils": "^15.4.0",
187186
"react-material-design-icons": "*",
188187
"react-perf-tool": "^0.1.7",
189-
"redux-mock-store": "1.2.1",
188+
"redux-mock-store": "^1.2.1",
190189
"reselect-debug": "^1.0.0",
191190
"rimraf": "^2.6.1",
192191
"sass-loader": "^6.0.6",
@@ -198,8 +197,7 @@
198197
"uglifyjs-webpack-plugin": "^0.4.6",
199198
"webpack": "^3.5.0",
200199
"webpack-notifier": "^1.4.1",
201-
"why-did-you-update": "0.0.8",
202-
"yargs": "^6.4.0"
200+
"why-did-you-update": "0.0.8"
203201
},
204202
"cordova": {
205203
"platforms": [

src/trade/trade-chart/TradeViewChart.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,6 @@ export default class TradeViewChart extends PureComponent {
2727
theme: () => undefined,
2828
};
2929

30-
async getChart() {
31-
const w = await import(/* webpackChunkName: "webtrader-charts" */ 'webtrader-charts');
32-
w.init({
33-
appId: window.BinaryBoot.appId,
34-
lang: window.BinaryBoot.language,
35-
server: window.BinaryBoot.apiUrl
36-
});
37-
this.wtcharts = w;
38-
}
39-
4030
initChart(trade) {
4131
const params = trade.chartParams || { type: 'line', timePeriod: '1t', indicators: [], overlays: [] };
4232

@@ -71,7 +61,15 @@ export default class TradeViewChart extends PureComponent {
7161
}
7262

7363
componentDidMount() {
74-
this.getChart().then(() => {
64+
(async () => {
65+
const w = await import(/* webpackChunkName: "webtrader-charts" */ 'webtrader-charts');
66+
w.init({
67+
appId: window.BinaryBoot.appId,
68+
lang: window.BinaryBoot.language,
69+
server: window.BinaryBoot.apiUrl
70+
});
71+
this.wtcharts = w;
72+
})().then(() => {
7573
const trade = this.props.tradeForChart.toJS();
7674
this.initChart(trade);
7775
});

yarn.lock

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ asar@^0.12.3:
254254
tmp "0.0.28"
255255

256256
asn1.js@^4.0.0:
257-
version "4.9.1"
258-
resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
257+
version "4.9.2"
258+
resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
259259
dependencies:
260260
bn.js "^4.0.0"
261261
inherits "^2.0.1"
@@ -390,18 +390,6 @@ babel-eslint@^7.1.0:
390390
babel-types "^6.23.0"
391391
babylon "^6.17.0"
392392

393-
394-
version "6.19.0"
395-
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.19.0.tgz#9b2f244204777a3d6810ec127c673c87b349fac5"
396-
dependencies:
397-
babel-messages "^6.8.0"
398-
babel-runtime "^6.9.0"
399-
babel-types "^6.19.0"
400-
detect-indent "^4.0.0"
401-
jsesc "^1.3.0"
402-
lodash "^4.2.0"
403-
source-map "^0.5.0"
404-
405393
babel-generator@^6.18.0, babel-generator@^6.26.0:
406394
version "6.26.0"
407395
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
@@ -557,7 +545,7 @@ [email protected]:
557545
loader-utils "^1.0.2"
558546
mkdirp "^0.5.1"
559547

560-
babel-messages@^6.23.0, babel-messages@^6.8.0:
548+
babel-messages@^6.23.0:
561549
version "6.23.0"
562550
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
563551
dependencies:
@@ -638,12 +626,6 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
638626
version "6.22.0"
639627
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
640628

641-
babel-plugin-tcomb@^0.3.22:
642-
version "0.3.26"
643-
resolved "https://registry.yarnpkg.com/babel-plugin-tcomb/-/babel-plugin-tcomb-0.3.26.tgz#f8fa81d63ca68ba045f873fe6cc2a53736a361cb"
644-
dependencies:
645-
babel-generator "6.19.0"
646-
647629
babel-plugin-transform-async-generator-functions@^6.24.1:
648630
version "6.24.1"
649631
resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
@@ -652,7 +634,7 @@ babel-plugin-transform-async-generator-functions@^6.24.1:
652634
babel-plugin-syntax-async-generators "^6.5.0"
653635
babel-runtime "^6.22.0"
654636

655-
babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.24.1:
637+
babel-plugin-transform-async-to-generator@^6.24.1:
656638
version "6.24.1"
657639
resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
658640
dependencies:
@@ -1093,7 +1075,7 @@ babel-register@^6.26.0:
10931075
mkdirp "^0.5.1"
10941076
source-map-support "^0.4.15"
10951077

1096-
babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.0:
1078+
babel-runtime@^6.0.0, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
10971079
version "6.26.0"
10981080
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
10991081
dependencies:
@@ -3375,8 +3357,8 @@ generate-object-property@^1.1.0:
33753357
is-property "^1.0.0"
33763358

33773359
generic-names@^1.0.1:
3378-
version "1.0.2"
3379-
resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.2.tgz#e25b7feceb5b5a8f28f5f972a7ccfe57e562adcd"
3360+
version "1.0.3"
3361+
resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.3.tgz#2d786a121aee508876796939e8e3bff836c20917"
33803362
dependencies:
33813363
loader-utils "^0.2.16"
33823364

@@ -3917,15 +3899,15 @@ intl-format-cache@^2.0.5:
39173899
version "2.0.5"
39183900
resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.0.5.tgz#b484cefcb9353f374f25de389a3ceea1af18d7c9"
39193901

3920-
intl-messageformat-parser@1.2.0:
3921-
version "1.2.0"
3922-
resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
3902+
intl-messageformat-parser@1.4.0:
3903+
version "1.4.0"
3904+
resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075"
39233905

39243906
intl-messageformat@^2.0.0, intl-messageformat@^2.1.0:
3925-
version "2.1.0"
3926-
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.1.0.tgz#1c51da76f02a3f7b360654cdc51bbc4d3fa6c72c"
3907+
version "2.2.0"
3908+
resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc"
39273909
dependencies:
3928-
intl-messageformat-parser "1.2.0"
3910+
intl-messageformat-parser "1.4.0"
39293911

39303912
intl-relativeformat@^2.0.0:
39313913
version "2.1.0"
@@ -6829,9 +6811,9 @@ redux-actions@^0.10.1:
68296811
dependencies:
68306812
reduce-reducers "^0.1.0"
68316813

6832-
6833-
version "1.2.1"
6834-
resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.2.1.tgz#630c0e2642927d1417c844d935266b501f2fc231"
6814+
redux-mock-store@^1.2.1:
6815+
version "1.3.0"
6816+
resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.3.0.tgz#6edfef0d2332f20576381069d6d889a6d0a4451c"
68356817

68366818
redux-saga@^0.13.0:
68376819
version "0.13.0"
@@ -7452,7 +7434,7 @@ source-map@^0.4.2, source-map@^0.4.4:
74527434
dependencies:
74537435
amdefine ">=0.0.4"
74547436

7455-
source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
7437+
source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3, source-map@~0.5.6:
74567438
version "0.5.7"
74577439
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
74587440

@@ -8416,8 +8398,8 @@ wordwrap@~0.0.2:
84168398
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
84178399

84188400
worker-farm@^1.3.1:
8419-
version "1.5.0"
8420-
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.0.tgz#adfdf0cd40581465ed0a1f648f9735722afd5c8d"
8401+
version "1.5.1"
8402+
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1"
84218403
dependencies:
84228404
errno "^0.1.4"
84238405
xtend "^4.0.1"
@@ -8532,7 +8514,7 @@ yargs@^3.5.4:
85328514
window-size "^0.1.4"
85338515
y18n "^3.2.0"
85348516

8535-
yargs@^6.3.0, yargs@^6.4.0, yargs@^6.6.0:
8517+
yargs@^6.3.0, yargs@^6.6.0:
85368518
version "6.6.0"
85378519
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
85388520
dependencies:

0 commit comments

Comments
 (0)