Merge branch 'babel-improvements' into 'develop'
Babel improvements, upgrade deps See merge request soapbox-pub/soapbox-fe!596
This commit is contained in:
commit
a12b1a0749
|
@ -18,7 +18,7 @@ class WrappedRoute extends React.Component {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
component: PropTypes.func.isRequired,
|
component: PropTypes.func.isRequired,
|
||||||
page: PropTypes.object,
|
page: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
|
||||||
content: PropTypes.node,
|
content: PropTypes.node,
|
||||||
componentParams: PropTypes.object,
|
componentParams: PropTypes.object,
|
||||||
layout: PropTypes.object,
|
layout: PropTypes.object,
|
||||||
|
|
|
@ -3,8 +3,9 @@ module.exports = (api) => {
|
||||||
|
|
||||||
const envOptions = {
|
const envOptions = {
|
||||||
debug: false,
|
debug: false,
|
||||||
loose: true,
|
|
||||||
modules: false,
|
modules: false,
|
||||||
|
useBuiltIns: 'usage',
|
||||||
|
corejs: '3.15',
|
||||||
};
|
};
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
|
|
|
@ -30,4 +30,5 @@ module.exports = {
|
||||||
'<rootDir>/node_modules',
|
'<rootDir>/node_modules',
|
||||||
'<rootDir>/app',
|
'<rootDir>/app',
|
||||||
],
|
],
|
||||||
|
'testEnvironment': 'jsdom',
|
||||||
};
|
};
|
||||||
|
|
18
package.json
18
package.json
|
@ -27,9 +27,9 @@
|
||||||
},
|
},
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
|
"> 0.5%",
|
||||||
"last 2 versions",
|
"last 2 versions",
|
||||||
"IE >= 11",
|
"Firefox ESR",
|
||||||
"iOS >= 9",
|
|
||||||
"not dead"
|
"not dead"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -57,11 +57,13 @@
|
||||||
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
|
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
|
||||||
"babel-runtime": "^6.26.0",
|
"babel-runtime": "^6.26.0",
|
||||||
"blurhash": "^1.0.0",
|
"blurhash": "^1.0.0",
|
||||||
|
"browserslist": "^4.16.6",
|
||||||
"classnames": "^2.2.5",
|
"classnames": "^2.2.5",
|
||||||
"compression-webpack-plugin": "^6.0.2",
|
"compression-webpack-plugin": "^6.0.2",
|
||||||
"copy-webpack-plugin": "6.4.0",
|
"copy-webpack-plugin": "6.4.0",
|
||||||
|
"core-js": "^3.15.2",
|
||||||
"cryptocurrency-icons": "^0.17.2",
|
"cryptocurrency-icons": "^0.17.2",
|
||||||
"css-loader": "^4.3.0",
|
"css-loader": "^5.2.6",
|
||||||
"cssnano": "^4.1.10",
|
"cssnano": "^4.1.10",
|
||||||
"detect-passive-events": "^2.0.0",
|
"detect-passive-events": "^2.0.0",
|
||||||
"dotenv": "^8.0.0",
|
"dotenv": "^8.0.0",
|
||||||
|
@ -88,7 +90,7 @@
|
||||||
"lodash": "^4.7.11",
|
"lodash": "^4.7.11",
|
||||||
"mark-loader": "^0.1.6",
|
"mark-loader": "^0.1.6",
|
||||||
"marky": "^1.2.1",
|
"marky": "^1.2.1",
|
||||||
"mini-css-extract-plugin": "^1.0.0",
|
"mini-css-extract-plugin": "^1.6.2",
|
||||||
"object-assign": "^4.1.1",
|
"object-assign": "^4.1.1",
|
||||||
"object-fit-images": "^3.2.3",
|
"object-fit-images": "^3.2.3",
|
||||||
"object.values": "^1.1.0",
|
"object.values": "^1.1.0",
|
||||||
|
@ -114,7 +116,7 @@
|
||||||
"react-popper": "^2.2.3",
|
"react-popper": "^2.2.3",
|
||||||
"react-redux": "^7.2.1",
|
"react-redux": "^7.2.1",
|
||||||
"react-redux-loading-bar": "^5.0.0",
|
"react-redux-loading-bar": "^5.0.0",
|
||||||
"react-router-dom": "^4.1.1",
|
"react-router-dom": "^4.3.1",
|
||||||
"react-router-scroll-4": "^1.0.0-beta.1",
|
"react-router-scroll-4": "^1.0.0-beta.1",
|
||||||
"react-sparklines": "^1.7.0",
|
"react-sparklines": "^1.7.0",
|
||||||
"react-swipeable-views": "^0.13.0",
|
"react-swipeable-views": "^0.13.0",
|
||||||
|
@ -131,7 +133,7 @@
|
||||||
"stringz": "^2.0.0",
|
"stringz": "^2.0.0",
|
||||||
"substring-trie": "^1.0.2",
|
"substring-trie": "^1.0.2",
|
||||||
"tiny-queue": "^0.2.1",
|
"tiny-queue": "^0.2.1",
|
||||||
"ts-jest": "^26.4.1",
|
"ts-jest": "^27.0.3",
|
||||||
"twemoji": "https://github.com/twitter/twemoji#v13.0.2",
|
"twemoji": "https://github.com/twitter/twemoji#v13.0.2",
|
||||||
"typescript": "^4.0.3",
|
"typescript": "^4.0.3",
|
||||||
"uglifyjs-webpack-plugin": "^2.2.0",
|
"uglifyjs-webpack-plugin": "^2.2.0",
|
||||||
|
@ -147,7 +149,7 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"axios-mock-adapter": "^1.18.1",
|
"axios-mock-adapter": "^1.18.1",
|
||||||
"babel-eslint": "^10.1.0",
|
"babel-eslint": "^10.1.0",
|
||||||
"babel-jest": "^26.5.2",
|
"babel-jest": "^27.0.6",
|
||||||
"enzyme": "^3.8.0",
|
"enzyme": "^3.8.0",
|
||||||
"enzyme-adapter-react-16": "^1.7.1",
|
"enzyme-adapter-react-16": "^1.7.1",
|
||||||
"eslint": "^7.0.0",
|
"eslint": "^7.0.0",
|
||||||
|
@ -156,7 +158,7 @@
|
||||||
"eslint-plugin-promise": "~4.2.0",
|
"eslint-plugin-promise": "~4.2.0",
|
||||||
"eslint-plugin-react": "~7.21.0",
|
"eslint-plugin-react": "~7.21.0",
|
||||||
"eslint-plugin-react-hooks": "^4.0.4",
|
"eslint-plugin-react-hooks": "^4.0.4",
|
||||||
"jest": "^26.0.1",
|
"jest": "^27.0.6",
|
||||||
"raf": "^3.4.1",
|
"raf": "^3.4.1",
|
||||||
"react-intl-translations-manager": "^5.0.3",
|
"react-intl-translations-manager": "^5.0.3",
|
||||||
"react-test-renderer": "^16.13.1",
|
"react-test-renderer": "^16.13.1",
|
||||||
|
|
|
@ -4,7 +4,11 @@ const { settings, env } = require('../configuration');
|
||||||
module.exports = {
|
module.exports = {
|
||||||
test: /\.(js|mjs)$/,
|
test: /\.(js|mjs)$/,
|
||||||
include: /node_modules/,
|
include: /node_modules/,
|
||||||
exclude: /@babel(?:\/|\\{1,2})runtime/,
|
exclude: [
|
||||||
|
/@babel(?:\/|\\{1,2})runtime/,
|
||||||
|
/\bcore-js\b/,
|
||||||
|
/\bwebpack\/buildin\b/,
|
||||||
|
],
|
||||||
use: [
|
use: [
|
||||||
{
|
{
|
||||||
loader: 'babel-loader',
|
loader: 'babel-loader',
|
||||||
|
|
Loading…
Reference in New Issue