@kopflos-cms/vite 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @kopflos-cms/vite
 
+## 0.3.2
+
+### Patch Changes
+
+- fc0e9fb: feat: support per-build config provided by plugins
+
+## 0.3.1
+
+### Patch Changes
+
+- 5ca6fa4: Resolve `configPath` against the kopflos' base path
+
 ## 0.3.0
 
 ### Minor Changes

package/index.d.ts

@@ -6,6 +6,7 @@ export interface BuildConfiguration {
     root: string;
     entrypoints: string[];
     outDir?: string;
+    config?: InlineConfig;
 }
 declare module '@kopflos-cms/core' {
     interface Plugins {

package/index.js

@@ -29,11 +29,11 @@ export class VitePlugin {
         const root = resolve(env.kopflos.basePath, options.root);
         const outDir = this.resolveOutDir(env, options);
         return prepareConfig({
-            ...options,
+            entrypoints: options.entrypoints,
+            appRoot: env.kopflos.basePath,
             root,
             outDir,
-            config: vitePlugin.config,
-            configPath: vitePlugin.configPath,
+            config: vitePlugin.config || vitePlugin.configPath,
         });
     }
     resolveOutDir(env, options) {

package/lib/config.d.ts

@@ -1,8 +1,9 @@
 import type { InlineConfig } from 'vite';
 import type { BuildConfiguration } from '../index.js';
 type ConfigOptions = BuildConfiguration & {
-    configPath: string | undefined;
-    config: InlineConfig | undefined;
+    appRoot: string;
+    config?: InlineConfig | string;
+    buildConfig?: InlineConfig;
 };
-export declare function prepareConfig({ root, configPath, entrypoints, outDir, config }: ConfigOptions): Promise<Record<string, any>>;
+export declare function prepareConfig({ appRoot, root, entrypoints, outDir, config, buildConfig }: ConfigOptions): Promise<import("vite").UserConfig>;
 export {};

package/lib/config.js

@@ -2,7 +2,7 @@ import { resolve } from 'node:path';
 import { glob } from 'glob';
 import { mergeConfig } from 'vite';
 import defaultConfig from '../vite.config.js';
-export async function prepareConfig({ root, configPath, entrypoints, outDir, config = {} }) {
+export async function prepareConfig({ appRoot, root, entrypoints, outDir, config = {}, buildConfig = {} }) {
     const inputConfig = {
         root,
         build: {
@@ -17,9 +17,13 @@ export async function prepareConfig({ root, configPath, entrypoints, outDir, con
             input: entrypoints.flatMap(entry => glob.sync(resolve(root, entry))),
         };
     }
-    if (configPath) {
-        const userConfig = await import(configPath);
-        return mergeConfig(mergeConfig(defaultConfig, inputConfig), userConfig.default);
+    let userConfig = config;
+    if (typeof config === 'string') {
+        if (config.startsWith('.')) {
+            config = resolve(appRoot, config);
+        }
+        userConfig = (await import(config)).default;
     }
-    return mergeConfig(config, mergeConfig(defaultConfig, inputConfig));
+    return [defaultConfig, inputConfig, config, userConfig, buildConfig]
+        .reduce((merged, next) => mergeConfig(merged, next), {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kopflos-cms/vite",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "main": "index.js",
   "author": "Zazuko GmbH",