From 5a9d4d6280f40c4aa23ea35bd797a331ddd2a71d Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 12 Jan 2023 02:48:23 +0200 Subject: [PATCH] Fixed: (UI) Transpile ES6 libs to fix issues on some browsers --- frontend/build/webpack.config.js | 4 ++-- package.json | 4 +++- yarn.lock | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/frontend/build/webpack.config.js b/frontend/build/webpack.config.js index 2a1e55014..e5618ea7d 100644 --- a/frontend/build/webpack.config.js +++ b/frontend/build/webpack.config.js @@ -142,8 +142,8 @@ module.exports = (env) => { module: { rules: [ { - test: /\.js?$/, - exclude: /(node_modules|JsLibraries)/, + test: /\.jsx?$/, + exclude: /[\\/]node_modules[\\/](?!(@sentry\/browser|@sentry\/integrations|chart.js|filesize|normalize.css)[\\/])/, use: [ { loader: 'babel-loader', diff --git a/package.json b/package.json index 57c4e0e24..602a3fdd1 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "lint": "esprint check", "lint-fix": "esprint check --fix", "stylelint-linux": "stylelint $(find frontend -name '*.css') --config frontend/.stylelintrc", - "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc" + "stylelint-windows": "stylelint frontend/**/*.css --config frontend/.stylelintrc", + "check-modules": "are-you-es5 check . -r" }, "repository": "https://github.com/Prowlarr/Prowlarr", "author": "Team Prowlarr", @@ -93,6 +94,7 @@ "@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/preset-env": "7.20.2", "@babel/preset-react": "7.18.6", + "are-you-es5": "2.1.2", "autoprefixer": "10.4.13", "babel-loader": "9.1.0", "babel-plugin-inline-classnames": "2.0.1", diff --git a/yarn.lock b/yarn.lock index 573ee0d51..14bf0f8de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1577,6 +1577,11 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +acorn@^6.0.6: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" @@ -1726,6 +1731,16 @@ archiver@^5.3.1: tar-stream "^2.2.0" zip-stream "^4.1.0" +are-you-es5@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/are-you-es5/-/are-you-es5-2.1.2.tgz#d75511a174a3f842d70cc784aec0bcaff5a57547" + integrity sha512-gkT2bLCfzyJJr3lYoxZKScdD/Yp5zzghi+3KawONTvH/7rrgU3RMXYvGQnOTlqEFVgZFpEGj/6bZ6sF/9YtddA== + dependencies: + acorn "^6.0.6" + array-flatten "^2.1.0" + commander "^2.19.0" + find-up "^4.1.0" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -1749,6 +1764,11 @@ arr-union@^2.0.1: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" integrity sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA== +array-flatten@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== + array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" @@ -2197,7 +2217,7 @@ colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== -commander@^2.20.0, commander@^2.20.3: +commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==