Skip to content

Commit

Permalink
[v6.6] Upgrade dependencies (#141) (#145)
Browse files Browse the repository at this point in the history
* Upgrade dependencies (#141)

* Fix yarn.lock
  • Loading branch information
nickpeihl authored Oct 29, 2019
1 parent 63950cd commit e7e8b30
Show file tree
Hide file tree
Showing 4 changed files with 4,113 additions and 4,480 deletions.
23 changes: 14 additions & 9 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{
"presets": [
[
"env",
"@babel/preset-env",
{
"targets": {
"browsers": [
"last 2 versions",
"IE >= 9"
]
}
"targets": [
"last 2 versions",
"IE >= 9"
],
"useBuiltIns": "usage",
"modules": "commonjs",
"corejs": 3
}
],
"react"
"@babel/react"
],
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-class-properties"
]
}
}
90 changes: 43 additions & 47 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,70 @@
"description": "",
"main": "main.js",
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-async-generator-functions": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-async-to-generator": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@elastic/eslint-config-kibana": "^0.15.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.0.20",
"babel-eslint": "^8.2.3",
"babel-loader": "^7.1.5",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-inline-react-svg": "^0.5.3",
"babel-plugin-pegjs-inline-precompile": "^0.1.0",
"babel-plugin-react-docgen": "^2.0.0-rc.1",
"babel-plugin-react-intl": "^2.4.0",
"babel-plugin-transform-async-generator-functions": "^6.24.1",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-polyfill": "^6.5.0",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.5.0",
"babel-preset-es2017": "^6.24.1",
"babel-preset-react": "^6.24.1",
"backport": "^4.0.3",
"clean-webpack-plugin": "^1.0.0",
"css-loader": "^0.28.10",
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-babel": "^4.1.2",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.0.0",
"babel-plugin-dynamic-import-node": "^2.3.0",
"babel-plugin-inline-react-svg": "^1.1.0",
"babel-plugin-react-docgen": "^3.2.0",
"babel-plugin-react-intl": "^4.1.21",
"clean-webpack-plugin": "^3.0.0",
"core-js": "^3.3.5",
"css-loader": "^3.2.0",
"eslint": "^6.6.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-jest": "^21.15.1",
"eslint-plugin-jest": "^23.0.2",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-mocha": "^4.12.1",
"eslint-plugin-mocha": "^6.2.1",
"eslint-plugin-prefer-object-spread": "^1.2.1",
"eslint-plugin-react": "^7.7.0",
"file-loader": "^1.1.9",
"file-loader": "^4.2.0",
"grunt": "^1.0.3",
"grunt-cli": "^1.2.0",
"grunt-eslint": "^20.1.0",
"grunt-eslint": "^22.0.0",
"grunt-run": "^0.8.1",
"grunt-webpack": "^3.1.2",
"html-webpack-plugin": "^3.2.0",
"husky": "^1.0.0-rc.4",
"json-loader": "^0.5.7",
"mermaid.cli": "^0.5.1",
"node-libs-browser": "^0.5.3",
"husky": "^3.0.9",
"node-libs-browser": "^2.2.1",
"node-sass": "^4.7.2",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"postcss-inline-svg": "^3.0.0",
"postcss-loader": "^2.1.0",
"resolve-url-loader": "^2.2.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.20.2",
"terser-webpack-plugin": "^1.1.0",
"postcss-inline-svg": "^4.1.0",
"postcss-loader": "^3.0.0",
"resolve-url-loader": "^3.1.0",
"sass-loader": "^8.0.0",
"style-loader": "^1.0.0",
"terser-webpack-plugin": "^2.2.1",
"webapp-webpack-plugin": "^2.6.0",
"webpack": "^4.28.1",
"webpack-cli": "^3.1.2",
"webpack-dev-server": "^3.1.10",
"webpack-merge": "^4.1.5"
},
"dependencies": {
"@elastic/eui": "5.8.1",
"@elastic/datemath": "^5.0.2",
"@elastic/eui": "^14.8.0",
"@turf/bbox": "6.0.1",
"@turf/center": "6.0.1",
"mapbox-gl": "0.52.0",
"markdown-it": "8.4.2",
"moment": "2.21.0",
"querystring-browser": "^1.0.4",
"react": "16.3.0",
"react-dom": "16.3.0",
"topojson-client": "3.0.0",
"url-parse": "1.4.4",
"mapbox-gl": "1.5.0",
"markdown-it": "10.0.0",
"moment": "2.24.0",
"react": "16.11.0",
"react-dom": "16.11.0",
"topojson-client": "3.0.1",
"url-parse": "1.4.7",
"whatwg-fetch": "^3.0.0"
},
"scripts": {
Expand Down
11 changes: 5 additions & 6 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
const path = require('path');
const TerserPlugin = require('terser-webpack-plugin');
const HTMLWebpackPlugin = require('html-webpack-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const WebappWebpackPlugin = require('webapp-webpack-plugin');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');

module.exports = {
entry: {
mapbox: './node_modules/mapbox-gl/dist/mapbox-gl.js',
main: ['babel-polyfill', path.resolve(__dirname, 'public/main.js')]
main: ['@babel/polyfill', path.resolve(__dirname, 'public/main.js')]
},
mode: 'development',
output: {
Expand All @@ -24,7 +24,7 @@ module.exports = {
module: {
rules: [
{
test: /\.(png|jpg|gif)$/,
test: /\.(png|jpg|gif|svg)$/,
use: ['file-loader']
},
{
Expand All @@ -38,7 +38,7 @@ module.exports = {
},
{
test: /\.js$/,
exclude: /node_modules\/(?!@elastic\/eui)/,
exclude: /node_modules/,
use: {
loader: 'babel-loader'
}
Expand All @@ -47,7 +47,6 @@ module.exports = {
},
resolve: {
alias: {
querystring: 'querystring-browser'
}
},
optimization: {
Expand All @@ -62,7 +61,7 @@ module.exports = {
},
},
plugins: [
new CleanWebpackPlugin(['build/release']),
new CleanWebpackPlugin(),
new WebappWebpackPlugin('@elastic/eui/lib/components/icon/assets/app_ems.svg'),
new HTMLWebpackPlugin({
template: 'public/index.html',
Expand Down
Loading

0 comments on commit e7e8b30

Please sign in to comment.