Update ESLint configuration, enhance PWA settings, and refactor global styles

mCodex · mCodex · commit a35a22391cdc · 2024-10-24T10:59:58.000-03:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -77,7 +77,7 @@ export default [
       'import/no-duplicates': 'off',
       'no-use-before-define': 'off',
       '@typescript-eslint/no-use-before-define': ['error'],
-
+      '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/explicit-function-return-type': [
         'error',
         {
diff --git a/next.config.js b/next.config.js
@@ -10,6 +10,9 @@ module.exports = withPWA({
   },
   pwa: {
     dest: 'public',
+    disable: process.env.NODE_ENV === 'development',
+    register: true,
+    skipWaiting: true,
   },
   basePath: '/react-timestamper',
 });
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -2,15 +2,12 @@ import Head from 'next/head';
 import { AppProps } from 'next/app';
 import Router from 'next/router';
 import { DefaultSeo } from 'next-seo';
-import {Lato} from 'next/font/google';
 import SEO from '../next-seo.config';
 
 import GloalStyle from '../src/styles/global';
 
 import { pageview } from '../src/services/ga';
 
-const lato =  Lato({ weight: ['400', '700'], subsets: ['latin'] });
-
 Router.events.on(
   'routeChangeComplete',
   (url) => process.env.NODE_ENV === 'production' && pageview(url),
@@ -86,13 +83,6 @@ const MyApp: React.FC<AppProps> = ({ Component, pageProps }) => (
       />
 
       <meta name="apple-mobile-web-app-capable" content="yes" />
-
-      <style jsx global>{`
-        * {
-          font-family: ${lato.style.fontFamily};
-        }
-      `}</style>
-
     </Head>
     <DefaultSeo {...SEO} />
     <Component {...pageProps} />
diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -1,10 +1,20 @@
-import Document, { Html, Head, Main, NextScript, DocumentContext } from 'next/document';
+import Document, {
+  Html,
+  Head,
+  Main,
+  NextScript,
+  DocumentContext,
+} from 'next/document';
 
-import { GA_TRACKING_ID } from '../src/services/ga';
 import { ServerStyleSheet } from 'styled-components';
+import { GA_TRACKING_ID } from '../src/services/ga';
 
 export default class MyDocument extends Document {
-  static async getInitialProps(ctx: DocumentContext) {
+  static async getInitialProps(ctx: DocumentContext): Promise<{
+    styles: JSX.Element;
+    html: string;
+    head?: JSX.Element[];
+  }> {
     const sheet = new ServerStyleSheet();
     const originalRenderPage = ctx.renderPage;
     try {
@@ -14,8 +24,14 @@ export default class MyDocument extends Document {
             sheet.collectStyles(<App {...props} />),
         });
       const initialProps = await Document.getInitialProps(ctx);
+
+      const head = initialProps.head?.filter(
+        (element) => element !== null,
+      ) as JSX.Element[];
+
       return {
         ...initialProps,
+        head,
         styles: (
           <>
             {initialProps.styles}
@@ -27,7 +43,7 @@ export default class MyDocument extends Document {
       sheet.seal();
     }
   }
-  
+
   render(): JSX.Element {
     return (
       <Html lang="en">
diff --git a/src/@types/common.d.ts b/src/@types/common.d.ts
@@ -1,3 +1,7 @@
 declare interface Window {
-  gtag: any;
+  gtag: (
+    command: string,
+    eventName: string,
+    eventParams?: { [key: string]: any },
+  ) => void;
 }
diff --git a/src/styles/global.ts b/src/styles/global.ts
@@ -1,11 +1,15 @@
+import { Lato } from 'next/font/google';
 import { createGlobalStyle } from 'styled-components';
 
+const lato = Lato({ weight: ['400', '700'], subsets: ['latin'] });
+
 export default createGlobalStyle`
   * {
     margin: 0;
     padding: 0;
     outline: 0;
     box-sizing: border-box;
+    font-family: ${lato.style.fontFamily};
   }
 
   html, body, #__next {
@@ -18,16 +22,12 @@ export default createGlobalStyle`
     -webkit-font-smoothing: antialised;
   }
 
-  body, input, button {
-    font: 16px Lato, serif;
-  }
-
   #root {
     margin: 0 auto;
   }
 
   h1, h2, h3, h4, h5, h6, strong {
-    font-weight: 500;
+    font-weight: 700;
   }
 
   button {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ export default [`
`77`	`77`	`'import/no-duplicates': 'off',`
`78`	`78`	`'no-use-before-define': 'off',`
`79`	`79`	`'@typescript-eslint/no-use-before-define': ['error'],`
`80`		`-`
	`80`	`+ '@typescript-eslint/no-explicit-any': 'off',`
`81`	`81`	`'@typescript-eslint/explicit-function-return-type': [`
`82`	`82`	`'error',`
`83`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
`1`	`1`	`declare interface Window {`
`2`		`- gtag: any;`
	`2`	`+ gtag: (`
	`3`	`+ command: string,`
	`4`	`+ eventName: string,`
	`5`	`+ eventParams?: { [key: string]: any },`
	`6`	`+ ) => void;`
`3`	`7`	`}`