kirbyup 3.3.0 → 4.0.0-alpha.2

package/dist/client/config.d.mts

@@ -1,4 +1,4 @@
-import { U as UserConfig } from '../shared/kirbyup.DNMktHWN.mjs';
+import { U as UserConfig } from '../shared/kirbyup.CPpXMJtV.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.DNMktHWN.js';
+import { U as UserConfig } from '../shared/kirbyup.CPpXMJtV.js';
 import 'vite';
 
 declare function defineConfig(config: UserConfig): UserConfig;

package/dist/node/cli.mjs

@@ -1,20 +1,18 @@
 import { cac } from 'cac';
-import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.BtejYnwg.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.ij1WTPTc.mjs';
 import 'node:fs';
 import 'node:fs/promises';
-import '@vitejs/plugin-vue2';
-import '@vitejs/plugin-vue2-jsx';
+import '@vitejs/plugin-vue';
+import '@vitejs/plugin-vue-jsx';
 import 'consola';
 import 'consola/utils';
 import 'pathe';
 import 'perfect-debounce';
-import 'rollup-plugin-external-globals';
 import 'vite';
 import 'vite-plugin-full-reload';
 import 'vue/compiler-sfc';
 import 'c12';
 import 'postcss-load-config';
-import 'magic-string';
 import 'node:module';
 import 'child_process';
 import 'path';

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.DNMktHWN.mjs';
+import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.CPpXMJtV.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.DNMktHWN.js';
+import { B as BuildOptions, S as ServeOptions } from '../shared/kirbyup.CPpXMJtV.js';
 
 declare function build(options: BuildOptions): Promise<void>;
 declare function serve(options: ServeOptions): Promise<vite.ViteDevServer>;

package/dist/node/index.mjs

@@ -1,19 +1,17 @@
 import 'node:fs';
 import 'node:fs/promises';
-import '@vitejs/plugin-vue2';
-import '@vitejs/plugin-vue2-jsx';
+import '@vitejs/plugin-vue';
+import '@vitejs/plugin-vue-jsx';
 import 'consola';
 import 'consola/utils';
 import 'pathe';
 import 'perfect-debounce';
-import 'rollup-plugin-external-globals';
 import 'vite';
 import 'vite-plugin-full-reload';
 import 'vue/compiler-sfc';
-export { b as build, s as serve } from '../shared/kirbyup.BtejYnwg.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.ij1WTPTc.mjs';
 import 'c12';
 import 'postcss-load-config';
-import 'magic-string';
 import 'node:module';
 import 'child_process';
 import 'path';

package/dist/shared/{kirbyup.DNMktHWN.d.mts → kirbyup.CPpXMJtV.d.mts}

@@ -34,10 +34,6 @@ interface UserConfig {
      * })
      */
     vite?: InlineConfig;
-    /**
-     * @deprecated Use `vite` instead.
-     */
-    extendViteConfig?: InlineConfig;
 }
 
 export type { BuildOptions as B, ServeOptions as S, UserConfig as U };

package/dist/shared/{kirbyup.DNMktHWN.d.ts → kirbyup.CPpXMJtV.d.ts}

@@ -34,10 +34,6 @@ interface UserConfig {
      * })
      */
     vite?: InlineConfig;
-    /**
-     * @deprecated Use `vite` instead.
-     */
-    extendViteConfig?: InlineConfig;
 }
 
 export type { BuildOptions as B, ServeOptions as S, UserConfig as U };

package/dist/shared/{kirbyup.BtejYnwg.mjs → kirbyup.ij1WTPTc.mjs}

@@ -2,19 +2,17 @@ import * as fs from 'node:fs';
 import { existsSync } from 'node:fs';
 import * as fsp from 'node:fs/promises';
 import { readFile } from 'node:fs/promises';
-import vuePlugin from '@vitejs/plugin-vue2';
-import vueJsxPlugin from '@vitejs/plugin-vue2-jsx';
+import vuePlugin from '@vitejs/plugin-vue';
+import vueJsxPlugin from '@vitejs/plugin-vue-jsx';
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
 import { resolve, join, normalize, relative, dirname, basename } from 'pathe';
 import { debounce } from 'perfect-debounce';
-import externalGlobals from 'rollup-plugin-external-globals';
 import { createLogger, createServer, build as build$1, mergeConfig } from 'vite';
 import fullReloadPlugin from 'vite-plugin-full-reload';
 import * as vueCompilerSfc from 'vue/compiler-sfc';
 import { loadConfig as loadConfig$1 } from 'c12';
 import postcssrc from 'postcss-load-config';
-import MagicString from 'magic-string';
 import { createRequire } from 'node:module';
 import 'child_process';
 import 'path';
@@ -26,7 +24,7 @@ import { promisify } from 'node:util';
 import { gzip } from 'node:zlib';
 
 const name = "kirbyup";
-const version = "3.3.0";
+const version = "4.0.0-alpha.2";
 
 function loadConfig(cwd = process.cwd()) {
   return loadConfig$1({
@@ -76,106 +74,6 @@ function kirbyupBuildCleanupPlugin(options) {
   };
 }
 
-const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//g;
-const singlelineCommentsRE = /\/\/.*/g;
-const HMR_RUNTIME_ID = "\0plugin-vue2:hmr-runtime";
-const JSX_HMR_RUNTIME_ID = "plugin-vue2-jsx:hmr-runtime";
-function isHmrRuntimeId(id) {
-  return id === HMR_RUNTIME_ID || id === JSX_HMR_RUNTIME_ID;
-}
-const __INJECTED_HMR_CODE__ = `
-/** - injected by kirbyup - */
-for (const methodName of ['rerender', 'reload']) {
-  const original = __VUE_HMR_RUNTIME__[methodName]
-
-  __VUE_HMR_RUNTIME__[methodName] = function (id, updatedDef) {
-    const key = updatedDef?.__file ? '__file' : updatedDef?.__hmrId ? '__hmrId' : null
-
-    if (key) {
-      const pluginComponents = window.panel.plugins.components
-      // const usedComponentDefs = window.panel.app.$options.components
-      const usedComponentDefs = window.panel.app._vnode.componentInstance.$options.components // #33
-
-      for (const componentName in pluginComponents) {
-        if (updatedDef[key] === pluginComponents[componentName][key]) {
-          const usedDefinition = usedComponentDefs[componentName].options
-
-          if (map[id].options !== usedDefinition)
-            map[id].options = usedDefinition
-
-          if (typeof map[id].options.$_isSection !== 'boolean')
-            map[id].options.$_isSection = /^k-.*-section$/.test(componentName)
-
-          break
-        }
-      }
-    }
-
-    return original.apply(this, arguments)
-  }
-}
-
-function $_applyKirbyModifications(activeDef, newDef) {
-  const usedComponentDefs = window.panel.app.$options.components
-
-  if (newDef.template)
-    newDef.render = null
-
-  if (activeDef.$_isSection)
-    newDef.$_isSection = true
-  if (newDef.$_isSection && !newDef.mixins?.[0]?.methods?.load)
-    newDef.mixins = [activeDef.mixins[0], ...(newDef.mixins || [])]
-
-  if (typeof newDef.extends === 'string') {
-    if (newDef.extends === activeDef.extends?.options?.name) {
-      newDef.extends = activeDef.extends
-    }
-    else if (usedComponentDefs[newDef.extends]) {
-      newDef.extends = usedComponentDefs[newDef.extends].extend({
-        options: newDef,
-        components: { ...usedComponentDefs, ...(newDef.components || {}) },
-      })
-    }
-    else { newDef.extends = null }
-  }
-}
-/** -- */
-`;
-
-function kirbyupGlobImportPlugin() {
-  let config;
-  return {
-    name: "kirbyup:glob-import",
-    configResolved(resolvedConfig) {
-      config = resolvedConfig;
-    },
-    async transform(code) {
-      if (!code.includes("kirbyup.import"))
-        return;
-      const kirbyupImportRE = /\bkirbyup\.import\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*\)/g;
-      const noCommentsCode = code.replace(multilineCommentsRE, (m) => " ".repeat(m.length)).replace(singlelineCommentsRE, (m) => " ".repeat(m.length));
-      let s;
-      let match;
-      while (match = kirbyupImportRE.exec(noCommentsCode)) {
-        const { 0: exp, 1: rawPath, index } = match;
-        if (!s)
-          s = new MagicString(code);
-        s.overwrite(
-          index,
-          index + exp.length,
-          `kirbyup.import(import.meta.glob(${rawPath}, { eager: true }))`
-        );
-      }
-      if (s) {
-        return {
-          code: s.toString(),
-          map: config.build.sourcemap ? s.generateMap({ hires: true }) : void 0
-        };
-      }
-    }
-  };
-}
-
 const require = createRequire(import.meta.url);
 var St = Object.create;
 var $ = Object.defineProperty;
@@ -658,6 +556,70 @@ async function detectPackageManager(cwd, options = {}) {
   return detected;
 }
 
+const HMR_RUNTIME_ID = "\0plugin-vue2:hmr-runtime";
+const JSX_HMR_RUNTIME_ID = "plugin-vue2-jsx:hmr-runtime";
+function isHmrRuntimeId(id) {
+  return id === HMR_RUNTIME_ID || id === JSX_HMR_RUNTIME_ID;
+}
+const __INJECTED_HMR_CODE__ = `
+/** - injected by kirbyup - */
+for (const methodName of ['rerender', 'reload']) {
+  const original = __VUE_HMR_RUNTIME__[methodName]
+
+  __VUE_HMR_RUNTIME__[methodName] = function (id, updatedDef) {
+    const key = updatedDef?.__file ? '__file' : updatedDef?.__hmrId ? '__hmrId' : null
+
+    if (key) {
+      const pluginComponents = window.panel.plugins.components
+      // const usedComponentDefs = window.panel.app.$options.components
+      const usedComponentDefs = window.panel.app._vnode.componentInstance.$options.components // #33
+
+      for (const componentName in pluginComponents) {
+        if (updatedDef[key] === pluginComponents[componentName][key]) {
+          const usedDefinition = usedComponentDefs[componentName].options
+
+          if (map[id].options !== usedDefinition)
+            map[id].options = usedDefinition
+
+          if (typeof map[id].options.$_isSection !== 'boolean')
+            map[id].options.$_isSection = /^k-.*-section$/.test(componentName)
+
+          break
+        }
+      }
+    }
+
+    return original.apply(this, arguments)
+  }
+}
+
+function $_applyKirbyModifications(activeDef, newDef) {
+  const usedComponentDefs = window.panel.app.$options.components
+
+  if (newDef.template)
+    newDef.render = null
+
+  if (activeDef.$_isSection)
+    newDef.$_isSection = true
+  if (newDef.$_isSection && !newDef.mixins?.[0]?.methods?.load)
+    newDef.mixins = [activeDef.mixins[0], ...(newDef.mixins || [])]
+
+  if (typeof newDef.extends === 'string') {
+    if (newDef.extends === activeDef.extends?.options?.name) {
+      newDef.extends = activeDef.extends
+    }
+    else if (usedComponentDefs[newDef.extends]) {
+      newDef.extends = usedComponentDefs[newDef.extends].extend({
+        options: newDef,
+        components: { ...usedComponentDefs, ...(newDef.components || {}) },
+      })
+    }
+    else { newDef.extends = null }
+  }
+}
+/** -- */
+`;
+
 function kirbyupHmrPlugin(options) {
   let config;
   let entry;
@@ -743,8 +705,8 @@ logger.warn = (msg, options) => {
 };
 function getViteConfig(command, options) {
   const aliasDir = resolve(options.cwd, dirname(options.entry));
-  const { alias = {}, vite, extendViteConfig } = resolvedKirbyupConfig;
-  const userConfig = vite ?? extendViteConfig ?? {};
+  const { alias = {}, vite } = resolvedKirbyupConfig;
+  const userConfig = vite ?? {};
   const sharedConfig = {
     resolve: {
       alias: {
@@ -757,9 +719,7 @@ function getViteConfig(command, options) {
       // Explicitly pass the compiler, since the plugin's resolving of the compiler
       // looks in the current directory and breaks `npx kirbyup`
       vuePlugin({ compiler: vueCompilerSfc }),
-      vueJsxPlugin(),
-      kirbyupGlobImportPlugin(),
-      { ...externalGlobals({ vue: "Vue" }), enforce: "post" }
+      vueJsxPlugin()
     ],
     build: {
       copyPublicDir: false
@@ -803,14 +763,14 @@ function getViteConfig(command, options) {
     build: {
       lib: {
         entry: resolve(options.cwd, options.entry),
-        formats: ["iife"],
-        name: "kirbyupExport",
+        formats: ["es"],
         fileName: () => "index.js"
       },
       minify: mode === "production",
       outDir: options.outDir,
       emptyOutDir: false,
       rollupOptions: {
+        external: ["vue"],
         output: {
           assetFileNames: "index.[ext]"
         }
@@ -872,7 +832,7 @@ async function build(options) {
     const ignored = [
       "**/{.git,node_modules}/**",
       // Always ignore dist files
-      "index.{css,js}"
+      "index.{css,js,mjs}"
     ];
     const watchPaths = typeof options.watch === "boolean" ? dirname(options.entry) : Array.isArray(options.watch) ? options.watch.filter(
       (path) => typeof path === "string"

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.3.0",
-  "packageManager": "pnpm@10.7.1",
+  "version": "4.0.0-alpha.2",
+  "packageManager": "pnpm@10.12.4",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -72,35 +72,35 @@
     "test:types": "tsc --noEmit"
   },
   "dependencies": {
-    "@vitejs/plugin-vue2": "2.2.0",
-    "@vitejs/plugin-vue2-jsx": "1.1.0",
-    "@vue/compiler-sfc": "^2.7.16",
-    "c12": "^3.0.3",
+    "@vitejs/plugin-vue": "^6.0.0",
+    "@vitejs/plugin-vue-jsx": "^5.0.1",
+    "@vue/compiler-sfc": "^3.5.17",
+    "c12": "^3.0.4",
     "cac": "^6.7.14",
     "chokidar": "~3.6.0",
     "consola": "^3.4.2",
     "magic-string": "^0.30.17",
     "pathe": "^2.0.3",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.6",
     "postcss-load-config": "^6.0.1",
     "rollup-plugin-external-globals": "^0.13.0",
-    "sass": "^1.86.3",
-    "vite": "~5.4.17",
+    "sass": "^1.89.2",
+    "vite": "~5.4.19",
     "vite-plugin-full-reload": "^1.2.0",
-    "vue": "^2.7.16"
+    "vue": "^3.5.17"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.11.0",
-    "@types/node": "^22.14.0",
+    "@antfu/eslint-config": "^4.16.2",
+    "@types/node": "^22.16.0",
     "@types/prompts": "^2.4.9",
-    "bumpp": "^10.1.0",
-    "eslint": "^9.24.0",
+    "bumpp": "^10.2.0",
+    "eslint": "^9.30.1",
     "fast-glob": "^3.3.3",
     "nypm": "^0.6.0",
     "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vitest": "^3.1.1"
+    "vitest": "^3.2.4"
   },
   "pnpm": {
     "onlyBuiltDependencies": [