diff --git a/next.config.js b/next.config.mjs
similarity index 58%
rename from next.config.js
rename to next.config.mjs
index bc3bd17..b3c60c9 100644
--- a/next.config.js
+++ b/next.config.mjs
@@ -1,12 +1,13 @@
-/** @type {import('next').NextConfig} */
-const withPWA = require('next-pwa')({
-  dest: 'public',
-})
+import withPWA from 'next-pwa';
 
-module.exports = withPWA({
+const config = {
   env: {
     CERC_TEST_WEBAPP_CONFIG1: process.env.CERC_TEST_WEBAPP_CONFIG1,
     CERC_TEST_WEBAPP_CONFIG2: process.env.CERC_TEST_WEBAPP_CONFIG2,
     CERC_WEBAPP_DEBUG: process.env.CERC_WEBAPP_DEBUG,
-  },
-})
+  }
+};
+
+const nextConfig = withPWA({ dest: 'public' })(config);
+
+export default nextConfig;
diff --git a/package.json b/package.json
index e5fb97a..834a7ab 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,6 @@
   "devDependencies": {
     "@types/node": "17.0.4",
     "@types/react": "17.0.38",
-    "typescript": "4.5.4"
+    "typescript": "^5"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 99710e8..7b28589 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,20 +1,26 @@
 {
   "compilerOptions": {
-    "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
-    "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
 }