From a9561a55b4d1c137f5c2101d7d5113fff3ab3ac7 Mon Sep 17 00:00:00 2001 From: Mathias Schopmans Date: Tue, 5 Mar 2024 09:50:27 +0100 Subject: [PATCH] feat: set basePath via config --- data/config.json | 1 + next.config.js | 15 +++++++++++++++ next.config.mjs | 9 --------- scripts/buildData.ts | 2 +- src/lib/utils.ts | 2 +- 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 next.config.js delete mode 100644 next.config.mjs diff --git a/data/config.json b/data/config.json index a48b065..95879a9 100644 --- a/data/config.json +++ b/data/config.json @@ -1,4 +1,5 @@ { + "basePath": "/techradar", "colors": { "foreground": "#fff", "background": "#173d7a", diff --git a/next.config.js b/next.config.js new file mode 100644 index 0000000..ae7eeab --- /dev/null +++ b/next.config.js @@ -0,0 +1,15 @@ +// @ts-check + +const config = require("./data/config.json"); +const basePath = + config.basePath && config.basePath !== "/" ? config.basePath : ""; + +/** @type {import("next").NextConfig} */ +const nextConfig = { + basePath, + output: "export", + trailingSlash: true, + reactStrictMode: true, +}; + +module.exports = nextConfig; diff --git a/next.config.mjs b/next.config.mjs deleted file mode 100644 index e298756..0000000 --- a/next.config.mjs +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import("next").NextConfig} */ -const nextConfig = { - output: "export", - // basePath: "/techradar", - trailingSlash: true, - reactStrictMode: true, -}; - -export default nextConfig; diff --git a/scripts/buildData.ts b/scripts/buildData.ts index 8b2829e..2910c6f 100644 --- a/scripts/buildData.ts +++ b/scripts/buildData.ts @@ -6,7 +6,7 @@ import { markedHighlight } from "marked-highlight"; import path from "path"; import config from "../data/config.json"; -import nextConfig from "../next.config.mjs"; +import nextConfig from "../next.config.js"; import Positioner from "./positioner"; import { Flag, Item } from "@/lib/types"; diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 4c97153..d969818 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,6 +1,6 @@ import { type ClassValue, clsx } from "clsx"; -import config from "../../next.config.mjs"; +import config from "../../next.config.js"; export function cn(...inputs: ClassValue[]) { return clsx(inputs);