From 9b49cd824fa759e2c9de65c9a0d1e3089ba457fa Mon Sep 17 00:00:00 2001 From: svishnev Date: Mon, 22 Jan 2018 14:43:14 +0200 Subject: Babel version upgarde in dox-sequence Issue-ID: SDC-944 Change-Id: I4933e2904a01b96719e8d9ea04e00e1d94af6306 Signed-off-by: svishnev --- dox-sequence-diagram-ui/.babelrc | 6 +++++- dox-sequence-diagram-ui/package.json | 21 +++++++++------------ dox-sequence-diagram-ui/webpack.config.js | 6 ------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dox-sequence-diagram-ui/.babelrc b/dox-sequence-diagram-ui/.babelrc index 91f0a7318b..70ed3dbee1 100644 --- a/dox-sequence-diagram-ui/.babelrc +++ b/dox-sequence-diagram-ui/.babelrc @@ -1,3 +1,7 @@ { - "presets": ["es2015", "react", "stage-0"] + "presets": [["env", { + "targets": { + "browsers": ["last 2 versions", "Firefox >= 47"] + } + }],"react"] } diff --git a/dox-sequence-diagram-ui/package.json b/dox-sequence-diagram-ui/package.json index cca633cd2c..8080052ba3 100644 --- a/dox-sequence-diagram-ui/package.json +++ b/dox-sequence-diagram-ui/package.json @@ -24,32 +24,29 @@ "redux": "^3.5.2" }, "devDependencies": { - "babel-core": "^6.2.4", - "babel-eslint": "^6.0.4", - "babel-loader": "^6.2.4", - "babel-plugin-lodash": "^3.1.4", - "babel-polyfill": "^6.5.0", - "babel-preset-es2015": "^6.3.13", + "babel-core": "^6.26.0", + "babel-eslint": "^8.2.1", + "babel-loader": "^7.1.2", + "babel-plugin-lodash": "^3.3.2", + "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.5.0", - "babel-preset-stage-0": "^6.5.0", "copy": "^0.2.0", - "css-loader": "^0.23.1", + "css-loader": "^0.28.7", "eslint": "^2.10.2", "eslint-config-airbnb": "^9.0.1", "eslint-loader": "^1.3.0", "eslint-plugin-import": "^1.8.0", "eslint-plugin-jsx-a11y": "^1.2.2", "eslint-plugin-react": "^5.1.1", - "file-loader": "^0.8.5", - "json-loader": "^0.5.4", + "file-loader": "^1.1.6", "node-sass": "^3.7.0", "path": "^0.12.7", "raw-loader": "^0.5.1", "redux-devtools": "^3.3.1", "sass-loader": "^3.2.0", - "style-loader": "^0.13.1", + "style-loader": "^0.19.1", "svg-sprite-loader": "0.0.19", - "url-loader": "^0.5.7", + "url-loader": "^0.6.2", "webpack": "^2.2.1", "webpack-dev-server": "^2.4.2" }, diff --git a/dox-sequence-diagram-ui/webpack.config.js b/dox-sequence-diagram-ui/webpack.config.js index 72a483724a..4dfa1a85b6 100644 --- a/dox-sequence-diagram-ui/webpack.config.js +++ b/dox-sequence-diagram-ui/webpack.config.js @@ -10,7 +10,6 @@ var devmode = (process.env.npm_lifecycle_event === 'start'); var entry = []; if (devmode) { - entry.push('babel-polyfill'); entry.push(path.resolve(PATHS.SRC, 'lib/main.jsx')); } else { entry.push(path.resolve(PATHS.SRC, 'lib/ecomp/asdc/sequencer/Sequencer.jsx')); @@ -46,11 +45,6 @@ var config = { test: /\.html$/, include: path.join(PATHS.SRC, 'lib'), loaders: ['raw-loader'] - }, - { - test: /\.json$/, - include: path.join(PATHS.SRC, 'lib'), - loaders: ['json-loader'] }, { test: /\.svg$/, -- cgit 1.2.3-korg