kirbyup 3.1.1 → 3.1.2

package/README.md

@@ -190,7 +190,7 @@ export default defineConfig({
   alias: {
     '#plugin/': `${resolve(currentDir, 'src/plugin')}/`
   },
-  extendViteConfig: {
+  vite: {
     define: {
       __PLAYGROUND__: JSON.stringify(process.env.PLAYGROUND)
     }
@@ -202,7 +202,7 @@ export default defineConfig({
 
 When aliasing to file system paths, always use absolute paths. Relative alias values will be used as-is and will not be resolved into file system paths.
 
-#### `extendViteConfig`
+#### `vite`
 
 You can build upon the defaults kirbup uses and extend the Vite configuration with custom plugins etc.
 
@@ -247,7 +247,6 @@ Disables the default behavior of watching all PHP files for changes.
 ## Credits
 
 - [Vite](https://vitejs.dev) by Evan You and all of its contributors.
-- [EGOIST](https://github.com/egoist) for his inspirational work on [tsup](https://github.com/egoist/tsup).
 
 ## License
 

package/dist/client/config.d.mts

@@ -1,4 +1,4 @@
-import { U as UserConfig } from '../shared/kirbyup.cf02d174.mjs';
+import { U as UserConfig } from '../shared/kirbyup.1d99eeee.mjs';
 import 'vite';
 
 declare function defineConfig(config: UserConfig): UserConfig;

package/dist/client/config.d.ts

@@ -1,4 +1,4 @@
-import { U as UserConfig } from '../shared/kirbyup.cf02d174.js';
+import { U as UserConfig } from '../shared/kirbyup.1d99eeee.js';
 import 'vite';
 
 declare function defineConfig(config: UserConfig): UserConfig;

package/dist/node/cli.mjs

@@ -1,5 +1,5 @@
 import { cac } from 'cac';
-import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.90533c57.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.5312ccaa.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';

package/dist/node/index.d.mts

@@ -1,5 +1,5 @@
 import * as vite from 'vite';
-import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.cf02d174.mjs';
+import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.1d99eeee.mjs';
 
 declare function build(options: BuildOptions): Promise<void>;
 declare function serve(options: ServeOptions): Promise<vite.ViteDevServer>;

package/dist/node/index.d.ts

@@ -1,5 +1,5 @@
 import * as vite from 'vite';
-import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.cf02d174.js';
+import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.1d99eeee.js';
 
 declare function build(options: BuildOptions): Promise<void>;
 declare function serve(options: ServeOptions): Promise<vite.ViteDevServer>;

package/dist/node/index.mjs

@@ -13,7 +13,7 @@ import 'rollup-plugin-external-globals';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
-export { b as build, s as serve } from '../shared/kirbyup.90533c57.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.5312ccaa.mjs';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';

package/dist/shared/{kirbyup.cf02d174.d.mts → kirbyup.1d99eeee.d.mts}

@@ -14,11 +14,6 @@ interface BuildOptions extends BaseOptions {
     watch: boolean | string | string[];
 }
 interface UserConfig {
-    /**
-     * Load from config files
-     * Set to `false` to disable
-     */
-    configFile?: string | false;
     /**
      * Specifies an `Object`, or an `Array` of `Object`,
      * which defines aliases used to replace values in `import` statements.
@@ -28,7 +23,19 @@ interface UserConfig {
     alias?: AliasOptions;
     /**
      * Extends Vite's configuration. Will be merged with kirbyup's
-     * default configuration. Be careful what to extend.
+     * default configuration. For example, you can define global constant replacements.
+     *
+     * @example
+     * export default defineConfig({
+     *   vite: {
+     *    define: {
+     *     __TEST__: JSON.stringify(process.env.TEST === 'true'),
+     *   },
+     * })
+     */
+    vite?: InlineConfig;
+    /**
+     * @deprecated Use `vite` instead.
      */
     extendViteConfig?: InlineConfig;
 }

package/dist/shared/{kirbyup.cf02d174.d.ts → kirbyup.1d99eeee.d.ts}

@@ -14,11 +14,6 @@ interface BuildOptions extends BaseOptions {
     watch: boolean | string | string[];
 }
 interface UserConfig {
-    /**
-     * Load from config files
-     * Set to `false` to disable
-     */
-    configFile?: string | false;
     /**
      * Specifies an `Object`, or an `Array` of `Object`,
      * which defines aliases used to replace values in `import` statements.
@@ -28,7 +23,19 @@ interface UserConfig {
     alias?: AliasOptions;
     /**
      * Extends Vite's configuration. Will be merged with kirbyup's
-     * default configuration. Be careful what to extend.
+     * default configuration. For example, you can define global constant replacements.
+     *
+     * @example
+     * export default defineConfig({
+     *   vite: {
+     *    define: {
+     *     __TEST__: JSON.stringify(process.env.TEST === 'true'),
+     *   },
+     * })
+     */
+    vite?: InlineConfig;
+    /**
+     * @deprecated Use `vite` instead.
      */
     extendViteConfig?: InlineConfig;
 }

package/dist/shared/{kirbyup.90533c57.mjs → kirbyup.5312ccaa.mjs}

@@ -21,7 +21,7 @@ import MagicString from 'magic-string';
 import 'node:module';
 
 const name = "kirbyup";
-const version = "3.1.1";
+const version = "3.1.2";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -330,7 +330,8 @@ let resolvedKirbyupConfig;
 let resolvedPostCssConfig;
 function getViteConfig(command, options) {
   const aliasDir = resolve(options.cwd, dirname(options.entry));
-  const { alias = {}, extendViteConfig = {} } = resolvedKirbyupConfig;
+  const { alias = {}, vite, extendViteConfig } = resolvedKirbyupConfig;
+  const userConfig = vite ?? extendViteConfig ?? {};
   const baseConfig = {
     resolve: {
       alias: {
@@ -363,7 +364,7 @@ function getViteConfig(command, options) {
       // Specify origin so asset URLs include Vite server host
       server: { port, strictPort: true, origin: `http://localhost:${port}` }
     });
-    return mergeConfig(serveConfig, extendViteConfig);
+    return mergeConfig(serveConfig, userConfig);
   }
   const mode = options.watch ? "development" : "production";
   const buildConfig = mergeConfig(baseConfig, {
@@ -386,7 +387,7 @@ function getViteConfig(command, options) {
       }
     }
   });
-  return mergeConfig(buildConfig, extendViteConfig);
+  return mergeConfig(buildConfig, userConfig);
 }
 async function generate(options) {
   const config = getViteConfig("build", options);
@@ -429,15 +430,7 @@ async function build(options) {
   const { cwd } = options;
   const { config, configFile } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
-  try {
-    resolvedPostCssConfig = await postcssrc(void 0, void 0, { stopDir: cwd });
-  } catch (err) {
-    if (!/No PostCSS Config found/.test(err.message))
-      throw err;
-    resolvedPostCssConfig = {
-      plugins: [postcssLogical(), postcssDirPseudoClass()]
-    };
-  }
+  resolvedPostCssConfig = await resolvePostCSSConfig(cwd);
   {
     consola.log(colors.green(`${name} v${version}`));
     consola.start(`Building ${colors.cyan(options.entry)}`);
@@ -491,15 +484,7 @@ async function serve(options) {
   const { cwd } = options;
   const { config } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
-  try {
-    resolvedPostCssConfig = await postcssrc(void 0, void 0, { stopDir: cwd });
-  } catch (err) {
-    if (!/No PostCSS Config found/.test(err.message))
-      throw err;
-    resolvedPostCssConfig = {
-      plugins: [postcssLogical(), postcssDirPseudoClass()]
-    };
-  }
+  resolvedPostCssConfig = await resolvePostCSSConfig(cwd);
   {
     consola.log(colors.green(`${name} v${version}`));
     consola.info("Starting development server...");
@@ -513,5 +498,17 @@ function ensureEntry(options) {
   if (!existsSync(resolve(options.cwd, options.entry)))
     throw new PrettyError(`Cannot find "${options.entry}"`);
 }
+async function resolvePostCSSConfig(cwd) {
+  try {
+    const config = await postcssrc(void 0, void 0, { stopDir: cwd });
+    return config;
+  } catch (error) {
+    if (!error.message.includes("No PostCSS Config found"))
+      throw error;
+    return {
+      plugins: [postcssLogical(), postcssDirPseudoClass()]
+    };
+  }
+}
 
 export { build as b, handleError as h, name as n, serve as s, version as v };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "packageManager": "pnpm@8.15.1",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {