Skip to content

Commit 8fc9a5b

Browse files
ruisaraiva19ruisaraiva19
committed
Merge branch 'develop'
2 parents 089cb33 + 6c6d4f6 commit 8fc9a5b

8 files changed

+1402
-961
lines changed

‎.eslintrc.json

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
"extends": [
44
"react-app",
55
"plugin:prettier/recommended",
6-
"prettier/react",
7-
"prettier/@typescript-eslint",
86
"plugin:react/recommended",
97
"plugin:react-hooks/recommended",
108
"plugin:@typescript-eslint/recommended",

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
A small online tool to help you generate your favicon in all the sizes and formats you need.
88

99
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
10-
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
10+
[![All Contributors](https://img.shields.io/badge/all_contributors-3-orange.svg?style=flat-square)](#contributors-)
1111
<!-- ALL-CONTRIBUTORS-BADGE:END -->
1212
![Release](https://github.com/ruisaraiva19/favycon/workflows/Release/badge.svg)
1313
![Lint](https://github.com/ruisaraiva19/favycon/workflows/Lint/badge.svg)
1414
![Commitlint](https://github.com/ruisaraiva19/favycon/workflows/Commitlint/badge.svg)
15-
[![Netlify Status](https://api.netlify.com/api/v1/badges/d2e6694d-1f2c-4b50-ad21-ff5c3fcbc3c4/deploy-status)](https://app.netlify.com/sites/favycon-storybook/deploys)
1615

1716
## Browser favicon formats supported
1817

‎next.config.js

+2-46
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,3 @@
1-
const withPrefresh = require('@prefresh/next')
2-
3-
module.exports = withPrefresh({
4-
experimental: {
5-
modern: true,
6-
polyfillsOptimization: true,
7-
},
8-
9-
webpack(config, { dev, isServer }) {
10-
// Move Preact into the framework chunk instead of duplicating in routes:
11-
const splitChunks = config.optimization && config.optimization.splitChunks
12-
if (splitChunks) {
13-
const { cacheGroups } = splitChunks
14-
const test = /[\\/]node_modules[\\/](preact|preact-render-to-string|preact-context-provider)[\\/]/
15-
if (cacheGroups.framework) {
16-
cacheGroups.preact = { ...cacheGroups.framework, test }
17-
// if you want to merge the 2 small commons+framework chunks:
18-
cacheGroups.commons.name = 'framework'
19-
}
20-
}
21-
22-
if (isServer) {
23-
// mark `preact` stuffs as external for server bundle to prevent duplicate copies of preact
24-
config.externals.push(/^(preact|preact-render-to-string|preact-context-provider)([\\/]|$)/)
25-
}
26-
27-
// Install webpack aliases:
28-
const aliases = config.resolve.alias || (config.resolve.alias = {})
29-
aliases['react'] = 'preact/compat'
30-
aliases['react-dom'] = 'preact/compat'
31-
aliases['react-ssr-prepass'] = 'preact-ssr-prepass'
32-
33-
// inject Preact DevTools
34-
if (dev && !isServer) {
35-
const { entry } = config
36-
config.entry = () =>
37-
entry().then((entries) => {
38-
entries['main.js'] = ['preact/debug'].concat(entries['main.js'] || [])
39-
return entries
40-
})
41-
}
42-
43-
return config
44-
},
45-
1+
module.exports = {
462
poweredByHeader: false,
47-
})
3+
}

‎package.json

+41-46
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,32 @@
4040
},
4141
"dependencies": {
4242
"@fiahfy/ico-convert": "0.0.7",
43-
"@prefresh/next": "1.4.4",
4443
"adm-zip": "0.4.16",
4544
"blurhash": "1.1.3",
46-
"classnames": "2.2.6",
45+
"classnames": "2.3.1",
4746
"multer": "1.4.2",
48-
"next": "10.0.8",
47+
"next": "10.2.3",
4948
"nprogress": "0.2.0",
5049
"object-fit-images": "3.2.4",
51-
"preact": "10.5.12",
52-
"preact-render-to-string": "5.1.12",
53-
"preact-ssr-prepass": "1.1.3",
54-
"prismjs": "1.23.0",
50+
"prismjs": "1.24.1",
5551
"prop-types": "15.7.2",
5652
"react": "16.14.0",
5753
"react-blurhash": "0.1.3",
5854
"react-clipboard.js": "2.0.16",
5955
"react-dom": "16.14.0",
60-
"react-dropzone": "11.2.4",
56+
"react-dropzone": "11.3.4",
6157
"react-lazy-images": "1.1.0",
62-
"react-modal": "3.11.2",
63-
"react-transition-group": "4.4.1",
58+
"react-modal": "3.14.3",
59+
"react-transition-group": "4.4.2",
6460
"react-use-gesture": "7.0.16",
6561
"sharp": "0.25.0",
6662
"use-dark-mode": "2.3.1",
6763
"use-media": "1.4.0"
6864
},
6965
"devDependencies": {
70-
"@babel/core": "7.12.13",
71-
"@commitlint/cli": "12.0.1",
72-
"@commitlint/config-conventional": "12.0.1",
66+
"@babel/core": "7.14.6",
67+
"@commitlint/cli": "12.1.4",
68+
"@commitlint/config-conventional": "12.1.4",
7369
"@storybook/addon-actions": "5.3.21",
7470
"@storybook/addon-backgrounds": "5.3.21",
7571
"@storybook/addon-console": "1.2.2",
@@ -81,60 +77,59 @@
8177
"@storybook/react": "5.3.21",
8278
"@storybook/source-loader": "5.3.21",
8379
"@types/adm-zip": "0.4.33",
84-
"@types/classnames": "2.2.11",
85-
"@types/multer": "1.4.4",
80+
"@types/multer": "1.4.7",
8681
"@types/node": "14.14.34",
8782
"@types/nprogress": "0.2.0",
88-
"@types/object-fit-images": "3.2.0",
89-
"@types/prismjs": "1.16.2",
90-
"@types/react": "17.0.1",
91-
"@types/react-modal": "3.10.6",
92-
"@types/react-transition-group": "4.4.0",
83+
"@types/object-fit-images": "3.2.2",
84+
"@types/prismjs": "1.16.6",
85+
"@types/react": "17.0.14",
86+
"@types/react-modal": "3.12.1",
87+
"@types/react-transition-group": "4.4.2",
9388
"@types/sharp": "0.25.1",
94-
"@typescript-eslint/eslint-plugin": "4.14.2",
95-
"@typescript-eslint/parser": "4.14.2",
96-
"all-contributors-cli": "6.19.0",
89+
"@typescript-eslint/eslint-plugin": "4.28.3",
90+
"@typescript-eslint/parser": "4.28.3",
91+
"all-contributors-cli": "6.20.0",
9792
"babel-eslint": "10.1.0",
9893
"babel-loader": "8.2.2",
99-
"babel-plugin-prismjs": "2.0.1",
94+
"babel-plugin-prismjs": "2.1.0",
10095
"babel-preset-react-app": "10.0.0",
101-
"commitizen": "4.2.3",
96+
"commitizen": "4.2.4",
10297
"cypress": "5.6.0",
10398
"cypress-file-upload": "4.1.1",
10499
"cz-conventional-changelog": "3.3.0",
105-
"dotenv": "8.2.0",
106-
"eslint": "7.19.0",
107-
"eslint-config-prettier": "7.2.0",
100+
"dotenv": "10.0.0",
101+
"eslint": "7.30.0",
102+
"eslint-config-prettier": "8.3.0",
108103
"eslint-config-react": "1.1.7",
109104
"eslint-config-react-app": "6.0.0",
110-
"eslint-plugin-cypress": "2.11.2",
111-
"eslint-plugin-flowtype": "5.2.0",
112-
"eslint-plugin-import": "2.22.1",
105+
"eslint-plugin-cypress": "2.11.3",
106+
"eslint-plugin-flowtype": "5.8.0",
107+
"eslint-plugin-import": "2.23.4",
113108
"eslint-plugin-jsx-a11y": "6.4.1",
114-
"eslint-plugin-prettier": "3.3.1",
115-
"eslint-plugin-react": "7.22.0",
109+
"eslint-plugin-prettier": "3.4.0",
110+
"eslint-plugin-react": "7.24.0",
116111
"eslint-plugin-react-hooks": "4.2.0",
117112
"husky": "4.3.8",
118-
"lint-staged": "10.5.4",
113+
"lint-staged": "11.0.0",
119114
"npm-run-all": "4.1.5",
120115
"postcss-100vh-fix": "1.0.2",
121116
"postcss-flexbugs-fixes": "5.0.2",
122117
"postcss-preset-env": "6.7.0",
123-
"prettier": "2.2.1",
124-
"react-refresh": "0.9.0",
118+
"prettier": "2.3.2",
119+
"react-refresh": "0.10.0",
125120
"regenerator-runtime": "0.13.7",
126-
"sass": "1.32.6",
127-
"sass-loader": "10.1.1",
128-
"semantic-release": "17.3.7",
129-
"start-server-and-test": "1.12.0",
130-
"stylelint": "13.9.0",
121+
"sass": "1.35.2",
122+
"sass-loader": "12.1.0",
123+
"semantic-release": "17.4.4",
124+
"start-server-and-test": "1.12.6",
125+
"stylelint": "13.13.1",
131126
"stylelint-config-css-modules": "2.2.0",
132127
"stylelint-config-prettier": "8.0.2",
133-
"stylelint-config-recess-order": "2.3.0",
134-
"stylelint-config-standard": "20.0.0",
135-
"stylelint-prettier": "1.1.2",
136-
"stylelint-scss": "3.18.0",
137-
"typescript": "3.9.7",
128+
"stylelint-config-recess-order": "2.4.0",
129+
"stylelint-config-standard": "22.0.0",
130+
"stylelint-prettier": "1.2.0",
131+
"stylelint-scss": "3.19.0",
132+
"typescript": "4.3.5",
138133
"webpack-notifier": "1.13.0"
139134
},
140135
"config": {

‎pages/_document.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class MyDocument extends Document {
2020
}}
2121
/>
2222
)}
23+
<link rel="preconnect" href="https://fonts.googleapis.com" />
24+
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
2325
</Head>
2426
<body className="preload">
2527
<script src="/js/noflash.js" />

‎styles/font.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
font-style: normal;
44
font-weight: 400;
55
font-display: swap;
6-
src: url(https://fonts.gstatic.com/s/manrope/v1/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
6+
src: url(https://fonts.gstatic.com/s/manrope/v4/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
77
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
88
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
99
}
@@ -13,7 +13,7 @@
1313
font-style: normal;
1414
font-weight: 500;
1515
font-display: swap;
16-
src: url(https://fonts.gstatic.com/s/manrope/v1/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
16+
src: url(https://fonts.gstatic.com/s/manrope/v4/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
1717
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
1818
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
1919
}
@@ -23,7 +23,7 @@
2323
font-style: normal;
2424
font-weight: 600;
2525
font-display: swap;
26-
src: url(https://fonts.gstatic.com/s/manrope/v1/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
26+
src: url(https://fonts.gstatic.com/s/manrope/v4/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
2727
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
2828
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
2929
}
@@ -33,7 +33,7 @@
3333
font-style: normal;
3434
font-weight: 700;
3535
font-display: swap;
36-
src: url(https://fonts.gstatic.com/s/manrope/v1/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
36+
src: url(https://fonts.gstatic.com/s/manrope/v4/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
3737
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
3838
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
3939
}
@@ -43,7 +43,7 @@
4343
font-style: normal;
4444
font-weight: 800;
4545
font-display: swap;
46-
src: url(https://fonts.gstatic.com/s/manrope/v1/xn7_YHE41ni1AdIRqAuZuw1Bx9mbZk59E9_C-b_Tfc7AGrY.woff) format('woff');
46+
src: url(https://fonts.gstatic.com/s/manrope/v4/xn7gYHE41ni1AdIRggexSvfedN4.woff2) format('woff2');
4747
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
4848
U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
4949
}

‎styles/main.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ html,
88
body {
99
padding: 0;
1010
margin: 0;
11-
font-family: Manrope, Arial, Helvetica Neue, Helvetica, sans-serif;
1211

1312
/* Disables pull-to-refresh but allows overscroll glow effects. */
1413
overscroll-behavior-y: contain;
14+
font-family: Manrope, Arial, Helvetica Neue, Helvetica, sans-serif;
1515

1616
/* https://gist.github.com/hsleonis/55712b0eafc9b25f1944 */
1717
font-size: 100%;
18-
text-shadow: rgba($black, 0.01) 0 0 1px;
1918
font-variant-ligatures: none;
19+
text-shadow: rgba($black, 0.01) 0 0 1px;
20+
transition: background 0.2s ease;
2021
text-rendering: optimizeLegibility;
2122
-moz-osx-font-smoothing: grayscale;
2223
-webkit-font-smoothing: antialiased;
23-
transition: background 0.2s ease;
2424

2525
&.light-mode {
2626
background: $off-white;

0 commit comments

Comments
 (0)