From 382b118da4c9681edf2e0bba349253e2eaa3ba4a Mon Sep 17 00:00:00 2001 From: "iman (shayan)" Date: Thu, 28 Apr 2022 11:27:32 +0430 Subject: [PATCH 1/3] base-branch-for-mobx-migration --- packages/p2p/src/stores/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/p2p/src/stores/index.js b/packages/p2p/src/stores/index.js index 6819386382f9..1f7668f47066 100644 --- a/packages/p2p/src/stores/index.js +++ b/packages/p2p/src/stores/index.js @@ -41,3 +41,5 @@ export const useStores = () => { } return React.useContext(stores_context); }; + +// start from here \ No newline at end of file From d572be64f78b51bd3c95adf4035d58f25a88660a Mon Sep 17 00:00:00 2001 From: niloo-fs Date: Thu, 28 Apr 2022 18:00:25 +0430 Subject: [PATCH 2/3] upgrade MobX versions --- packages/account/package.json | 4 +- packages/appstore/package.json | 4 +- packages/bot-web-ui/package.json | 168 ++++++++++----------- packages/cashier/package.json | 4 +- packages/cfd/package.json | 252 +++++++++++++++---------------- packages/core/package.json | 6 +- packages/p2p/package.json | 4 +- packages/trader/package.json | 6 +- 8 files changed, 224 insertions(+), 224 deletions(-) diff --git a/packages/account/package.json b/packages/account/package.json index 372ea891b947..fbc11d7147dc 100644 --- a/packages/account/package.json +++ b/packages/account/package.json @@ -36,8 +36,8 @@ "formik": "^2.1.4", "i18n-iso-countries": "^6.8.0", "js-cookie": "^2.2.1", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", + "mobx": "6.5.0", + "mobx-react": "7.3.0", "onfido-sdk-ui": "6.3.0", "prop-types": "^15.7.2", "qrcode.react": "^1.0.0", diff --git a/packages/appstore/package.json b/packages/appstore/package.json index d5472d9693ff..d95bbdac15c2 100644 --- a/packages/appstore/package.json +++ b/packages/appstore/package.json @@ -36,8 +36,8 @@ "@deriv/translations": "^1.0.0", "classnames": "^2.2.6", "formik": "^2.1.4", - "mobx": "^5.15.7", - "mobx-react-lite": "^2.2.2", + "mobx": "6.5.0", + "mobx-react-lite": "3.3.0", "object.fromentries": "^2.0.0", "prop-types": "^15.7.2", "react-router": "^5.2.0", diff --git a/packages/bot-web-ui/package.json b/packages/bot-web-ui/package.json index 5cf669cd58e2..7394ab0996e6 100644 --- a/packages/bot-web-ui/package.json +++ b/packages/bot-web-ui/package.json @@ -1,86 +1,86 @@ { - "version": "1.0.0", - "name": "@deriv/bot-web-ui", - "description": "Visual automation for Deriv.com", - "main": "dist/bot/js/bot-web-ui.main.js", - "private": true, - "jest": { - "setupFilesAfterEnv": [ - "/.jest" - ], - "testPathIgnorePatterns": [ - "/node_modules/", - "tools.js", - "Misc.js" - ] - }, - "engines": { - "node": "^14.17.1" - }, - "scripts": { - "start": "npm run test && npm run serve", - "serve": "echo \"Serving...\" && webpack --progress --watch", - "build": "f () { npm run build:skeleton && webpack --progress --env base=$1 ;}; f", - "build:skeleton": "lerna exec --scope @deriv/bot-skeleton -- npm run build", - "build:travis": "echo \"No build:travis specified\"", - "test": "npm run test:mocha", - "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"", - "test:mocha": "echo \"No test:mocha specified\"", - "deploy": "echo \"No deploy specified\"", - "deploy:clean": "echo \"No deploy:clean specified\"", - "deploy:folder": "echo \"No deploy:folder specified\"", - "deploy:staging": "echo \"No deploy:staging specified\"", - "deploy:production": "echo \"No deploy:production specified\"" - }, - "author": "Binary.com", - "license": "MIT", - "devDependencies": { - "babel-eslint": "^10.1.0", - "babel-loader": "^8.1.0", - "chai": "^4.2.0", - "clean-webpack-plugin": "^3.0.0", - "concurrently": "^5.3.0", - "copy-webpack-plugin": "^9.0.1", - "css-hot-loader": "^1.4.4", - "css-loader": "^5.0.1", - "eslint-config-airbnb-base": "^14.2.1", - "eslint-config-binary": "^1.0.2", - "eslint-config-prettier": "^7.2.0", - "eslint-plugin-import": "^2.23.4", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-react": "^7.22.0", - "eslint-plugin-react-hooks": "^4.2.0", - "lint-staged": "^10.4.0", - "loader-utils": "^1.1.0", - "mini-css-extract-plugin": "^1.3.4", - "node-sass": "^4.12.0", - "raw-loader": "^4.0.0", - "sass-loader": "^10.1.1", - "sass-resources-loader": "^2.1.1", - "stylelint-webpack-plugin": "^2.1.1", - "svg-sprite-loader": "^5.2.1", - "webpack": "^5.46.0", - "webpack-cli": "^4.7.2" - }, - "dependencies": { - "@deriv/bot-skeleton": "^1.0.0", - "@deriv/components": "^1.0.0", - "@deriv/deriv-charts": "^0.5.1", - "@deriv/shared": "^1.0.0", - "@deriv/translations": "^1.0.0", - "classnames": "^2.2.6", - "crc-32": "^1.2.0", - "formik": "^2.1.4", - "gh-pages": "^2.1.1", - "immutable": "^3.8.2", - "lz-string": "^1.4.4", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", - "pako": "^1.0.11", - "prop-types": "^15.7.2", - "react": "^16.14.0", - "react-content-loader": "^4.3.2", - "react-dom": "^16.14.0", - "react-transition-group": "^4.3.0" - } + "version": "1.0.0", + "name": "@deriv/bot-web-ui", + "description": "Visual automation for Deriv.com", + "main": "dist/bot/js/bot-web-ui.main.js", + "private": true, + "jest": { + "setupFilesAfterEnv": [ + "/.jest" + ], + "testPathIgnorePatterns": [ + "/node_modules/", + "tools.js", + "Misc.js" + ] + }, + "engines": { + "node": "^14.17.1" + }, + "scripts": { + "start": "npm run test && npm run serve", + "serve": "echo \"Serving...\" && webpack --progress --watch", + "build": "f () { npm run build:skeleton && webpack --progress --env base=$1 ;}; f", + "build:skeleton": "lerna exec --scope @deriv/bot-skeleton -- npm run build", + "build:travis": "echo \"No build:travis specified\"", + "test": "npm run test:mocha", + "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"", + "test:mocha": "echo \"No test:mocha specified\"", + "deploy": "echo \"No deploy specified\"", + "deploy:clean": "echo \"No deploy:clean specified\"", + "deploy:folder": "echo \"No deploy:folder specified\"", + "deploy:staging": "echo \"No deploy:staging specified\"", + "deploy:production": "echo \"No deploy:production specified\"" + }, + "author": "Binary.com", + "license": "MIT", + "devDependencies": { + "babel-eslint": "^10.1.0", + "babel-loader": "^8.1.0", + "chai": "^4.2.0", + "clean-webpack-plugin": "^3.0.0", + "concurrently": "^5.3.0", + "copy-webpack-plugin": "^9.0.1", + "css-hot-loader": "^1.4.4", + "css-loader": "^5.0.1", + "eslint-config-airbnb-base": "^14.2.1", + "eslint-config-binary": "^1.0.2", + "eslint-config-prettier": "^7.2.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react-hooks": "^4.2.0", + "lint-staged": "^10.4.0", + "loader-utils": "^1.1.0", + "mini-css-extract-plugin": "^1.3.4", + "node-sass": "^4.12.0", + "raw-loader": "^4.0.0", + "sass-loader": "^10.1.1", + "sass-resources-loader": "^2.1.1", + "stylelint-webpack-plugin": "^2.1.1", + "svg-sprite-loader": "^5.2.1", + "webpack": "^5.46.0", + "webpack-cli": "^4.7.2" + }, + "dependencies": { + "@deriv/bot-skeleton": "^1.0.0", + "@deriv/components": "^1.0.0", + "@deriv/deriv-charts": "^0.5.1", + "@deriv/shared": "^1.0.0", + "@deriv/translations": "^1.0.0", + "classnames": "^2.2.6", + "crc-32": "^1.2.0", + "formik": "^2.1.4", + "gh-pages": "^2.1.1", + "immutable": "^3.8.2", + "lz-string": "^1.4.4", + "mobx": "6.5.0", + "mobx-react": "7.3.0", + "pako": "^1.0.11", + "prop-types": "^15.7.2", + "react": "^16.14.0", + "react-content-loader": "^4.3.2", + "react-dom": "^16.14.0", + "react-transition-group": "^4.3.0" + } } diff --git a/packages/cashier/package.json b/packages/cashier/package.json index 83854eb6d71e..4aa18f366498 100644 --- a/packages/cashier/package.json +++ b/packages/cashier/package.json @@ -43,8 +43,8 @@ "classnames": "^2.2.6", "formik": "^2.1.4", "loadjs": "^4.2.0", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", + "mobx": "6.5.0", + "mobx-react": "7.3.0", "moment": "^2.24.0", "prop-types": "^15.7.2", "qrcode.react": "^1.0.0", diff --git a/packages/cfd/package.json b/packages/cfd/package.json index ef09058c0db0..14b90b80acdb 100644 --- a/packages/cfd/package.json +++ b/packages/cfd/package.json @@ -1,128 +1,128 @@ { - "name": "@deriv/cfd", - "version": "1.0.0", - "description": "Deriv content", - "main": "dist/cfd/js/cfd.js", - "private": true, - "scripts": { - "start": "npm run test && npm run serve", - "serve": "echo \"Serving...\" && webpack --progress --watch --config \"./build/webpack.config.js\"", - "build": "f () { webpack --config \"./build/webpack.config.js\" --env base=$1;}; f", - "build:travis": "echo \"No build:travis specified\"", - "test": "echo \"No mocha:test specified\"", - "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"", - "test:mocha": "mochapack -r babel-polyfill -r jsdom-global/register -r mock-local-storage --webpack-config \"./build/webpack.config-test.js\" \"src/**/__tests__/*.js\" --webpack-env.mocha_only --require ignore-styles", - "deploy": "echo \"No deploy specified\"", - "deploy:clean": "echo \"No deploy:clean specified\"", - "deploy:folder": "echo \"No deploy:folder specified\"", - "deploy:staging": "echo \"No deploy:staging specified\"", - "deploy:production": "echo \"No deploy:production specified\"" - }, - "engines": { - "node": "^14.17.1" - }, - "repository": { - "type": "git", - "url": "https://github.com/binary-com/deriv-app.git" - }, - "keywords": [ - "deriv" - ], - "author": "Deriv", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/binary-com/deriv-app/issues" - }, - "homepage": "https://github.com/binary-com/deriv-app", - "devDependencies": { - "babel-eslint": "^10.1.0", - "babel-loader": "^8.1.0", - "chai": "^4.2.0", - "circular-dependency-plugin": "^5.2.2", - "clean-webpack-plugin": "^3.0.0", - "copy-webpack-plugin": "^9.0.1", - "css-loader": "^5.0.1", - "css-minimizer-webpack-plugin": "^3.0.1", - "enzyme": "^3.10.0", - "enzyme-adapter-react-16": "^1.14.0", - "eslint-config-airbnb-base": "^14.2.1", - "eslint-config-binary": "^1.0.2", - "eslint-config-prettier": "^7.2.0", - "eslint-plugin-import": "^2.23.4", - "eslint-plugin-prettier": "^3.3.1", - "eslint-plugin-react": "^7.22.0", - "eslint-plugin-react-hooks": "^4.2.0", - "file-loader": "^6.2.0", - "fork-ts-checker-webpack-plugin": "^6.5.0", - "html-loader": "^1.3.2", - "html-webpack-plugin": "^5.0.0-beta.5", - "html-webpack-tags-plugin": "^2.0.17", - "ignore-styles": "^5.0.1", - "jsdom": "^16.2.1", - "jsdom-global": "^2.1.1", - "mini-css-extract-plugin": "^1.3.4", - "mocha": "^7.1.1", - "mochapack": "^2.1.2", - "mock-local-storage": "^1.1.8", - "node-sass": "^4.12.0", - "postcss-loader": "^6.2.1", - "postcss-preset-env": "^7.4.3", - "postcss-scss": "^4.0.3", - "react-svg-loader": "^3.0.3", - "resolve-url-loader": "^3.1.2", - "sass-loader": "^10.1.1", - "sass-resources-loader": "^2.1.1", - "sinon": "^7.3.2", - "stylelint-formatter-pretty": "^2.1.1", - "svgo": "^1.3.2", - "terser-webpack-plugin": "^5.1.1", - "webpack": "^5.46.0", - "webpack-bundle-analyzer": "^4.3.0", - "webpack-cli": "^4.7.2", - "webpack-manifest-plugin": "^4.0.2", - "webpack-node-externals": "^2.5.2" - }, - "dependencies": { - "@deriv/account": "^1.0.0", - "@deriv/api-types": "1.0.48", - "@deriv/components": "^1.0.0", - "@deriv/deriv-api": "^1.0.8", - "@deriv/shared": "^1.0.0", - "@deriv/translations": "^1.0.0", - "@types/classnames": "^2.2.11", - "@types/react": "^16.14.21", - "@types/react-dom": "^16.9.14", - "@types/react-loadable": "^5.5.6", - "acorn": "^6.1.1", - "babel-polyfill": "^6.26.0", - "canvas-toBlob": "^1.0.0", - "classnames": "^2.2.6", - "crc-32": "^1.2.0", - "event-source-polyfill": "1.0.25", - "extend": "^3.0.2", - "formik": "^2.1.4", - "i18next": "^20.3.2", - "js-cookie": "^2.2.1", - "lodash.debounce": "^4.0.8", - "lodash.throttle": "^4.1.1", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", - "mobx-utils": "^5.5.5", - "moment": "^2.24.0", - "null-loader": "^4.0.1", - "object.fromentries": "^2.0.0", - "promise-polyfill": "^8.1.3", - "prop-types": "^15.7.2", - "react": "^16.14.0", - "react-content-loader": "^4.3.2", - "react-dom": "^16.14.0", - "react-i18next": "^11.11.0", - "react-loadable": "^5.5.0", - "react-pose": "^4.0.10", - "react-router": "^5.2.0", - "react-router-dom": "^5.2.0", - "react-transition-group": "^4.3.0", - "typescript": "^4.5.4", - "workbox-webpack-plugin": "^6.0.2" - } + "name": "@deriv/cfd", + "version": "1.0.0", + "description": "Deriv content", + "main": "dist/cfd/js/cfd.js", + "private": true, + "scripts": { + "start": "npm run test && npm run serve", + "serve": "echo \"Serving...\" && webpack --progress --watch --config \"./build/webpack.config.js\"", + "build": "f () { webpack --config \"./build/webpack.config.js\" --env base=$1;}; f", + "build:travis": "echo \"No build:travis specified\"", + "test": "echo \"No mocha:test specified\"", + "test:eslint": "eslint \"./src/**/*.?(js|jsx)\"", + "test:mocha": "mochapack -r babel-polyfill -r jsdom-global/register -r mock-local-storage --webpack-config \"./build/webpack.config-test.js\" \"src/**/__tests__/*.js\" --webpack-env.mocha_only --require ignore-styles", + "deploy": "echo \"No deploy specified\"", + "deploy:clean": "echo \"No deploy:clean specified\"", + "deploy:folder": "echo \"No deploy:folder specified\"", + "deploy:staging": "echo \"No deploy:staging specified\"", + "deploy:production": "echo \"No deploy:production specified\"" + }, + "engines": { + "node": "^14.17.1" + }, + "repository": { + "type": "git", + "url": "https://github.com/binary-com/deriv-app.git" + }, + "keywords": [ + "deriv" + ], + "author": "Deriv", + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/binary-com/deriv-app/issues" + }, + "homepage": "https://github.com/binary-com/deriv-app", + "devDependencies": { + "babel-eslint": "^10.1.0", + "babel-loader": "^8.1.0", + "chai": "^4.2.0", + "circular-dependency-plugin": "^5.2.2", + "clean-webpack-plugin": "^3.0.0", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "^5.0.1", + "css-minimizer-webpack-plugin": "^3.0.1", + "enzyme": "^3.10.0", + "enzyme-adapter-react-16": "^1.14.0", + "eslint-config-airbnb-base": "^14.2.1", + "eslint-config-binary": "^1.0.2", + "eslint-config-prettier": "^7.2.0", + "eslint-plugin-import": "^2.23.4", + "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react-hooks": "^4.2.0", + "file-loader": "^6.2.0", + "fork-ts-checker-webpack-plugin": "^6.5.0", + "html-loader": "^1.3.2", + "html-webpack-plugin": "^5.0.0-beta.5", + "html-webpack-tags-plugin": "^2.0.17", + "ignore-styles": "^5.0.1", + "jsdom": "^16.2.1", + "jsdom-global": "^2.1.1", + "mini-css-extract-plugin": "^1.3.4", + "mocha": "^7.1.1", + "mochapack": "^2.1.2", + "mock-local-storage": "^1.1.8", + "node-sass": "^4.12.0", + "postcss-loader": "^6.2.1", + "postcss-preset-env": "^7.4.3", + "postcss-scss": "^4.0.3", + "react-svg-loader": "^3.0.3", + "resolve-url-loader": "^3.1.2", + "sass-loader": "^10.1.1", + "sass-resources-loader": "^2.1.1", + "sinon": "^7.3.2", + "stylelint-formatter-pretty": "^2.1.1", + "svgo": "^1.3.2", + "terser-webpack-plugin": "^5.1.1", + "webpack": "^5.46.0", + "webpack-bundle-analyzer": "^4.3.0", + "webpack-cli": "^4.7.2", + "webpack-manifest-plugin": "^4.0.2", + "webpack-node-externals": "^2.5.2" + }, + "dependencies": { + "@deriv/account": "^1.0.0", + "@deriv/api-types": "1.0.48", + "@deriv/components": "^1.0.0", + "@deriv/deriv-api": "^1.0.8", + "@deriv/shared": "^1.0.0", + "@deriv/translations": "^1.0.0", + "@types/classnames": "^2.2.11", + "@types/react": "^16.14.21", + "@types/react-dom": "^16.9.14", + "@types/react-loadable": "^5.5.6", + "acorn": "^6.1.1", + "babel-polyfill": "^6.26.0", + "canvas-toBlob": "^1.0.0", + "classnames": "^2.2.6", + "crc-32": "^1.2.0", + "event-source-polyfill": "1.0.25", + "extend": "^3.0.2", + "formik": "^2.1.4", + "i18next": "^20.3.2", + "js-cookie": "^2.2.1", + "lodash.debounce": "^4.0.8", + "lodash.throttle": "^4.1.1", + "mobx": "6.5.0", + "mobx-react": "7.3.0", + "mobx-utils": "6.0.5", + "moment": "^2.24.0", + "null-loader": "^4.0.1", + "object.fromentries": "^2.0.0", + "promise-polyfill": "^8.1.3", + "prop-types": "^15.7.2", + "react": "^16.14.0", + "react-content-loader": "^4.3.2", + "react-dom": "^16.14.0", + "react-i18next": "^11.11.0", + "react-loadable": "^5.5.0", + "react-pose": "^4.0.10", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", + "react-transition-group": "^4.3.0", + "typescript": "^4.5.4", + "workbox-webpack-plugin": "^6.0.2" + } } diff --git a/packages/core/package.json b/packages/core/package.json index 0cc10af96e3a..9ce43e7adf2c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -116,9 +116,9 @@ "js-cookie": "^2.2.1", "loadjs": "^4.2.0", "lodash.debounce": "^4.0.8", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", - "mobx-utils": "^5.5.5", + "mobx": "6.5.0", + "mobx-react": "7.3.0", + "mobx-utils": "6.0.5", "moment": "^2.24.0", "null-loader": "^4.0.1", "object.fromentries": "^2.0.0", diff --git a/packages/p2p/package.json b/packages/p2p/package.json index 49b4e0b25ad8..6611594d8c44 100644 --- a/packages/p2p/package.json +++ b/packages/p2p/package.json @@ -39,8 +39,8 @@ "formik": "^2.1.4", "i18next": "^20.3.2", "lodash.debounce": "^4.0.8", - "mobx": "^5.15.7", - "mobx-react-lite": "^2.2.2", + "mobx": "6.5.0", + "mobx-react-lite": "3.3.0", "prop-types": "^15.7.2", "react": "^16.14.0", "react-content-loader": "^4.3.2", diff --git a/packages/trader/package.json b/packages/trader/package.json index b04d2a4dfbee..e5e2b06fbb75 100644 --- a/packages/trader/package.json +++ b/packages/trader/package.json @@ -106,9 +106,9 @@ "js-cookie": "^2.2.1", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", - "mobx": "^5.15.7", - "mobx-react": "6.3.1", - "mobx-utils": "^5.5.5", + "mobx": "6.5.0", + "mobx-react": "7.3.0", + "mobx-utils": "6.0.5", "moment": "^2.24.0", "null-loader": "^4.0.1", "object.fromentries": "^2.0.0", From 6416634fe8d85d917818235c93d55726bbe1118e Mon Sep 17 00:00:00 2001 From: Niloofar Sadeghi Date: Wed, 18 May 2022 15:40:17 +0430 Subject: [PATCH 3/3] resolve conflict --- packages/cfd/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/cfd/package.json b/packages/cfd/package.json index ae375ea29eb5..0619dffe4fdd 100644 --- a/packages/cfd/package.json +++ b/packages/cfd/package.json @@ -120,10 +120,6 @@ "react-router": "^5.2.0", "react-router-dom": "^5.2.0", "react-transition-group": "^4.3.0", -<<<<<<< HEAD - "typescript": "^4.5.4", -======= ->>>>>>> bf1d1bab6dcd4d5879ee331da19c9381aff49776 "workbox-webpack-plugin": "^6.0.2" } }