diff options
author | 2021-07-30 19:48:40 +0200 | |
---|---|---|
committer | 2021-07-30 23:06:24 +0000 | |
commit | 41d3410efb83d18e81b580dd9acc7da2eee226d6 (patch) | |
tree | 65249a87c9f464ec670273b3f994cca8066587c7 /src | |
parent | chore: migrate from tslint to @typescript-eslint (#1706) (diff) | |
download | ferdium-app-41d3410efb83d18e81b580dd9acc7da2eee226d6.tar.gz ferdium-app-41d3410efb83d18e81b580dd9acc7da2eee226d6.tar.zst ferdium-app-41d3410efb83d18e81b580dd9acc7da2eee226d6.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/app.js | 13 | ||||
-rw-r--r-- | src/styles/fonts.scss | 13 | ||||
-rw-r--r-- | src/styles/main.scss | 6 |
3 files changed, 14 insertions, 18 deletions
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'; | |||
4 | import { render } from 'react-dom'; | 4 | import { render } from 'react-dom'; |
5 | import { Provider } from 'mobx-react'; | 5 | import { Provider } from 'mobx-react'; |
6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; | 6 | import { syncHistoryWithStore, RouterStore } from 'mobx-react-router'; |
7 | import { | 7 | import { hashHistory } from 'react-router'; |
8 | hashHistory, | ||
9 | } from 'react-router'; | ||
10 | 8 | ||
11 | import '@babel/polyfill'; | ||
12 | import smoothScroll from 'smoothscroll-polyfill'; | 9 | import smoothScroll from 'smoothscroll-polyfill'; |
13 | 10 | ||
14 | import ServerApi from './api/server/ServerApi'; | 11 | import ServerApi from './api/server/ServerApi'; |
@@ -59,7 +56,7 @@ window.addEventListener('load', () => { | |||
59 | }); | 56 | }); |
60 | 57 | ||
61 | // Prevent drag and drop into window from redirecting | 58 | // Prevent drag and drop into window from redirecting |
62 | window.addEventListener('dragover', (event) => event.preventDefault()); | 59 | window.addEventListener('dragover', event => event.preventDefault()); |
63 | window.addEventListener('drop', (event) => event.preventDefault()); | 60 | window.addEventListener('drop', event => event.preventDefault()); |
64 | window.addEventListener('dragover', (event) => event.stopPropagation()); | 61 | window.addEventListener('dragover', event => event.stopPropagation()); |
65 | window.addEventListener('drop', (event) => event.stopPropagation()); | 62 | 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 @@ | |||
1 | @import './config.scss'; | 1 | @import './config.scss'; |
2 | // @import './node_modules/mdi/scss/materialdesignicons.scss'; | ||
3 | 2 | ||
4 | @font-face { | 3 | @font-face { |
5 | font-family: 'Open Sans'; | 4 | font-family: 'Open Sans'; |
6 | src: url('../assets/fonts/OpenSans-Light.ttf'); | 5 | src: url('../assets/fonts/OpenSans-Light.ttf'); |
7 | font-weight: 300; | 6 | font-weight: 300; |
8 | font-style: normal; | 7 | font-style: normal; |
9 | } | 8 | } |
10 | 9 | ||
11 | @font-face { | 10 | @font-face { |
12 | font-family: 'Open Sans'; | 11 | font-family: 'Open Sans'; |
13 | src: url('../assets/fonts/OpenSans-Regular.ttf'); | 12 | src: url('../assets/fonts/OpenSans-Regular.ttf'); |
14 | font-weight: normal; | 13 | font-weight: normal; |
15 | font-style: normal; | 14 | font-style: normal; |
16 | } | 15 | } |
17 | 16 | ||
18 | @font-face { | 17 | @font-face { |
19 | font-family: 'Open Sans'; | 18 | font-family: 'Open Sans'; |
20 | src: url('../assets/fonts/OpenSans-Bold.ttf'); | 19 | src: url('../assets/fonts/OpenSans-Bold.ttf'); |
21 | font-weight: bold; | 20 | font-weight: bold; |
22 | font-style: normal; | 21 | font-style: normal; |
23 | } | 22 | } |
24 | 23 | ||
25 | @font-face { | 24 | @font-face { |
26 | font-family: 'Open Sans'; | 25 | font-family: 'Open Sans'; |
27 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); | 26 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); |
28 | font-weight: bold; | 27 | font-weight: bold; |
29 | font-style: italic; | 28 | font-style: italic; |
30 | } | 29 | } |
31 | 30 | ||
32 | @font-face { | 31 | @font-face { |
33 | font-family: 'Open Sans'; | 32 | font-family: 'Open Sans'; |
34 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); | 33 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); |
35 | font-weight: 800; | 34 | font-weight: 800; |
36 | font-style: normal; | 35 | font-style: normal; |
37 | } | 36 | } |
38 | 37 | ||
39 | @font-face { | 38 | @font-face { |
40 | font-family: 'Open Sans'; | 39 | font-family: 'Open Sans'; |
41 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); | 40 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); |
42 | font-weight: 800; | 41 | font-weight: 800; |
43 | font-style: italic; | 42 | font-style: italic; |
44 | } | 43 | } |
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 @@ | |||
1 | $mdi-font-path: '../node_modules/mdi/fonts'; | 1 | $mdi-font-path: '../node_modules/@mdi/font/fonts'; |
2 | @if $env == development { | 2 | @if $env == development { |
3 | $mdi-font-path: '../../node_modules/mdi/fonts'; | 3 | $mdi-font-path: '../../node_modules/@mdi/font/fonts'; |
4 | } | 4 | } |
5 | 5 | ||
6 | @import './node_modules/mdi/scss/materialdesignicons.scss'; | 6 | @import './node_modules/@mdi/font/scss/materialdesignicons.scss'; |
7 | @import './node_modules/electron-react-titlebar/assets/style'; | 7 | @import './node_modules/electron-react-titlebar/assets/style'; |
8 | 8 | ||
9 | // modules | 9 | // modules |