resolve conflicts

This commit is contained in:
picklesrus 2021-03-08 14:46:24 -05:00
parent cc3bd510fa
commit 613a494bac

View file

@ -45,7 +45,6 @@
"@sentry/browser": "4.4.2",
"bunyan": "1.7.1",
"clipboard-copy": "2.0.1",
"compression": "1.6.1",
"express": "4.16.1",
"express-http-proxy": "1.1.0",
"lodash.defaults": "4.0.1",
@ -57,7 +56,6 @@
"@formatjs/intl-locale": "^2.4.13",
"@formatjs/intl-pluralrules": "^4.0.6",
"@formatjs/intl-relativetimeformat": "^8.0.3",
"ajv": "6.4.0",
"async": "3.1.0",
"autoprefixer": "6.3.6",
"babel-cli": "6.26.0",
@ -69,24 +67,19 @@
"babel-preset-es2015": "6.22.0",
"babel-preset-react": "6.22.0",
"bowser": "1.9.4",
"cheerio": "1.0.0-rc.2",
"chromedriver": "88.0.0",
"classnames": "2.2.5",
"cookie": "0.4.1",
"copy-webpack-plugin": "^4.5.1",
"create-react-class": "15.6.2",
"css-loader": "0.23.1",
"email-validator": "2.0.4",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"eslint": "5.16.0",
"eslint-config-scratch": "6.0.0",
"eslint-plugin-cypress": "^2.0.1",
"eslint-plugin-json": "2.0.1",
"eslint-plugin-react": "7.14.2",
"exenv": "1.2.0",
"fastly": "1.2.1",
"file-loader": "4.0.0",
"formik": "1.5.4",
"formsy-react": "1.1.4",
"formsy-react-components": "1.0.0",
@ -96,24 +89,17 @@
"html-webpack-plugin": "^3.2.0",
"iso-3166-2": "0.4.0",
"jest": "^23.6.0",
"json-loader": "0.5.2",
"json2po-stream": "1.0.3",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",
"lodash.clone": "3.0.3",
"lodash.defaultsdeep": "4.6.1",
"lodash.isarray": "3.0.4",
"lodash.merge": "4.6.2",
"lodash.mergewith": "4.6.2",
"lodash.omit": "3.1.0",
"lodash.range": "3.2.0",
"lodash.uniqby": "4.7.0",
"minilog": "2.0.8",
"node-dir": "0.1.16",
"node-sass": "4.14.1",
"pako": "0.2.8",
"plotly.js": "1.47.4",
"po2icu": "0.0.2",
"postcss-loader": "2.0.10",
"prop-types": "15.6.0",
"query-string": "^5.1.1",
@ -136,14 +122,11 @@
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
"source-map-support": "0.3.2",
"style-loader": "0.12.3",
"tap": "14.10.8",
"url-loader": "2.3.0",
"watch": "0.16.0",
"webpack": "^4.46.0",
"webpack-bundle-analyzer": "^4.4.0",
"webpack-cli": "^3.1.0",
"webpack-dev-middleware": "2.0.4",
"xhr": "2.2.0"
},