From d2f5794e8565764e71e171e77ff0a548ad206b05 Mon Sep 17 00:00:00 2001 From: Einav Weiss Keidar Date: Wed, 14 Feb 2018 14:00:07 +0200 Subject: upgrade react framework Issue-ID: SDC-894 Change-Id: Iab219b465333d88c2679b01639e8bad6232750d9 Signed-off-by: einavk --- dox-sequence-diagram-ui/.gitignore | 1 + dox-sequence-diagram-ui/package.json | 23 +++---- .../editor/components/designer/Designer.jsx | 4 +- dox-sequence-diagram-ui/yarn.lock | 74 +++++++++++----------- 4 files changed, 51 insertions(+), 51 deletions(-) (limited to 'dox-sequence-diagram-ui') diff --git a/dox-sequence-diagram-ui/.gitignore b/dox-sequence-diagram-ui/.gitignore index 13383be112..3fb151de68 100644 --- a/dox-sequence-diagram-ui/.gitignore +++ b/dox-sequence-diagram-ui/.gitignore @@ -5,3 +5,4 @@ dist node_modules .npmrc .history +yarn-error.log \ No newline at end of file diff --git a/dox-sequence-diagram-ui/package.json b/dox-sequence-diagram-ui/package.json index b409829c6d..aa9976e31e 100644 --- a/dox-sequence-diagram-ui/package.json +++ b/dox-sequence-diagram-ui/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "", "main": "dist/index.js", - "scripts": { + "scripts": { "build": "webpack", "start": "webpack-dev-server", "lint": "eslint . --ext .js --ext .jsx --cache" @@ -11,16 +11,16 @@ "author": "ONAP", "license": "SEE LICENSE IN LICENSE", "dependencies": { - "d3": "^4.9.1", + "d3": "^4.10.0", "lodash": "^4.12.0", "prop-types": "^15.6.0", - "react": "^15.1.0", - "react-dnd": "^2.1.2", - "react-dnd-html5-backend": "^2.1.2", - "react-dom": "^15.1.0", - "react-redux": "^4.4.5", - "react-select": "1.0.0-rc.5", - "redux": "^3.5.2" + "react": "^15.6.2", + "react-dnd": "^2.5.4", + "react-dnd-html5-backend": "^2.5.4", + "react-dom": "^15.6.2", + "react-redux": "^5.0.6", + "react-select": "1.2.1", + "redux": "^3.7.2" }, "devDependencies": { "babel-core": "^6.26.0", @@ -51,6 +51,7 @@ }, "engines": { "node": ">=8.0.0", - "npm": ">=5.0.0" + "npm": ">=5.0.0", + "yarn": "^1.3.2" } -} +} \ No newline at end of file diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx index 39ed0909a0..c67c68e4e2 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx @@ -1,5 +1,5 @@ /*! - * Copyright © 2016-2017 European Support Limited + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,7 +160,7 @@ class Designer extends React.Component { addMessage() { if (this.application.getModel().unwrap().diagram.lifelines.length < 2) { - self.application.showErrorDialog('You need at least two lifelines.'); + this.application.showErrorDialog('You need at least two lifelines.'); return; } diff --git a/dox-sequence-diagram-ui/yarn.lock b/dox-sequence-diagram-ui/yarn.lock index 1bfdc3cd9b..4f3cc76a00 100644 --- a/dox-sequence-diagram-ui/yarn.lock +++ b/dox-sequence-diagram-ui/yarn.lock @@ -1561,7 +1561,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.6.0: +create-react-class@^15.6.0: version "15.6.2" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a" dependencies: @@ -1767,14 +1767,10 @@ d3-force@1.1.0: d3-quadtree "1" d3-timer "1" -d3-format@1: +d3-format@1, d3-format@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz#1a39c479c8a57fe5051b2e67a3bee27061a74e7a" -d3-format@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.1.tgz#4e19ecdb081a341dafaf5f555ee956bcfdbf167f" - d3-geo@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz#157e3b0f917379d0f73bebfff3be537f49fa7356" @@ -1832,10 +1828,14 @@ d3-scale@1.0.7: d3-time "1" d3-time-format "2" -d3-selection@1, d3-selection@1.2.0, d3-selection@^1.1.0: +d3-selection@1, d3-selection@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88" +d3-selection@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz#d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d" + d3-shape@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777" @@ -1881,9 +1881,9 @@ d3-zoom@1.7.1: d3-selection "1" d3-transition "1" -d3@^4.9.1: - version "4.12.2" - resolved "https://registry.yarnpkg.com/d3/-/d3-4.12.2.tgz#12f775564c6a9de229f63db03446e2cb7bb56c8f" +d3@^4.10.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz#ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d" dependencies: d3-array "1.2.1" d3-axis "1.0.8" @@ -1896,7 +1896,7 @@ d3@^4.9.1: d3-dsv "1.0.8" d3-ease "1.0.3" d3-force "1.1.0" - d3-format "1.2.1" + d3-format "1.2.2" d3-geo "1.9.1" d3-hierarchy "1.1.5" d3-interpolate "1.1.6" @@ -1907,7 +1907,7 @@ d3@^4.9.1: d3-random "1.1.0" d3-request "1.0.6" d3-scale "1.0.7" - d3-selection "1.2.0" + d3-selection "1.3.0" d3-shape "1.2.0" d3-time "1.0.8" d3-time-format "2.1.1" @@ -3158,11 +3158,7 @@ hoek@4.x.x: version "4.2.0" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" - -hoist-non-react-statics@^2.1.0: +hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.2.1: version "2.3.1" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0" @@ -3846,6 +3842,10 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +lodash-es@^4.2.0: + version "4.17.5" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.5.tgz#9fc6e737b1c4d151d8f9cae2247305d552ce748f" + lodash-es@^4.2.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" @@ -4906,7 +4906,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0: +prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856" dependencies: @@ -5032,13 +5032,13 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-dnd-html5-backend@^2.1.2: +react-dnd-html5-backend@^2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz#974ad083f67b12d56977a5b171f5ffeb29d78352" dependencies: lodash "^4.2.0" -react-dnd@^2.1.2: +react-dnd@^2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.5.4.tgz#0b6dc5e9d0dfc2909f4f4fe736e5534f3afd1bd9" dependencies: @@ -5049,7 +5049,7 @@ react-dnd@^2.1.2: lodash "^4.2.0" prop-types "^15.5.10" -react-dom@^15.1.0: +react-dom@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" dependencies: @@ -5058,34 +5058,32 @@ react-dom@^15.1.0: object-assign "^4.1.0" prop-types "^15.5.10" -react-input-autosize@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.2.0.tgz#87241071159f742123897691da6796ec33b57d05" +react-input-autosize@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8" dependencies: - create-react-class "^15.5.2" prop-types "^15.5.8" -react-redux@^4.4.5: - version "4.4.8" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-4.4.8.tgz#e7bc1dd100e8b64e96ac8212db113239b9e2e08f" +react-redux@^5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946" dependencies: - create-react-class "^15.5.1" - hoist-non-react-statics "^1.0.3" + hoist-non-react-statics "^2.2.1" invariant "^2.0.0" lodash "^4.2.0" + lodash-es "^4.2.0" loose-envify "^1.1.0" - prop-types "^15.5.4" + prop-types "^15.5.10" -react-select@1.0.0-rc.5: - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.0.0-rc.5.tgz#9d316f252b1adc372ddb5cdf1f119c6b7cfdb5d6" +react-select@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-1.2.1.tgz#a2fe58a569eb14dcaa6543816260b97e538120d1" dependencies: classnames "^2.2.4" - create-react-class "^15.5.2" prop-types "^15.5.8" - react-input-autosize "^1.1.3" + react-input-autosize "^2.1.2" -react@^15.1.0: +react@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" dependencies: @@ -5184,7 +5182,7 @@ redux-devtools@^3.3.1: prop-types "^15.5.7" redux-devtools-instrument "^1.0.1" -redux@^3.5.2, redux@^3.7.1: +redux@^3.7.1, redux@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" dependencies: -- cgit 1.2.3-korg