kirbyup 3.1.1 → 3.1.3

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.bcda4592.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.bcda4592.js';
 import 'vite';
 
 declare function defineConfig(config: UserConfig): UserConfig;

package/dist/client/plugin.d.mts

@@ -1,7 +1,7 @@
 declare const kirbyup: Readonly<{
     /**
-     * Auto-import Kirby Panel components, will be transformed by
-     * kirbyup's auto import plugin for Vite
+     * Auto-import Kirby Panel components, transformed by
+     * kirbyup's glob-import plugin for Vite.
      *
      * @example
      * kirbyup.import('./components/blocks/*.vue')

package/dist/client/plugin.d.ts

@@ -1,7 +1,7 @@
 declare const kirbyup: Readonly<{
     /**
-     * Auto-import Kirby Panel components, will be transformed by
-     * kirbyup's auto import plugin for Vite
+     * Auto-import Kirby Panel components, transformed by
+     * kirbyup's glob-import plugin for Vite.
      *
      * @example
      * kirbyup.import('./components/blocks/*.vue')

package/dist/client/plugin.mjs

@@ -1,7 +1,7 @@
 const kirbyup = Object.freeze({
   /**
-   * Auto-import Kirby Panel components, will be transformed by
-   * kirbyup's auto import plugin for Vite
+   * Auto-import Kirby Panel components, transformed by
+   * kirbyup's glob-import plugin for Vite.
    *
    * @example
    * kirbyup.import('./components/blocks/*.vue')

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.db20dc98.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
@@ -12,13 +12,13 @@ import '@vitejs/plugin-vue2';
 import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
 import 'rollup-plugin-external-globals';
-import 'postcss-load-config';
-import 'postcss-logical';
-import 'postcss-dir-pseudo-class';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
 import 'c12';
+import 'postcss-load-config';
+import 'postcss-logical';
+import 'postcss-dir-pseudo-class';
 import 'magic-string';
 import 'node:module';
 

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.bcda4592.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.bcda4592.js';
 
 declare function build(options: BuildOptions): Promise<void>;
 declare function serve(options: ServeOptions): Promise<vite.ViteDevServer>;

package/dist/node/index.mjs

@@ -10,13 +10,13 @@ import '@vitejs/plugin-vue2';
 import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
 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.db20dc98.mjs';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
 import 'c12';
+import 'postcss-load-config';
+import 'postcss-logical';
+import 'postcss-dir-pseudo-class';
 import 'magic-string';
 import 'node:module';

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

@@ -15,20 +15,27 @@ interface BuildOptions extends BaseOptions {
 }
 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.
+     * Specifies an object or an array of objects, which defines aliases
+     * used to replace values in `import` statements.
      * With either format, the order of the entries is important,
      * in that the first defined rules are applied first.
      */
     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.bcda4592.d.ts}

@@ -15,20 +15,27 @@ interface BuildOptions extends BaseOptions {
 }
 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.
+     * Specifies an object or an array of objects, which defines aliases
+     * used to replace values in `import` statements.
      * With either format, the order of the entries is important,
      * in that the first defined rules are applied first.
      */
     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.db20dc98.mjs}

@@ -10,18 +10,18 @@ import vuePlugin from '@vitejs/plugin-vue2';
 import vueJsxPlugin from '@vitejs/plugin-vue2-jsx';
 import fullReloadPlugin from 'vite-plugin-full-reload';
 import externalGlobals from 'rollup-plugin-external-globals';
-import postcssrc from 'postcss-load-config';
-import postcssLogical from 'postcss-logical';
-import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import { gzip } from 'node:zlib';
 import { promisify } from 'node:util';
 import { Buffer } from 'node:buffer';
 import { loadConfig as loadConfig$1 } from 'c12';
+import postcssrc from 'postcss-load-config';
+import postcssLogical from 'postcss-logical';
+import postcssDirPseudoClass from 'postcss-dir-pseudo-class';
 import MagicString from 'magic-string';
 import 'node:module';
 
 const name = "kirbyup";
-const version = "3.1.1";
+const version = "3.1.3";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -70,6 +70,18 @@ function loadConfig(cwd = process.cwd()) {
     }
   });
 }
+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()]
+    };
+  }
+}
 
 const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
 const singlelineCommentsRE = /\/\/.*/g;
@@ -137,10 +149,10 @@ function $_applyKirbyModifications(activeDef, newDef) {
 /** -- */
 `;
 
-function kirbyupAutoImportPlugin() {
+function kirbyupGlobImportPlugin() {
   let config;
   return {
-    name: "kirbyup:auto-import",
+    name: "kirbyup:glob-import",
     configResolved(resolvedConfig) {
       config = resolvedConfig;
     },
@@ -260,19 +272,19 @@ async function detectPackageManager(cwd, options = {}) {
 function kirbyupHmrPlugin(options) {
   let config;
   let entry;
-  let indexMjs;
+  let devIndexPath;
   return {
     name: "kirbyup:hmr",
     apply: "serve",
     configResolved(resolvedConfig) {
       config = resolvedConfig;
       entry = resolve(config.root, options.entry);
-      indexMjs = resolve(config.root, options.outDir || "", "index.dev.mjs");
+      devIndexPath = resolve(config.root, options.outDir || "", "index.dev.mjs");
     },
     transform(code, id) {
       if (isHmrRuntimeId(id)) {
         return code.replace(
-          // https://github.com/vitejs/vite-plugin-vue2/blob/06ede94/src/utils/hmrRuntime.ts#L173
+          // https://github.com/vitejs/vite-plugin-vue2/blob/8de73ea6b8a1df4c14308da2885db195dacc2b14/src/utils/hmrRuntime.ts#L173
           /^.*=\s*record\.Ctor\.super\.extend\(options\)/m,
           "$_applyKirbyModifications(record.Ctor.options, options) // injected by kirbyup\n$&"
         ) + __INJECTED_HMR_CODE__;
@@ -288,12 +300,12 @@ function kirbyupHmrPlugin(options) {
         const baseUrl = `http://${hostname}:${port}${config.base}`;
         const entryUrl = new URL(entryPath, baseUrl).href;
         const pm = await detectPackageManager(config.root);
-        await writeFile(indexMjs, getViteProxyModule(entryUrl, pm));
+        await writeFile(devIndexPath, getViteProxyModule(entryUrl, pm));
       });
     },
     closeBundle() {
-      if (existsSync(indexMjs))
-        unlinkSync(indexMjs);
+      if (existsSync(devIndexPath))
+        unlinkSync(devIndexPath);
     }
   };
 }
@@ -307,21 +319,22 @@ try {
     "[kirbyup] Couldn't connect to the development server. Run \`${pm} run serve\` to start Vite or build the plugin with \`${pm} run build\` so Kirby uses the production version."
   );
   throw err;
-}`.trim();
+}
+`.trimStart();
 }
 
 function kirbyupBuildCleanupPlugin(options) {
   let config;
-  let indexMjs;
+  let devIndexPath;
   return {
     name: "kirbyup:build-cleanup",
     configResolved(resolvedConfig) {
       config = resolvedConfig;
-      indexMjs = resolve(config.root, options.outDir, "index.dev.mjs");
+      devIndexPath = resolve(config.root, options.outDir, "index.dev.mjs");
     },
     writeBundle() {
-      if (existsSync(indexMjs))
-        unlinkSync(indexMjs);
+      if (existsSync(devIndexPath))
+        unlinkSync(devIndexPath);
     }
   };
 }
@@ -330,7 +343,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: {
@@ -344,7 +358,7 @@ function getViteConfig(command, options) {
       // looks in the current directory and breaks `npx kirbyup`
       vuePlugin({ compiler: vueCompilerSfc }),
       vueJsxPlugin(),
-      kirbyupAutoImportPlugin(),
+      kirbyupGlobImportPlugin(),
       { ...externalGlobals({ vue: "Vue" }), enforce: "post" }
     ],
     css: { postcss: resolvedPostCssConfig },
@@ -357,13 +371,13 @@ function getViteConfig(command, options) {
       plugins: [
         kirbyupHmrPlugin(options),
         watch && fullReloadPlugin(watch)
-      ],
-      // Input needs to be specified so dep pre-bundling works
+      ].filter(Boolean),
+      // Input needs to be specified so dependency pre-bundling works
       build: { rollupOptions: { input: resolve(options.cwd, options.entry) } },
       // 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 +400,7 @@ function getViteConfig(command, options) {
       }
     }
   });
-  return mergeConfig(buildConfig, extendViteConfig);
+  return mergeConfig(buildConfig, userConfig);
 }
 async function generate(options) {
   const config = getViteConfig("build", options);
@@ -429,15 +443,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)}`);
@@ -453,7 +459,7 @@ async function build(options) {
     const { watch } = await import('chokidar');
     const ignored = [
       "**/{.git,node_modules}/**",
-      // Always ignore out files
+      // Always ignore dist files
       "index.{css,js}"
     ];
     const watchPaths = typeof options.watch === "boolean" ? dirname(options.entry) : Array.isArray(options.watch) ? options.watch.filter(
@@ -471,7 +477,8 @@ async function build(options) {
     if (configFile)
       watcher.add(configFile);
     watcher.on("all", async (type, file) => {
-      if (configFile === file) {
+      const absolutePath = resolve(cwd, file);
+      if (configFile === absolutePath) {
         resolvedKirbyupConfig = (await loadConfig(cwd)).config ?? {};
         consola.info(
           `${colors.cyan(basename(file))} changed, setting new config`
@@ -491,15 +498,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...");

package/package.json

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