From 41d3410efb83d18e81b580dd9acc7da2eee226d6 Mon Sep 17 00:00:00 2001 From: mhatvan Date: Fri, 30 Jul 2021 19:48:40 +0200 Subject: chore: cleanup and improve dependencies - removed `@meetfranz/typings` because it only stubbed external type definitions - removed `@babel/polyfill` because there are no old browsers in use with Electron - replaced deprecated `mdi` with `@mdi/font` - removed unused `atob`, `btoa`, `targz`, `node-fetch`, `terser-webpack-plugin`, `webpack-node-externals` - added used, but not installed dependencies `color`, `csstype`, `debug`, `minimist`, `jss` - upgraded `@types/node` to match used node version - upgraded `@types/fs-extra` to match fs-extra version - add missing `arrow-parens` rule to `.eslintrc` rulest for .js files --- src/app.js | 13 +++++-------- src/styles/fonts.scss | 13 ++++++------- src/styles/main.scss | 6 +++--- 3 files changed, 14 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/app.js b/src/app.js index a2d60dbe4..39b50cb33 100644 --- a/src/app.js +++ b/src/app.js @@ -4,11 +4,8 @@ import React from 'react'; import { render } from 'react-dom'; import { Provider } from 'mobx-react'; import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; -import { - hashHistory, -} from 'react-router'; +import { hashHistory } from 'react-router'; -import '@babel/polyfill'; import smoothScroll from 'smoothscroll-polyfill'; import ServerApi from './api/server/ServerApi'; @@ -59,7 +56,7 @@ window.addEventListener('load', () => { }); // Prevent drag and drop into window from redirecting -window.addEventListener('dragover', (event) => event.preventDefault()); -window.addEventListener('drop', (event) => event.preventDefault()); -window.addEventListener('dragover', (event) => event.stopPropagation()); -window.addEventListener('drop', (event) => event.stopPropagation()); +window.addEventListener('dragover', event => event.preventDefault()); +window.addEventListener('drop', event => event.preventDefault()); +window.addEventListener('dragover', event => event.stopPropagation()); +window.addEventListener('drop', event => event.stopPropagation()); diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index bd96ea867..432332b49 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss @@ -1,44 +1,43 @@ @import './config.scss'; -// @import './node_modules/mdi/scss/materialdesignicons.scss'; @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-Light.ttf'); + src: url('../assets/fonts/OpenSans-Light.ttf'); font-weight: 300; font-style: normal; } @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-Regular.ttf'); + src: url('../assets/fonts/OpenSans-Regular.ttf'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-Bold.ttf'); + src: url('../assets/fonts/OpenSans-Bold.ttf'); font-weight: bold; font-style: normal; } @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); + src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); font-weight: bold; font-style: italic; } @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); + src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); font-weight: 800; font-style: normal; } @font-face { font-family: 'Open Sans'; - src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); + src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); font-weight: 800; font-style: italic; } diff --git a/src/styles/main.scss b/src/styles/main.scss index 6909d2051..4cc996785 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,9 +1,9 @@ -$mdi-font-path: '../node_modules/mdi/fonts'; +$mdi-font-path: '../node_modules/@mdi/font/fonts'; @if $env == development { - $mdi-font-path: '../../node_modules/mdi/fonts'; + $mdi-font-path: '../../node_modules/@mdi/font/fonts'; } -@import './node_modules/mdi/scss/materialdesignicons.scss'; +@import './node_modules/@mdi/font/scss/materialdesignicons.scss'; @import './node_modules/electron-react-titlebar/assets/style'; // modules -- cgit v1.2.3-70-g09d2