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

Commit 7c45670

Browse files
bruce-binarybruce-binary
committed
Merge branch 'dev' of https://github.com/binary-com/binary-next-gen into async-webtrader-charts
# Conflicts: # package.json # webpack.common.js # yarn.lock
2 parents 7fcc77c + 30fb5a1 commit 7c45670

File tree

12 files changed

+155
-155
lines changed

12 files changed

+155
-155
lines changed

‎build/yarn.lock

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ ansi-red@^0.1.1:
9696
dependencies:
9797
ansi-wrap "0.1.0"
9898

99-
ansi-regex@*, ansi-regex@^3.0.0:
100-
version "3.0.0"
101-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
102-
10399
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
104100
version "0.2.1"
105101
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -108,6 +104,10 @@ ansi-regex@^2.0.0:
108104
version "2.1.1"
109105
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
110106

107+
ansi-regex@^3.0.0:
108+
version "3.0.0"
109+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
110+
111111
ansi-styles@^1.1.0:
112112
version "1.1.0"
113113
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
@@ -758,6 +758,10 @@ camelcase@^2.0.0:
758758
version "2.1.1"
759759
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
760760

761+
camelcase@^3.0.0:
762+
version "3.0.0"
763+
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
764+
761765
camelcase@^4.1.0:
762766
version "4.1.0"
763767
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2609,6 +2613,13 @@ gulp-minify-css@^1.2.4:
26092613
vinyl-bufferstream "^1.0.1"
26102614
vinyl-sourcemaps-apply "^0.2.0"
26112615

2616+
gulp-modify-file@^1.0.0:
2617+
version "1.0.0"
2618+
resolved "https://registry.yarnpkg.com/gulp-modify-file/-/gulp-modify-file-1.0.0.tgz#639a120e683200811c18368e602c09f2378080f7"
2619+
dependencies:
2620+
gulp "3.9.1"
2621+
through2 "2.0.3"
2622+
26122623
gulp-rename@^1.2.0:
26132624
version "1.2.2"
26142625
resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
@@ -2697,7 +2708,7 @@ gulp-vinyl-zip@^1.2.0:
26972708
yauzl "^2.2.1"
26982709
yazl "^2.2.1"
26992710

2700-
gulp@^3.9.1:
2711+
gulp@3.9.1, gulp@^3.9.1:
27012712
version "3.9.1"
27022713
resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
27032714
dependencies:
@@ -2946,7 +2957,7 @@ iferr@^0.1.5:
29462957
version "0.1.5"
29472958
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
29482959

2949-
imurmurhash@*, imurmurhash@^0.1.4:
2960+
imurmurhash@^0.1.4:
29502961
version "0.1.4"
29512962
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
29522963

@@ -4368,6 +4379,12 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
43684379
version "1.0.2"
43694380
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
43704381

4382+
os-locale@^1.4.0:
4383+
version "1.4.0"
4384+
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
4385+
dependencies:
4386+
lcid "^1.0.0"
4387+
43714388
os-locale@^2.0.0:
43724389
version "2.1.0"
43734390
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -5689,6 +5706,13 @@ through2-filter@^2.0.0:
56895706
through2 "~2.0.0"
56905707
xtend "~4.0.0"
56915708

5709+
[email protected], through2@^2.0.0, through2@^2.0.1, through2@~2.0.0:
5710+
version "2.0.3"
5711+
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
5712+
dependencies:
5713+
readable-stream "^2.1.5"
5714+
xtend "~4.0.1"
5715+
56925716
through2@=0.4.2, through2@^0.4.1:
56935717
version "0.4.2"
56945718
resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
@@ -5717,13 +5741,6 @@ through2@^1.0.0:
57175741
readable-stream ">=1.1.13-1 <1.2.0-0"
57185742
xtend ">=4.0.0 <4.1.0-0"
57195743

5720-
through2@^2.0.0, through2@^2.0.1, through2@~2.0.0:
5721-
version "2.0.3"
5722-
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
5723-
dependencies:
5724-
readable-stream "^2.1.5"
5725-
xtend "~4.0.1"
5726-
57275744
through@2, "through@>=2.2.7 <3", through@^2.3.7, through@~2.3, through@~2.3.1:
57285745
version "2.3.8"
57295746
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -6117,6 +6134,10 @@ webpack@^3.0.0:
61176134
webpack-sources "^1.0.1"
61186135
yargs "^8.0.2"
61196136

6137+
which-module@^1.0.0:
6138+
version "1.0.0"
6139+
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
6140+
61206141
which-module@^2.0.0:
61216142
version "2.0.0"
61226143
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -6232,12 +6253,36 @@ yallist@^2.0.0, yallist@^2.1.2:
62326253
version "2.1.2"
62336254
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
62346255

6256+
yargs-parser@^4.2.0:
6257+
version "4.2.1"
6258+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
6259+
dependencies:
6260+
camelcase "^3.0.0"
6261+
62356262
yargs-parser@^7.0.0:
62366263
version "7.0.0"
62376264
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
62386265
dependencies:
62396266
camelcase "^4.1.0"
62406267

6268+
yargs@^6.4.0:
6269+
version "6.6.0"
6270+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
6271+
dependencies:
6272+
camelcase "^3.0.0"
6273+
cliui "^3.2.0"
6274+
decamelize "^1.1.1"
6275+
get-caller-file "^1.0.1"
6276+
os-locale "^1.4.0"
6277+
read-pkg-up "^1.0.1"
6278+
require-directory "^2.1.1"
6279+
require-main-filename "^1.0.1"
6280+
set-blocking "^2.0.0"
6281+
string-width "^1.0.2"
6282+
which-module "^1.0.0"
6283+
y18n "^3.2.1"
6284+
yargs-parser "^4.2.0"
6285+
62416286
yargs@^8.0.2:
62426287
version "8.0.2"
62436288
resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"

‎config.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget android-versionCode="200000" id="app.binary.com" version="2.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget android-versionCode="200000" id="app.binary.com" version="2.0.1"
3+
xmlns="http://www.w3.org/ns/widgets"
4+
xmlns:cdv="http://cordova.apache.org/ns/1.0"
5+
xmlns:android="http://schemas.android.com/apk/res/android">
36
<name>Binary.com</name>
47
<description>
58
Trade Binary Options with Binary.com
@@ -29,6 +32,10 @@
2932
<preference name="FadeSplashScreenDuration" value="250" />
3033
<preference name="StatusBarOverlaysWebView" value="false" />
3134
<preference name="StatusBarBackgroundColor" value="#2A3052" />
35+
<!-- Modify android manifest to prevent keyboard from resizing the view. See: https://stackoverflow.com/q/10076148/1471258 -->
36+
<edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application/activity">
37+
<activity android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="adjustPan" />
38+
</edit-config>
3239
<feature name="SplashScreen">
3340
<param name="ios-package" value="CDVSplashScreen" />
3441
<param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen" />

‎package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@
119119
"lodash.throttle": "^4.1.1",
120120
"moment": "^2.19.1",
121121
"prop-types": "^15.6.0",
122-
"react": "^15.4.0",
122+
"react": "^16.0.0",
123123
"react-addons-css-transition-group": "^15.4.0",
124-
"react-dom": "^15.4.0",
124+
"react-dom": "^16.0.0",
125125
"react-fastclick": "^2.1.2",
126126
"react-intl": "^2.1.5",
127-
"react-redux": "4.4.6",
127+
"react-redux": "^5.0.6",
128128
"react-router": "^3.0.0",
129129
"react-router-redux": "^4.0.7",
130130
"react-sparklines": "*",
@@ -136,6 +136,7 @@
136136
"redux-thunk": "^2.1.0",
137137
"reselect": "^2.5.4",
138138
"reselect-map": "1.0.0",
139+
"style-ext-html-webpack-plugin": "^3.4.3",
139140
"trackjs": "^2.5.3",
140141
"validate.js": "0.11.1",
141142
"webpack-dev-server": "^2.9.3",
@@ -181,10 +182,7 @@
181182
"postcss-modules": "^0.5.2",
182183
"precss": "^1.4.0",
183184
"progress-bar-webpack-plugin": "1.10.0",
184-
"react-addons-perf": "^15.4.0",
185-
"react-addons-test-utils": "^15.4.0",
186185
"react-material-design-icons": "*",
187-
"react-perf-tool": "^0.1.7",
188186
"redux-mock-store": "^1.2.1",
189187
"reselect-debug": "^1.0.0",
190188
"rimraf": "^2.6.1",

‎src/_store/storage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
export { localStorage as default };
1+
const storage = localStorage;
2+
3+
export default storage;

‎src/contract-details/ContractChart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import $ from 'jquery';
22
import moment from 'moment';
3-
import React, { PureComponent } from 'react';
3+
import React, { Component } from 'react';
44
// import { isMobile } from 'binary-utils';
55

66
type Props = {
77
contract: Contract,
88
highContrast: boolean,
99
pipSize: number,
1010
};
11-
export default class ContractChart extends PureComponent {
11+
export default class ContractChart extends Component {
1212
props: Props;
1313
root = null;
1414
chart = null;

‎src/index.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'babel-polyfill';
22
import React from 'react';
33
import ReactDOM from 'react-dom';
4-
// import Perf from 'react-addons-perf';
54
import config from './config';
65
import Root from './_store/root';
76
import storage from './_store/storage';
@@ -10,16 +9,6 @@ import '../styles/styles.scss';
109
// import { whyDidYouUpdate } from 'why-did-you-update';
1110
// whyDidYouUpdate(React, { exclude: [/^Connect/, /IntlProvider/, /BootProvider/] });
1211

13-
// window.performPerfTest = () => {
14-
// Perf.start();
15-
// setTimeout(() => {
16-
// Perf.stop();
17-
// const measurements = Perf.getLastMeasurements();
18-
// Perf.printInclusive(measurements);
19-
// Perf.printWasted(measurements);
20-
// }, 10000);
21-
// };
22-
2312
const appName = window.location.hostname === 'app.binary.com' && 'binary-next-gen' ||
2413
window.cordova && 'next-gen-mobile' ||
2514
'???';

‎src/trade/trade-chart/TradeViewChart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { PureComponent } from 'react';
1+
import React, { Component } from 'react';
22
import $ from 'jquery';
33
import 'binary-style/binary.isolated.css';
44
import { actions } from '../../_store';
@@ -15,7 +15,7 @@ type Props = {
1515
tradeForChart: object,
1616
tradingTime: object,
1717
};
18-
export default class TradeViewChart extends PureComponent {
18+
export default class TradeViewChart extends Component {
1919
props: Props;
2020
barspinner = null;
2121
root = null;

‎src/workspace/Dev.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎webpack.common.js

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const path = require('path');
22
const webpack = require('webpack');
33
const WebpackNotifierPlugin = require('webpack-notifier');
4-
const ExtractTextPlugin = require('extract-text-webpack-plugin');
54

65
module.exports = {
76
entry: {
@@ -14,31 +13,6 @@ module.exports = {
1413
},
1514
module: {
1615
rules: [
17-
{
18-
test: /\.scss$/,
19-
use: ExtractTextPlugin.extract({
20-
fallback: 'style-loader',
21-
use: [
22-
{
23-
loader: 'css-loader',
24-
options: { minimize: true }
25-
},
26-
'sass-loader'
27-
]
28-
}),
29-
},
30-
{
31-
test: /\.bundle\.js$/,
32-
exclude: /node_modules/,
33-
use: [
34-
{
35-
loader: 'bundle-loader',
36-
options: {
37-
lazy: true
38-
}
39-
}
40-
]
41-
},
4216
{
4317
test: /\.js$/,
4418
exclude: /node_modules/,
@@ -63,8 +37,7 @@ module.exports = {
6337
},
6438
],
6539
},
66-
plugins: [
67-
new ExtractTextPlugin('styles.css'),
40+
plugins:[
6841
new webpack.ContextReplacementPlugin(/moment[\\/]locale$/, /^$/), // remove locales from moment.js
6942
],
7043
externals: {

‎webpack.dev.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ const common = require('./webpack.common.js');
77

88
module.exports = merge(common, {
99
devtool: 'eval-source-map',
10+
module: {
11+
rules: [
12+
{
13+
test: /\.scss$/,
14+
use: [
15+
'style-loader',
16+
'css-loader',
17+
'sass-loader'
18+
]
19+
}
20+
]
21+
},
1022
plugins: [
1123
new webpack.DefinePlugin({
1224
'process.env': {

‎webpack.prod.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,41 @@ const webpack = require('webpack');
22
const merge = require('webpack-merge');
33
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
44
const common = require('./webpack.common.js');
5+
const StyleExtHtmlWebpackPlugin = require('style-ext-html-webpack-plugin');
6+
const ExtractTextPlugin = require('extract-text-webpack-plugin');
57

68
module.exports = merge(common, {
79
devtool: 'source-map',
10+
module: {
11+
rules: [
12+
{
13+
test: /\.scss$/,
14+
use: ExtractTextPlugin.extract({
15+
fallback: 'style-loader',
16+
use: [
17+
{
18+
loader: 'css-loader',
19+
options: { minimize: true }
20+
},
21+
'sass-loader'
22+
]
23+
}),
24+
}
25+
]
26+
},
827
plugins: [
928
new webpack.DefinePlugin({
1029
'process.env': {
1130
NODE_ENV: JSON.stringify('production'),
1231
},
1332
}),
33+
new webpack.optimize.ModuleConcatenationPlugin(),
1434
new webpack.optimize.UglifyJsPlugin({
1535
sourceMap: true
1636
}),
37+
new ExtractTextPlugin('style.css'),
38+
new StyleExtHtmlWebpackPlugin({
39+
minify: true
40+
}),
1741
]
1842
});

0 commit comments

Comments
 (0)