Revert "Use typescript for nextjs config"

This reverts commit 19b47ed.
audioverse-org · Dec 26, 2024 · 7a90abe · 7a90abe
1 parent 19b47ed
commit 7a90abe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 273 deletions.
diff --git a/next.config.ts → next.config.js b/next.config.ts → next.config.js
@@ -1,29 +1,18 @@
-import { NextConfig } from 'next';
-import nextPwa, { PWAConfig } from 'next-pwa';
-import path from 'path';
-
-const withPWA = nextPwa({
+const withPWA = require('next-pwa')({
 	dest: 'public',
 	// WORKAROUND: https://github.com/shadowwalker/next-pwa/issues/288#issuecomment-955777098
 	buildExcludes: [/server\/middleware-manifest\.json$/],
 });
+const path = require('path');
 
-type WithBundleAnalyzer = (config: PWAConfig) => NextConfig & PWAConfig;
-
-const getBundleAnalyzer = async (): Promise<WithBundleAnalyzer> => {
-	if (process.env.ANALYZE === 'true') {
-		const { default: withBundleAnalyzer } = await import(
-			'@next/bundle-analyzer'
-		);
-		return withBundleAnalyzer() as unknown as WithBundleAnalyzer;
-	}
-	return (config) => config;
-};
-const withBundleAnalyzer = await getBundleAnalyzer();
+const withBundleAnalyzer =
+	process.env.ANALYZE === 'true'
+		? require('@next/bundle-analyzer')()
+		: (x) => x;
 
-const config: NextConfig = withBundleAnalyzer(
+module.exports = withBundleAnalyzer(
 	withPWA({
-		async headers() {
+		headers() {
 			return [
 				{
 					source: '/apple-app-site-association',
@@ -46,7 +35,7 @@ const config: NextConfig = withBundleAnalyzer(
 			];
 		},
 		async redirects() {
-			const languagePrefixMap: Record<string, string> = {
+			const languagePrefixMap = {
 				english: 'en',
 				deutsch: 'de',
 				german: 'de',
@@ -63,7 +52,7 @@ const config: NextConfig = withBundleAnalyzer(
 					permanent: true,
 				})),
 				...Object.keys(languagePrefixMap).map((prefix) => ({
-					source: `/${prefix}/:path((?!podcasts/latest|sermons/podcasts/latest|sermones/podcasts/ultima|predications/podcasts/plusrecent).*)`,
+					source: `/${prefix}/:path((?!podcasts\/latest|sermons\/podcasts\/latest|sermones\/podcasts\/ultima|predications\/podcasts\/plusrecent).*)`,
 					destination: `/${languagePrefixMap[prefix]}/:path*`,
 					statusCode: 301,
 				})),
@@ -642,7 +631,7 @@ const config: NextConfig = withBundleAnalyzer(
 				},
 			];
 		},
-		webpack: (config, { dev }) => {
+		webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
 			config.module.rules.push({
 				test: /\.(graphql|gql)$/,
 				exclude: /node_modules/,
@@ -675,5 +664,3 @@ const config: NextConfig = withBundleAnalyzer(
 		},
 	}),
 );
-
-export default config;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,7 +101,6 @@
         "@types/jest-when": "^3.5.5",
         "@types/js-cookie": "^3.0.6",
         "@types/lodash": "^4.17.7",
-        "@types/next-pwa": "^5.6.9",
         "@types/node": "^22.10.2",
         "@types/node-forge": "^1.3.11",
         "@types/react": "^18.3.8",
@@ -167,4 +166,4 @@
     "engines": {
         "node": "20.17.0"
     }
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,12 +1,12 @@
 {
 	"compilerOptions": {
-		"module": "esnext",
+		"module": "commonjs",
 		"declaration": true,
 		"removeComments": true,
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"allowSyntheticDefaultImports": true,
-		"target": "esnext",
+		"target": "es6",
 		"lib": ["es2017", "es2019", "dom"],
 		"sourceMap": true,
 		"outDir": "./dist",