kirbyup 2.0.2-beta.0 → 2.1.0-beta.0

package/dist/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.d1711aad.mjs';
+import { n as name, b as build, s as serve, v as version, h as handleError } from './shared/kirbyup.3e5241d6.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
@@ -9,6 +9,7 @@ import 'perfect-debounce';
 import 'vite';
 import 'vue/compiler-sfc';
 import '@vitejs/plugin-vue2';
+import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
 import 'postcss-load-config';
 import 'postcss-logical';

package/dist/index.mjs

@@ -7,11 +7,12 @@ import 'perfect-debounce';
 import 'vite';
 import 'vue/compiler-sfc';
 import '@vitejs/plugin-vue2';
+import '@vitejs/plugin-vue2-jsx';
 import 'vite-plugin-full-reload';
 import 'postcss-load-config';
 import 'postcss-logical';
 import 'postcss-dir-pseudo-class';
-export { b as build, s as serve } from './shared/kirbyup.d1711aad.mjs';
+export { b as build, s as serve } from './shared/kirbyup.3e5241d6.mjs';
 import 'zlib';
 import 'util';
 import 'fs';

package/dist/shared/{kirbyup.d1711aad.mjs → kirbyup.3e5241d6.mjs}

@@ -6,7 +6,8 @@ import colors from 'picocolors';
 import { debounce } from 'perfect-debounce';
 import { createServer, mergeConfig, build as build$1 } from 'vite';
 import * as vueCompilerSfc from 'vue/compiler-sfc';
-import vuePlugin, { parseVueRequest } from '@vitejs/plugin-vue2';
+import vuePlugin from '@vitejs/plugin-vue2';
+import vueJsxPlugin from '@vitejs/plugin-vue2-jsx';
 import fullReloadPlugin from 'vite-plugin-full-reload';
 import postcssrc from 'postcss-load-config';
 import postcssLogical from 'postcss-logical';
@@ -19,7 +20,7 @@ import MagicString from 'magic-string';
 import { detect } from 'detect-package-manager';
 
 const name = "kirbyup";
-const version = "2.0.2-beta.0";
+const version = "2.1.0-beta.0";
 
 class PrettyError extends Error {
   constructor(message) {
@@ -98,6 +99,64 @@ async function loadConfig(cwd = process.cwd(), configOrPath = cwd, extraConfigSo
 
 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";
+const isHmrRuntimeId = (id) => id === HMR_RUNTIME_ID || id === JSX_HMR_RUNTIME_ID;
+const __INJECTED_HMR_CODE__ = `
+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.$vue.$options.components
+
+      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
+            map[id].options.$_isSection = /^k-.*-section$/.test(componentName)
+          }
+
+          break
+        }
+      }
+    }
+
+    return original.apply(this, arguments)
+  }
+}
+
+function $_applyKirbyModifications(activeDef, newDef) {
+  const usedComponentDefs = window.panel.$vue.$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 kirbyupAutoImportPlugin() {
   let config;
@@ -134,10 +193,6 @@ function kirbyupAutoImportPlugin() {
   };
 }
 
-const __HMR_CODE__ = `
-if (typeof __VUE_HMR_RUNTIME__ !== 'undefined' && import.meta.hot) {
-  __VUE_HMR_RUNTIME__.reload = () => import.meta.hot.invalidate();
-}`.trim();
 const getViteProxyModule = (entryUrl, pm) => `
 try {
   await import("${entryUrl}");
@@ -160,13 +215,12 @@ function kirbyupHmrPlugin(options) {
       indexMjs = resolve(config.root, options.outDir || "", "index.dev.mjs");
     },
     transform(code, id) {
-      const { query } = parseVueRequest(id);
-      if (query.raw)
-        return;
-      if ((typeof id !== "string" || /\0/.test(id)) && !query.vue)
-        return;
-      if (/\.vue$/.test(id) && !query.vue)
-        return `${code};${__HMR_CODE__}`;
+      if (isHmrRuntimeId(id)) {
+        return code.replace(
+          /^.*=\s*record\.Ctor\.super\.extend\(options\)/m,
+          "$_applyKirbyModifications(record.Ctor.options, options) // injected by kirbyup\n$&"
+        ) + __INJECTED_HMR_CODE__;
+      }
     },
     configureServer(server) {
       if (!server.httpServer)
@@ -215,6 +269,7 @@ function getViteConfig(command, options) {
     },
     plugins: [
       vuePlugin({ compiler: vueCompilerSfc }),
+      vueJsxPlugin(),
       kirbyupAutoImportPlugin()
     ],
     css: { postcss: resolvedPostCssConfig },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kirbyup",
-  "version": "2.0.2-beta.0",
-  "packageManager": "pnpm@7.12.1",
+  "version": "2.1.0-beta.0",
+  "packageManager": "pnpm@7.13.1",
   "description": "Zero-config bundler for Kirby Panel plugins",
   "author": {
     "name": "Johann Schopplich",
@@ -61,7 +61,7 @@
   },
   "scripts": {
     "build": "unbuild",
-    "dev": "unbuild --stub",
+    "dev": "STUB=true unbuild",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "release": "bumpp --commit --push --tag",
@@ -70,7 +70,8 @@
     "prepare": "simple-git-hooks"
   },
   "dependencies": {
-    "@vitejs/plugin-vue2": "^2.0.0",
+    "@vitejs/plugin-vue2": "2.0.0",
+    "@vitejs/plugin-vue2-jsx": "1.0.3",
     "@vue/compiler-sfc": "^2.7.10",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",