babel preset update in openecom-ui

Issue-ID: SDC-961
Change-Id: Id9e31af24dcb67b11e9c47fbeee94af8c7b123be
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>

diff --git a/openecomp-ui/.babelrc b/openecomp-ui/.babelrc
index 1545202..054d6c7 100644 (file)
--- a/openecomp-ui/.babelrc
+++ b/openecomp-ui/.babelrc
@@ -1,9 +1,10 @@
 {
-       "presets": [["es2015", { "modules": false }],"stage-0", "react"],
+       "presets": [["env", {
+               "targets": {
+                       "browsers": ["last 2 versions", "Firefox >= 47"]
+               }
+       }], "react"],
        "plugins": [
-               "transform-es2015-modules-commonjs",
-               "transform-es2015-destructuring",
-               "transform-es2015-spread",
                "transform-object-rest-spread",
                "transform-class-properties",
                "transform-runtime",

diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json
index 783a043..b2152ca 100644 (file)
--- a/openecomp-ui/package.json
+++ b/openecomp-ui/package.json
@@ -61,15 +61,11 @@
     "babel-jest": "^19.0.0",
     "babel-loader": "^7.0.0-beta.1",
     "babel-plugin-transform-class-properties": "^6.10.2",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-es2015-destructuring": "^6.9.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.10.3",
-    "babel-plugin-transform-es2015-spread": "^6.8.0",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",    
     "babel-plugin-transform-object-rest-spread": "^6.8.0",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.23.0",
-    "babel-preset-stage-0": "^6.22.0",
     "css-loader": "^0.23.1",
     "deep-freeze": "0.0.1",
     "del": "^3.0.0",
@@ -98,6 +94,7 @@
     "jsx-loader": "^0.13.2",
     "mkdirp": "^0.5.1",
     "moment": "^2.18.1",
+    "node-sass": "^4.7.2",
     "node-watch": "^0.3.5",
     "prompt": "^0.2.14",
     "react-addons-test-utils": "~15.3.2",
@@ -105,7 +102,7 @@
     "react-hot-loader": "^3.1.3",
     "rosie": "^1.6.0",
     "run-sequence": "^2.2.1",
-    "sass-loader": "^3.2.3",
+    "sass-loader": "^6.0.6",
     "source-map-loader": "^0.1.5",
     "storyshots": "^3.2.2",
     "style-loader": "^0.13.0",

diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx
index 97f6829..76228b0 100644 (file)
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx
@@ -57,7 +57,7 @@ class SoftwareProductLandingPageView extends React.Component {
                currentSoftwareProduct: SoftwareProductPropType,
                isReadOnlyMode: PropTypes.bool,
                componentsList: PropTypes.arrayOf(ComponentPropType),
-               version: PropTypes.object,
+               version: PropTypes.string,
                onDetailsSelect: PropTypes.func,
                onUpload: PropTypes.func,
                onUploadConfirmation: PropTypes.func,

diff --git a/openecomp-ui/webpack.common.js b/openecomp-ui/webpack.common.js
index 36287c8..d1038b6 100644 (file)
--- a/openecomp-ui/webpack.common.js
+++ b/openecomp-ui/webpack.common.js
@@ -38,7 +38,7 @@ module.exports = {
                        {test: /\.(ttf|eot|otf)(\?.*)?$/, loader: 'file-loader'},
                        {test: /\.(png|jpg|svg)(\?.*)?$/, loader: 'url-loader?limit=16384', exclude: path.join(__dirname, 'resources/images/svg') },
                        {test: /\.html$/, use: [ {loader: 'html-loader'}]}
-                       ]
+               ]
        },
        plugins: []
 };