kirbyup 3.1.4 → 4.0.0-alpha.1

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,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.DSMJ9KWQ.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from '../shared/kirbyup.-18Bpk2m.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
@@ -8,10 +8,9 @@ import 'consola/utils';
 import 'perfect-debounce';
 import 'vite';
 import 'vue/compiler-sfc';
-import '@vitejs/plugin-vue2';
-import '@vitejs/plugin-vue2-jsx';
+import '@vitejs/plugin-vue';
+import '@vitejs/plugin-vue-jsx';
 import 'vite-plugin-full-reload';
-import 'rollup-plugin-external-globals';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
@@ -19,7 +18,6 @@ import 'c12';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
-import 'magic-string';
 import 'node:module';
 
 async function startCli(cwd = process.cwd(), argv = process.argv) {

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

@@ -6,11 +6,10 @@ import 'consola/utils';
 import 'perfect-debounce';
 import 'vite';
 import 'vue/compiler-sfc';
-import '@vitejs/plugin-vue2';
-import '@vitejs/plugin-vue2-jsx';
+import '@vitejs/plugin-vue';
+import '@vitejs/plugin-vue-jsx';
 import 'vite-plugin-full-reload';
-import 'rollup-plugin-external-globals';
-export { b as build, s as serve } from '../shared/kirbyup.DSMJ9KWQ.mjs';
+export { b as build, s as serve } from '../shared/kirbyup.-18Bpk2m.mjs';
 import 'node:zlib';
 import 'node:util';
 import 'node:buffer';
@@ -18,5 +17,4 @@ import 'c12';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
-import 'magic-string';
 import 'node:module';

package/dist/shared/{kirbyup.DSMJ9KWQ.mjs → kirbyup.-18Bpk2m.mjs}

@@ -6,10 +6,9 @@ import { colors } from 'consola/utils';
 import { debounce } from 'perfect-debounce';
 import { createServer, mergeConfig, build as build$1 } from 'vite';
 import * as vueCompilerSfc from 'vue/compiler-sfc';
-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 fullReloadPlugin from 'vite-plugin-full-reload';
-import externalGlobals from 'rollup-plugin-external-globals';
 import { gzip } from 'node:zlib';
 import { promisify } from 'node:util';
 import { Buffer } from 'node:buffer';
@@ -17,11 +16,10 @@ 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.4";
+const version = "4.0.0-alpha.1";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -82,110 +80,10 @@ async function resolvePostCSSConfig(cwd) {
   }
 }
 
-const multilineCommentsRE = /\/\*(.|[\r\n])*?\*\//gm;
-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
-        };
-      }
-    }
-  };
-}
-
 async function findup(cwd, match, options = {}) {
   const segments = normalize(cwd).split("/");
   while (segments.length > 0) {
-    const path = segments.join("/");
+    const path = segments.join("/") || "/";
     const result = await match(path);
     if (result || !options.includeParentDirs) {
       return result;
@@ -195,7 +93,11 @@ async function findup(cwd, match, options = {}) {
 }
 
 const packageManagers = [
-  { name: "npm", command: "npm", lockFile: "package-lock.json" },
+  {
+    name: "npm",
+    command: "npm",
+    lockFile: "package-lock.json"
+  },
   {
     name: "pnpm",
     command: "pnpm",
@@ -223,7 +125,7 @@ const packageManagers = [
 ];
 async function detectPackageManager(cwd, options = {}) {
   const detected = await findup(
-    cwd,
+    resolve(cwd || "."),
     async (path) => {
       if (!options.ignorePackageJSON) {
         const packageJSONPath = join(path, "package.json");
@@ -265,9 +167,84 @@ async function detectPackageManager(cwd, options = {}) {
       includeParentDirs: options.includeParentDirs ?? true
     }
   );
+  if (!detected && !options.ignoreArgv) {
+    const scriptArg = process.argv[1];
+    if (scriptArg) {
+      for (const packageManager of packageManagers) {
+        const re = new RegExp(`[/\\\\]\\.?${packageManager.command}`);
+        if (re.test(scriptArg)) {
+          return packageManager;
+        }
+      }
+    }
+  }
   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;
@@ -342,9 +319,9 @@ let resolvedKirbyupConfig;
 let resolvedPostCssConfig;
 function getViteConfig(command, options) {
   const aliasDir = resolve(options.cwd, dirname(options.entry));
-  const { alias = {}, vite, extendViteConfig } = resolvedKirbyupConfig;
-  const userConfig = vite ?? extendViteConfig ?? {};
-  const baseConfig = {
+  const { alias = {}, vite } = resolvedKirbyupConfig;
+  const userConfig = vite ?? {};
+  const sharedConfig = {
     resolve: {
       alias: {
         "~/": `${aliasDir}/`,
@@ -356,9 +333,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()
     ],
     css: { postcss: resolvedPostCssConfig },
     envPrefix: ["VITE_", "KIRBYUP_"],
@@ -366,7 +341,7 @@ function getViteConfig(command, options) {
   };
   if (command === "serve") {
     const { port, watch } = options;
-    const serveConfig = mergeConfig(baseConfig, {
+    const serveConfig = mergeConfig(sharedConfig, {
       plugins: [
         kirbyupHmrPlugin(options),
         watch && fullReloadPlugin(watch)
@@ -379,20 +354,20 @@ function getViteConfig(command, options) {
     return mergeConfig(serveConfig, userConfig);
   }
   const mode = options.watch ? "development" : "production";
-  const buildConfig = mergeConfig(baseConfig, {
+  const buildConfig = mergeConfig(sharedConfig, {
     plugins: [kirbyupBuildCleanupPlugin(options)],
     mode,
     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]"
         }
@@ -433,7 +408,7 @@ async function generate(options) {
   return result;
 }
 async function build(options) {
-  ensureEntry(options);
+  assertEntryExists(options);
   const { cwd } = options;
   const { config, configFile } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
@@ -454,7 +429,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"
@@ -488,7 +463,7 @@ async function build(options) {
   startWatcher();
 }
 async function serve(options) {
-  ensureEntry(options);
+  assertEntryExists(options);
   const { cwd } = options;
   const { config } = await loadConfig(cwd);
   resolvedKirbyupConfig = config ?? {};
@@ -502,7 +477,7 @@ async function serve(options) {
   consola.success(`Server is listening on :${server.config.server.port}`);
   return server;
 }
-function ensureEntry(options) {
+function assertEntryExists(options) {
   if (!existsSync(resolve(options.cwd, options.entry)))
     throw new PrettyError(`Cannot find "${options.entry}"`);
 }

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/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kirbyup",
   "type": "module",
-  "version": "3.1.4",
-  "packageManager": "pnpm@8.15.3",
+  "version": "4.0.0-alpha.1",
+  "packageManager": "pnpm@8.15.7",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -61,9 +61,9 @@
   "scripts": {
     "build": "unbuild",
     "dev": "UNBUILD_STUB=true unbuild",
-    "docs": "pnpm -C docs run dev",
-    "docs:build": "pnpm -C docs run build",
-    "docs:serve": "pnpm -C docs run serve",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "release": "bumpp --commit --push --tag",
@@ -72,40 +72,39 @@
     "prepare": "simple-git-hooks"
   },
   "dependencies": {
-    "@vitejs/plugin-vue2": "2.2.0",
-    "@vitejs/plugin-vue2-jsx": "1.1.0",
-    "@vue/compiler-sfc": "^2.7.16",
-    "c12": "^1.8.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "@vue/compiler-sfc": "^3.4.23",
+    "c12": "^1.10.0",
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
     "consola": "^3.2.3",
-    "magic-string": "^0.30.7",
+    "magic-string": "^0.30.10",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.38",
     "postcss-dir-pseudo-class": "^8.0.1",
     "postcss-load-config": "^5.0.3",
     "postcss-logical": "^7.0.1",
-    "rollup-plugin-external-globals": "^0.9.2",
-    "sass": "^1.70.0",
-    "vite": "^5.1.2",
+    "sass": "^1.75.0",
+    "vite": "^5.2.10",
     "vite-plugin-full-reload": "^1.1.0",
-    "vue": "^2.7.16"
+    "vue": "^3.4.23"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.6.4",
+    "@antfu/eslint-config": "^2.15.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.18",
+    "@types/node": "^20.12.7",
     "@types/prompts": "^2.4.9",
-    "bumpp": "^9.3.0",
-    "eslint": "^8.56.0",
+    "bumpp": "^9.4.0",
+    "eslint": "^8.57.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "nypm": "^0.3.6",
-    "simple-git-hooks": "^2.9.0",
-    "typescript": "~5.3.3",
+    "nypm": "^0.3.8",
+    "simple-git-hooks": "^2.11.1",
+    "typescript": "^5.4.5",
     "unbuild": "^3.0.0-rc.1",
-    "vitest": "^1.2.2"
+    "vitest": "^1.5.0"
   },
   "simple-git-hooks": {
     "commit-msg": "node scripts/verifyCommit.mjs $1"