Merge branch 'develop-patch' into develop-minor

Author: distantnative

panel/eslint.config.mjs panel/eslint.config.jspanel/eslint.config.mjs renamed to panel/eslint.config.js

@@ -1,6 +1,7 @@
 {
 	"name": "kirby",
 	"private": true,
+	"type": "module",
 	"scripts": {
 		"build": "vite build",
 		"build:docs": "node scripts/docs.mjs",

panel/package.json

@@ -1,6 +1,6 @@
 /* eslint-env node */
 import fs from "fs";
-import generateDocs from "./docs.mjs";
+import generateDocs from "./docs";
 
 /**
  * Runs callback on any kind of console exit

panel/scripts/docs.mjs panel/scripts/docs.jspanel/scripts/docs.mjs renamed to panel/scripts/docs.js

@@ -5,7 +5,7 @@ import { defineConfig, loadEnv } from "vite";
 import { minify } from "terser";
 import vue from "@vitejs/plugin-vue2";
 import { viteStaticCopy } from "vite-plugin-static-copy";
-import kirby from "./scripts/vite-kirby.mjs";
+import kirby from "./scripts/vite-kirby";
 import postcssLightDarkFunction from "@csstools/postcss-light-dark-function";
 
 /**
@@ -28,7 +28,7 @@ function createAliases(proxy) {
 /**
  * Returns the server configuration
  */
-function createServer(proxy) {
+async function createServer(proxy) {
 	return {
 		allowedHosts: [proxy.target.substring(8)],
 		cors: { origin: proxy.target },
@@ -39,16 +39,17 @@ function createServer(proxy) {
 		},
 		open: proxy.target + "/panel",
 		port: 3000,
-		...createCustomServer()
+		...(await createCustomServer())
 	};
 }
 
 /**
  * Returns custom server configuration, if it exists
  */
-function createCustomServer() {
+async function createCustomServer() {
 	try {
-		return require("./vite.config.custom.js");
+		const module = await import("./vite.config.custom.js");
+		return module.default ?? {};
 	} catch {
 		return {};
 	}
@@ -114,7 +115,7 @@ function createTest() {
 /**
  * Returns the Vite configuration
  */
-export default defineConfig(({ mode }) => {
+export default defineConfig(async ({ mode }) => {
 	// Load env file based on `mode` in the current working directory.
 	// Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
 	process.env = {
@@ -168,7 +169,7 @@ export default defineConfig(({ mode }) => {
 		resolve: {
 			alias: createAliases(proxy)
 		},
-		server: createServer(proxy),
+		server: await createServer(proxy),
 		test: createTest()
 	};
 });