@witchcraft/nuxt-electron 0.0.1 → 0.0.2

package/README.md

@@ -25,7 +25,7 @@
 			- `createBroadcasters/createBroadcastHandlers` for sending messages to all windows.
 			- `createWindowControlsApi` for calling close/minimize/maximize/pin from the renderer and an `ElectronWindowControls` component for rending a basic set.
 			- `promisifyApi`(preload) and `promisifyReply`(main) for easily creating and handling apis in the preload script.
-	- See also [@witchcraft/nuxt-logger](todo) for electron logging utilities.
+	- See also [@witchcraft/nuxt-logger](https://github.com/witchcraftjs/nuxt-logger) for electron logging utilities.
 
 # Playground
 

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "electron",
   "configKey": "electron",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,6 +1,6 @@
 import { crop } from '@alanscodelog/utils/crop';
 import { run } from '@alanscodelog/utils/run';
-import { defineNuxtModule, useLogger, createResolver, addComponentsDir, installModule, addTemplate, extendRouteRules, addImportsDir } from '@nuxt/kit';
+import { defineNuxtModule, useLogger, createResolver, addComponentsDir, addTemplate, extendRouteRules, addImportsDir } from '@nuxt/kit';
 import { nuxtRemoveUneededPages, nuxtFileBasedRouting, nuxtRerouteOutputTo, createConstantCaseVariables } from '@witchcraft/nuxt-utils/utils';
 import { defu } from 'defu';
 import fs from 'node:fs/promises';
@@ -9,6 +9,11 @@ import { startup, build } from 'vite-plugin-electron';
 import { notBundle } from 'vite-plugin-electron/plugin';
 import { externalizeDeps } from 'vite-plugin-externalize-deps';
 
+const dependencies = {
+	"@witchcraft/ui": "^0.3.1"};
+const pkg = {
+	dependencies: dependencies};
+
 startup.exit = async () => {
   if ("electronApp" in process) {
     try {
@@ -45,6 +50,11 @@ const module = defineNuxtModule({
     additionalViteDefinesToCopy: [],
     notBundleOptions: {}
   },
+  moduleDependencies: {
+    "@witchcraft/ui/nuxt": {
+      version: pkg.dependencies["@witchcraft/ui"]
+    }
+  },
   async setup(options, nuxt) {
     if (!options.enable) {
       return;
@@ -56,7 +66,6 @@ const module = defineNuxtModule({
       global: true,
       path: resolve("runtime/components")
     });
-    await installModule("@witchcraft/ui/nuxt", nuxt.options.witchcraftUi);
     addTemplate({
       filename: "witchcraft-electron.css",
       write: true,

package/dist/runtime/components/ElectronWindowControls.d.vue.ts

@@ -22,10 +22,11 @@ type __VLS_Props = {
     buttonsOrder?: ("CloseButton" | "MinimizeButton" | "MaximizeButton" | "PinButton")[];
     handler?: WindowControlsApi;
 };
-declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     borderWidth: string;
     buttonSize: string;
     borderRadius: string;
     buttonsOrder: ("CloseButton" | "MinimizeButton" | "MaximizeButton" | "PinButton")[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/ElectronWindowControls.vue.d.ts

@@ -22,10 +22,11 @@ type __VLS_Props = {
     buttonsOrder?: ("CloseButton" | "MinimizeButton" | "MaximizeButton" | "PinButton")[];
     handler?: WindowControlsApi;
 };
-declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+declare const __VLS_export: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     borderWidth: string;
     buttonSize: string;
     borderRadius: string;
     buttonsOrder: ("CloseButton" | "MinimizeButton" | "MaximizeButton" | "PinButton")[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: typeof __VLS_export;
 export default _default;

package/dist/runtime/components/WindowControls/CloseButton.d.vue.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "close") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "close") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/CloseButton.vue.d.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "close") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "close") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/MaximizeButton.d.vue.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "toggleMaximize") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "toggleMaximize") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/MaximizeButton.vue.d.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "toggleMaximize") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "toggleMaximize") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/MinimizeButton.d.vue.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "minimize") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "minimize") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/MinimizeButton.vue.d.ts

@@ -2,12 +2,13 @@ declare var __VLS_10: {};
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     action: (action: "minimize") => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onAction?: ((action: "minimize") => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/PinButton.d.vue.ts

@@ -1,4 +1,4 @@
-type __VLS_PublicProps = {
+type __VLS_ModelProps = {
     /**
      * If there is a `window.electron.on` api that allows listening to events and main sends an `always-on-top-changed`, it will update the state of the pin.
      */
@@ -10,15 +10,16 @@ declare var __VLS_10: {
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: boolean) => any;
 } & {
     action: (action: "togglePin") => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<__VLS_ModelProps> & Readonly<{
     onAction?: ((action: "togglePin") => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/runtime/components/WindowControls/PinButton.vue.d.ts

@@ -1,4 +1,4 @@
-type __VLS_PublicProps = {
+type __VLS_ModelProps = {
     /**
      * If there is a `window.electron.on` api that allows listening to events and main sends an `always-on-top-changed`, it will update the state of the pin.
      */
@@ -10,15 +10,16 @@ declare var __VLS_10: {
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_ModelProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:modelValue": (value: boolean) => any;
 } & {
     action: (action: "togglePin") => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+}, string, import("vue").PublicProps, Readonly<__VLS_ModelProps> & Readonly<{
     onAction?: ((action: "togglePin") => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@witchcraft/nuxt-electron",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"description": "Nuxt module for working with electron.",
 	"repository": "witchcraftjs/nuxt-electron",
 	"license": "MIT",
@@ -36,16 +36,17 @@
 		"test:watch": "vitest watch"
 	},
 	"dependencies": {
-		"@alanscodelog/utils": "^6.0.1",
+		"@alanscodelog/utils": "^6.0.2",
 		"@nuxt/kit": "^4.0.3",
-		"@witchcraft/nuxt-utils": "^0.2.1",
+		"@witchcraft/nuxt-utils": "^0.3.2",
+		"@witchcraft/ui": "^0.3.1",
 		"defu": "^6.1.4",
 		"es-toolkit": "^1.39.10",
 		"vite-plugin-electron": "^0.29.0",
 		"vite-plugin-externalize-deps": "^0.9.0"
 	},
 	"peerDependencies": {
-		"@witchcraft/ui": "^0.2.1",
+		"@witchcraft/ui": "^0.3.1",
 		"unplugin-icons": "^22.1.0"
 	},
 	"peerDependenciesMeta": {
@@ -57,23 +58,22 @@
 		}
 	},
 	"devDependencies": {
-		"@alanscodelog/eslint-config": "^6.3.0",
+		"@alanscodelog/eslint-config": "^6.3.1",
 		"@alanscodelog/semantic-release-config": "^5.0.4",
-		"@alanscodelog/tsconfigs": "^6.1.0",
+		"@alanscodelog/tsconfigs": "^6.2.0",
 		"@nuxt/eslint-config": "^1.9.0",
 		"@nuxt/module-builder": "^1.0.2",
 		"@nuxt/schema": "^4.0.3",
 		"@nuxt/test-utils": "^3.19.2",
 		"@types/node": "latest",
-		"@witchcraft/ui": "^0.2.1",
 		"changelogen": "^0.6.2",
-		"electron": "^34.5.8",
+		"electron": "^38.0.0",
 		"eslint": "^9.34.0",
 		"husky": "^9.1.7",
 		"json5": "^2.2.3",
 		"nuxt": "^4.0.3",
 		"typescript": "^5.8.3",
-		"unplugin-icons": "^22.2.0",
+		"unplugin-icons": "^22.3.0",
 		"vitest": "^3.2.4",
 		"vue-tsc": "^3.0.6"
 	},

package/src/module.ts

@@ -7,7 +7,6 @@ import {
 	createResolver,
 	defineNuxtModule,
 	extendRouteRules,
-	installModule,
 	useLogger
 } from "@nuxt/kit"
 import { createConstantCaseVariables, nuxtFileBasedRouting, nuxtRemoveUneededPages, nuxtRerouteOutputTo } from "@witchcraft/nuxt-utils/utils"
@@ -21,6 +20,8 @@ import { build, type ElectronOptions, startup } from "vite-plugin-electron"
 import { notBundle } from "vite-plugin-electron/plugin"
 import { externalizeDeps } from "vite-plugin-externalize-deps"
 
+import pkg from "../package.json" with { type: "json" }
+
 // https://github.com/electron-vite/vite-plugin-electron/issues/251#issuecomment-2360153184
 startup.exit = async () => {
 	if ("electronApp" in process) {
@@ -172,6 +173,11 @@ export default defineNuxtModule<ModuleOptions>({
 		additionalViteDefinesToCopy: [],
 		notBundleOptions: {}
 	},
+	moduleDependencies: {
+		"@witchcraft/ui/nuxt": {
+			version: pkg.dependencies["@witchcraft/ui"]
+		}
+	},
 	async setup(options, nuxt) {
 		if (!options.enable) { return }
 		const moduleName = "@witchcraft/nuxt-electron"
@@ -182,7 +188,6 @@ export default defineNuxtModule<ModuleOptions>({
 			global: true,
 			path: resolve("runtime/components")
 		})
-		await installModule("@witchcraft/ui/nuxt", (nuxt.options as any).witchcraftUi)
 
 		addTemplate({
 			filename: "witchcraft-electron.css",