Merge branch 'upgrade-babel' into 'develop'

Upgrade babel to latest versions

See merge request soapbox-pub/soapbox-fe!763
This commit is contained in:
Alex Gleason 2021-09-16 16:48:29 +00:00
commit b5c24adb59
4 changed files with 2065 additions and 4756 deletions

View file

@ -1,3 +1,5 @@
@use 'sass:math';
// OpenDyslexic // OpenDyslexic
@font-face { @font-face {
font-family: 'OpenDyslexic'; font-family: 'OpenDyslexic';
@ -46,14 +48,14 @@
// html and body declaration allows developer to pass px value as argument // html and body declaration allows developer to pass px value as argument
// Rendered css will default to "rem" and fall back to "px" for unsupported browsers // Rendered css will default to "rem" and fall back to "px" for unsupported browsers
@mixin font-size($size) { @mixin font-size($size) {
$rem: ($size / 10); $rem: math.div($size, 10);
$px: $size; $px: $size;
font-size: #{$px + "px"}; font-size: #{$px + "px"};
font-size: #{$rem + "rem"}; font-size: #{$rem + "rem"};
} }
@mixin line-height($size) { @mixin line-height($size) {
$rem: ($size / 10); $rem: math.div($size, 10);
$px: $size; $px: $size;
line-height: #{$px + "px"}; line-height: #{$px + "px"};
line-height: #{$rem + "rem"}; line-height: #{$rem + "rem"};

View file

@ -36,18 +36,18 @@
"not dead" "not dead"
], ],
"dependencies": { "dependencies": {
"@babel/core": "^7.14.6", "@babel/core": "^7.15.5",
"@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-decorators": "^7.14.5", "@babel/plugin-proposal-decorators": "^7.15.4",
"@babel/plugin-proposal-object-rest-spread": "^7.14.7", "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-react-inline-elements": "^7.14.5", "@babel/plugin-transform-react-inline-elements": "^7.14.5",
"@babel/plugin-transform-react-jsx-self": "^7.14.5", "@babel/plugin-transform-react-jsx-self": "^7.14.9",
"@babel/plugin-transform-react-jsx-source": "^7.14.5", "@babel/plugin-transform-react-jsx-source": "^7.14.5",
"@babel/plugin-transform-runtime": "^7.14.5", "@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.14.7", "@babel/preset-env": "^7.15.6",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"@babel/runtime": "^7.14.6", "@babel/runtime": "^7.15.4",
"@fontsource/montserrat": "^4.5.1", "@fontsource/montserrat": "^4.5.1",
"@fontsource/roboto": "^4.5.0", "@fontsource/roboto": "^4.5.0",
"@gamestdio/websocket": "^0.3.2", "@gamestdio/websocket": "^0.3.2",
@ -59,12 +59,11 @@
"array-includes": "^3.0.3", "array-includes": "^3.0.3",
"autoprefixer": "^10.0.0", "autoprefixer": "^10.0.0",
"axios": "^0.21.4", "axios": "^0.21.4",
"babel-loader": "^8.0.5", "babel-loader": "^8.2.2",
"babel-plugin-lodash": "^3.3.4", "babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.0.0", "babel-plugin-preval": "^5.0.0",
"babel-plugin-react-intl": "^7.5.20", "babel-plugin-react-intl": "^7.5.20",
"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",
"blurhash": "^1.0.0", "blurhash": "^1.0.0",
"bowser": "^2.11.0", "bowser": "^2.11.0",
"browserslist": "^4.16.6", "browserslist": "^4.16.6",
@ -83,12 +82,11 @@
"es6-symbol": "^3.1.1", "es6-symbol": "^3.1.1",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"exif-js": "^2.3.0", "exif-js": "^2.3.0",
"file-loader": "^6.0.0",
"fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265", "fork-awesome": "https://github.com/alexgleason/Fork-Awesome#c23fd34246a9f33c4bf24ea095a4cf26e7abe265",
"html-webpack-harddisk-plugin": "^2.0.0", "html-webpack-harddisk-plugin": "^2.0.0",
"html-webpack-plugin": "^5.3.2", "html-webpack-plugin": "^5.3.2",
"http-link-header": "^1.0.2", "http-link-header": "^1.0.2",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.14",
"imports-loader": "^1.0.0", "imports-loader": "^1.0.0",
"intersection-observer": "^0.11.0", "intersection-observer": "^0.11.0",
"intl": "^1.2.5", "intl": "^1.2.5",
@ -179,7 +177,7 @@
"react-test-renderer": "^16.13.1", "react-test-renderer": "^16.13.1",
"redux-mock-store": "^1.5.4", "redux-mock-store": "^1.5.4",
"stylelint": "^13.7.2", "stylelint": "^13.7.2",
"stylelint-config-standard": "^20.0.0", "stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.18.0", "stylelint-scss": "^3.18.0",
"webpack-dev-server": "^4.1.0", "webpack-dev-server": "^4.1.0",
"yargs": "^16.0.3" "yargs": "^16.0.3"

View file

@ -6,21 +6,12 @@ const css = require('./css');
const assets = require('./assets'); const assets = require('./assets');
const nodeModules = require('./node_modules'); const nodeModules = require('./node_modules');
// https://github.com/webpack/webpack/issues/11467
const disableFullySpecified = {
test: /\.m?js/,
resolve: {
fullySpecified: false,
},
};
// Webpack loaders are processed in reverse order // Webpack loaders are processed in reverse order
// https://webpack.js.org/concepts/loaders/#loader-features // https://webpack.js.org/concepts/loaders/#loader-features
// Lastly, process static files using file loader // Lastly, process static files using file loader
module.exports = [ module.exports = [
...assets, ...assets,
css, css,
disableFullySpecified,
nodeModules, nodeModules,
babel, babel,
git, git,

6784
yarn.lock

File diff suppressed because it is too large Load diff