@witchcraft/nuxt-electron 0.0.3 → 0.0.5

package/dist/module.d.mts

@@ -29,15 +29,15 @@ interface ModuleOptions {
     /** Extra cli arguments to launch electron with in dev mode */
     extraCliArgs: string[];
     /**
-     * If set, adds `--user-data-dir ${devUserDataDir}` to the cli arguments in development mode.
+     * If set, adds `--dev-user-data-dir ${devUserDataDir}` to the cli arguments in development mode.
      *
-     * You will then need to parse this in main.ts, a `useDevDataDir` function is provided for this. This does not do any advanced parsing, just takes the next argument after `--user-data-dir` so the path must not contain spaces.
+     * You will then need to parse this in main.ts, a `useDevDataDir` function is provided for this. This does not do any advanced parsing, just takes the next argument after `--dev-user-data-dir` so the path must not contain spaces.
      * ```ts
      * const userDataDir = useDevDataDir() ?? app.getPath("userData")
      *
      * @default "~~/.user-data-dir"
      */
-    devUserDataDir: string;
+    devUserDataDir: string | null;
     /**
      * The script to run to build/pack the electron app.
      *

package/dist/module.json

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

package/dist/module.mjs

@@ -10,7 +10,7 @@ import { notBundle } from 'vite-plugin-electron/plugin';
 import { externalizeDeps } from 'vite-plugin-externalize-deps';
 
 const dependencies = {
-	"@witchcraft/ui": "^0.3.1"};
+	"@witchcraft/ui": "^0.3.2"};
 const pkg = {
 	dependencies: dependencies};
 
@@ -36,7 +36,7 @@ const module = defineNuxtModule({
     srcDir: "~~/app-electron",
     electronBuildDir: "~~/.dist/electron",
     nonElectronNuxtBuildDir: "~~/.dist/web/.output",
-    devUserDataDir: "~~/.user-data-dir",
+    devUserDataDir: void 0,
     electronRoute: "/app",
     autoOpen: process.env.AUTO_OPEN?.includes("electron"),
     electronBuildPackScript: "npm run build:electron:pack",
@@ -56,6 +56,9 @@ const module = defineNuxtModule({
     }
   },
   async setup(options, nuxt) {
+    if (options.devUserDataDir === void 0) {
+      options.devUserDataDir = "~~/.user-data-dir";
+    }
     if (!options.enable) {
       return;
     }

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

@@ -1,5 +1,5 @@
 import { type Component } from "vue";
-import type { WindowControlsApi } from "../electron/types.js.js";
+import type { WindowControlsApi } from "../electron/types.js";
 type __VLS_Props = {
     borderWidth?: string;
     buttonSize?: string;

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

@@ -1,5 +1,5 @@
 import { type Component } from "vue";
-import type { WindowControlsApi } from "../electron/types.js.js";
+import type { WindowControlsApi } from "../electron/types.js";
 type __VLS_Props = {
     borderWidth?: string;
     buttonSize?: string;

package/dist/runtime/electron/createWindowControlsApi.d.ts

@@ -1,5 +1,5 @@
 import type { IpcRenderer } from "electron";
-import type { WindowControlsApi } from "./types.js.js";
+import type { WindowControlsApi } from "./types.js";
 /**
  * Creates the apis to control the window from the preload script / client.
  *

package/dist/runtime/electron/index.d.ts

@@ -1,16 +1,16 @@
-export * from "./types.js";
-export { getPaths } from "./getPaths.js";
-export { createNuxtFileProtocolHandler } from "./createNuxtFileProtocolHandler.js";
-export { createWindowControlsApi } from "./createWindowControlsApi.js";
-export { createWindowControlsApiHandler } from "./createWindowControlsApiHandler.js";
-export { useNuxtRuntimeConfig } from "./useNuxtRuntimeConfig.js";
-export { STATIC } from "./static.js";
-export { apiBuilder } from "./apiBuilder.js";
-export { useDevDataDir } from "./useDevDataDir.js";
-export { registerDevtoolsShortcuts } from "./registerDevtoolsShortcuts.js";
-export { promisifyApi } from "./promisifyApi.js";
-export { getPreloadMeta } from "./getPreloadMeta.js";
-export { getEventWindow } from "./getEventWindow.js";
-export { promisifyReply } from "./promisifyReply.js";
-export { createBroadcaster } from "./createBroadcaster.js";
-export { createBroadcastHandlers } from "./createBroadcastHandlers.js";
+export * from "./types";
+export { getPaths } from "./getPaths";
+export { createNuxtFileProtocolHandler } from "./createNuxtFileProtocolHandler";
+export { createWindowControlsApi } from "./createWindowControlsApi";
+export { createWindowControlsApiHandler } from "./createWindowControlsApiHandler";
+export { useNuxtRuntimeConfig } from "./useNuxtRuntimeConfig";
+export { STATIC } from "./static";
+export { apiBuilder } from "./apiBuilder";
+export { useDevDataDir } from "./useDevDataDir";
+export { registerDevtoolsShortcuts } from "./registerDevtoolsShortcuts";
+export { promisifyApi } from "./promisifyApi";
+export { getPreloadMeta } from "./getPreloadMeta";
+export { getEventWindow } from "./getEventWindow";
+export { promisifyReply } from "./promisifyReply";
+export { createBroadcaster } from "./createBroadcaster";
+export { createBroadcastHandlers } from "./createBroadcastHandlers";

package/dist/runtime/electron/useDevDataDir.js

@@ -1,6 +1,6 @@
 export function useDevDataDir() {
   if (import.meta.dev) {
-    const index = process.argv.findIndex((arg) => arg.startsWith("--user-data-dir")) + 1;
+    const index = process.argv.findIndex((arg) => arg.startsWith("--dev-user-data-dir")) + 1;
     if (index === -1) return void 0;
     return process.argv[index + 1];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@witchcraft/nuxt-electron",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"description": "Nuxt module for working with electron.",
 	"repository": "witchcraftjs/nuxt-electron",
 	"license": "MIT",
@@ -25,7 +25,7 @@
 		"genDevDesktop.js"
 	],
 	"scripts": {
-		"prepare": "husky && cd playground && pnpm i",
+		"prepare": "husky && pnpm nuxt-module-build prepare && pnpm build:only && cd playground && pnpm i --ignore-scripts --ignore-workspace",
 		"build": "nuxt-module-build prepare && nuxt-module-build build && nuxi build playground",
 		"build:only": "nuxt-module-build build",
 		"dev": "nuxi dev playground",
@@ -39,14 +39,14 @@
 		"@alanscodelog/utils": "^6.0.2",
 		"@nuxt/kit": "^4.0.3",
 		"@witchcraft/nuxt-utils": "^0.3.2",
-		"@witchcraft/ui": "^0.3.1",
+		"@witchcraft/ui": "^0.3.2",
 		"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.3.1",
+		"@witchcraft/ui": "^0.3.2",
 		"unplugin-icons": "^22.1.0"
 	},
 	"peerDependenciesMeta": {

package/src/module.ts

@@ -65,15 +65,15 @@ export interface ModuleOptions {
 	/** Extra cli arguments to launch electron with in dev mode */
 	extraCliArgs: string[]
 	/**
-	 * If set, adds `--user-data-dir ${devUserDataDir}` to the cli arguments in development mode.
+	 * If set, adds `--dev-user-data-dir ${devUserDataDir}` to the cli arguments in development mode.
 	 *
-	 * You will then need to parse this in main.ts, a `useDevDataDir` function is provided for this. This does not do any advanced parsing, just takes the next argument after `--user-data-dir` so the path must not contain spaces.
+	 * You will then need to parse this in main.ts, a `useDevDataDir` function is provided for this. This does not do any advanced parsing, just takes the next argument after `--dev-user-data-dir` so the path must not contain spaces.
 	 * ```ts
 	 * const userDataDir = useDevDataDir() ?? app.getPath("userData")
 	 *
 	 * @default "~~/.user-data-dir"
 	 */
-	devUserDataDir: string
+	devUserDataDir: string | null
 	/**
 	 * The script to run to build/pack the electron app.
 	 *
@@ -159,7 +159,7 @@ export default defineNuxtModule<ModuleOptions>({
 		srcDir: "~~/app-electron",
 		electronBuildDir: "~~/.dist/electron",
 		nonElectronNuxtBuildDir: "~~/.dist/web/.output",
-		devUserDataDir: "~~/.user-data-dir",
+		devUserDataDir: undefined,
 		electronRoute: "/app",
 		autoOpen: process.env.AUTO_OPEN?.includes("electron"),
 		electronBuildPackScript: "npm run build:electron:pack",
@@ -179,6 +179,11 @@ export default defineNuxtModule<ModuleOptions>({
 		}
 	},
 	async setup(options, nuxt) {
+		// if the user explicitly sets it to null we want it to stay null
+		if (options.devUserDataDir === undefined) {
+			options.devUserDataDir = "~~/.user-data-dir"
+		}
+
 		if (!options.enable) { return }
 		const moduleName = "@witchcraft/nuxt-electron"
 		const logger = useLogger(moduleName)

package/src/runtime/electron/useDevDataDir.ts

@@ -1,6 +1,6 @@
 export function useDevDataDir(): string | undefined {
 	if (import.meta.dev) {
-		const index = process.argv.findIndex(arg => arg.startsWith("--user-data-dir")) + 1
+		const index = process.argv.findIndex(arg => arg.startsWith("--dev-user-data-dir")) + 1
 		if (index === -1) return undefined
 		return process.argv[index + 1]
 	}