diff --git a/v3/UNRELEASED_CHANGELOG.md b/v3/UNRELEASED_CHANGELOG.md
index 68bdf84e1..f077f4b4d 100644
--- a/v3/UNRELEASED_CHANGELOG.md
+++ b/v3/UNRELEASED_CHANGELOG.md
@@ -29,6 +29,8 @@ After processing, the content will be moved to the main changelog and this file
 - Make menus to be displayed on Windows OS in `v3\examples\dialogs` by @ndianabasi
 - Fix race condition causing TypeError during page reload (#4872) by @ddmoney420
 
+- Fix incorrect output from binding generator tests by removing global state in the `Collector.IsVoidAlias()` method (#4941) by @fbbdev
+
 ## Deprecated
 <!-- Soon-to-be removed features -->
 
diff --git a/v3/internal/generator/collect/collector.go b/v3/internal/generator/collect/collector.go
index da0a9d546..2485c1162 100644
--- a/v3/internal/generator/collect/collector.go
+++ b/v3/internal/generator/collect/collector.go
@@ -4,6 +4,7 @@ import (
 	"go/ast"
 	"go/types"
 	"sync"
+	"sync/atomic"
 
 	"github.com/wailsapp/wails/v3/internal/flags"
 	"github.com/wailsapp/wails/v3/internal/generator/config"
@@ -42,6 +43,8 @@ type Collector struct {
 
 	// events holds collected information about registered custom events.
 	events *EventMap
+	// appVoidType caches the application.Void named type that stands in for the void TS type.
+	appVoidType atomic.Value
 
 	systemPaths *config.SystemPaths
 	options     *flags.GenerateBindingsOptions
diff --git a/v3/internal/generator/collect/void.go b/v3/internal/generator/collect/void.go
index f1e328ba2..b2a377ec8 100644
--- a/v3/internal/generator/collect/void.go
+++ b/v3/internal/generator/collect/void.go
@@ -2,12 +2,8 @@ package collect
 
 import (
 	"go/types"
-	"sync/atomic"
 )
 
-// appVoidType caches the application.Void named type that stands in for the void TS type.
-var appVoidType atomic.Value
-
 // IsVoidAlias returns true when the given type or object is the application.Void named type that stands in for the void TS type.
 func (collector *Collector) IsVoidAlias(typOrObj any) bool {
 	var obj types.Object
@@ -20,11 +16,11 @@ func (collector *Collector) IsVoidAlias(typOrObj any) bool {
 		return false
 	}
 
-	if vt := appVoidType.Load(); obj == vt {
+	if vt := collector.appVoidType.Load(); vt != nil && obj == vt {
 		return true
-	} else if vt == nil && obj.Name() == "Void" && obj.Pkg().Path() == collector.systemPaths.ApplicationPackage { // Check name before package to fail fast
+	} else if vt == nil && obj.Name() == "Void" && obj.Pkg() != nil && obj.Pkg().Path() == collector.systemPaths.ApplicationPackage { // Check name before package to fail fast
 		// Cache void alias for faster checking
-		appVoidType.Store(obj)
+		collector.appVoidType.Store(obj)
 		return true
 	}
 
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.js
index 3d3607cf4..9cc7781aa 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.js
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.js
@@ -15,9 +15,6 @@ import * as events_only$0 from "./generator/testcases/events_only/models.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import * as application$0 from "../pkg/application/models.js";
 
 function configure() {
     Object.freeze(Object.assign($Create.Events, {
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index e45b7eb94..d265e3adc 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] };
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[];
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js
deleted file mode 100644
index 7696315ce..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-import * as $models from "./models.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {$models.Void} Void
- */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js
deleted file mode 100644
index abb54db41..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import { Create as $Create } from "/wails/runtime.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {any} Void
- */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/warnings.log b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=false/UseNames=true/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index f951b9830..4384cef06 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] | null } | null;
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[] | null;
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.js
deleted file mode 100644
index 7696315ce..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-import * as $models from "./models.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {$models.Void} Void
- */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.js
deleted file mode 100644
index f9f822da1..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {any} Void
- */
-
-// In interface mode, this file is likely to contain just comments.
-// We add a dummy export statement to ensure it is recognised as an ES module.
-export {};
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/warnings.log b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=false/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index f951b9830..4384cef06 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] | null } | null;
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[] | null;
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js
deleted file mode 100644
index 7696315ce..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-import * as $models from "./models.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {$models.Void} Void
- */
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js
deleted file mode 100644
index f9f822da1..000000000
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @ts-check
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- * @typedef {any} Void
- */
-
-// In interface mode, this file is likely to contain just comments.
-// We add a dummy export statement to ensure it is recognised as an ES module.
-export {};
diff --git a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/warnings.log b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=JS/UseInterfaces=true/UseNames=true/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventcreate.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventcreate.ts
index 3d3607cf4..9cc7781aa 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventcreate.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventcreate.ts
@@ -15,9 +15,6 @@ import * as events_only$0 from "./generator/testcases/events_only/models.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import * as application$0 from "../pkg/application/models.js";
 
 function configure() {
     Object.freeze(Object.assign($Create.Events, {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index e45b7eb94..d265e3adc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] };
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[];
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts
deleted file mode 100644
index bbfb139c9..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-export type {
-    Void
-} from "./models.js";
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts
deleted file mode 100644
index f1739cabc..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import { Create as $Create } from "/wails/runtime.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- */
-export type Void = any;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/warnings.log b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=false/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.ts
index 3d3607cf4..9cc7781aa 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventcreate.ts
@@ -15,9 +15,6 @@ import * as events_only$0 from "./generator/testcases/events_only/models.js";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import * as application$0 from "../pkg/application/models.js";
 
 function configure() {
     Object.freeze(Object.assign($Create.Events, {
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index e45b7eb94..d265e3adc 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] };
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[];
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts
deleted file mode 100644
index bbfb139c9..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-export type {
-    Void
-} from "./models.js";
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts
deleted file mode 100644
index f1739cabc..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import { Create as $Create } from "/wails/runtime.js";
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- */
-export type Void = any;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/warnings.log b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=false/UseNames=true/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index f951b9830..4384cef06 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] | null } | null;
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[] | null;
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts
deleted file mode 100644
index bbfb139c9..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-export type {
-    Void
-} from "./models.js";
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts
deleted file mode 100644
index a8b4d1499..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/github.com/wailsapp/wails/v3/pkg/application/models.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- */
-export type Void = any;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/warnings.log b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=false/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
index f951b9830..4384cef06 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/internal/eventdata.d.ts
@@ -14,16 +14,13 @@ import type * as events_only$0 from "./generator/testcases/events_only/models.js
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore: Unused imports
 import type * as more$0 from "./generator/testcases/no_bindings_here/more/models.js";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore: Unused imports
-import type * as application$0 from "../pkg/application/models.js";
 
 declare module "/wails/runtime.js" {
     namespace Events {
         interface CustomEvents {
             "events_only:class": events_only$0.SomeClass;
             "events_only:map": { [_: string]: number[] | null } | null;
-            "events_only:nodata": application$0.Void;
+            "events_only:nodata": void;
             "events_only:other": more$0.StringPtr[] | null;
             "events_only:string": string;
             "interface": json$0.Marshaler;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts
deleted file mode 100644
index bbfb139c9..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-export type {
-    Void
-} from "./models.js";
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts
deleted file mode 100644
index a8b4d1499..000000000
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/github.com/wailsapp/wails/v3/pkg/application/models.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
-// This file is automatically generated. DO NOT EDIT
-
-/**
- * Void will be translated by the binding generator to the TypeScript type 'void'.
- * It can be used as an event data type to register events that must not have any associated data.
- */
-export type Void = any;
diff --git a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/warnings.log b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/warnings.log
index 1dd21c91d..ce8369307 100644
--- a/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/warnings.log
+++ b/v3/internal/generator/testdata/output/lang=TS/UseInterfaces=true/UseNames=true/warnings.log
@@ -1,7 +1,6 @@
 [warn] /testcases/complex_json/main.go:127:2: event 'collision' has one of multiple definitions here with data type map[string]int
 [warn] /testcases/events_only/events.go:20:2: event 'collision' has one of multiple definitions here with data type int
 [warn] /testcases/events_only/events.go:21:2: `application.RegisterEvent` called here with non-constant event name
-[warn] /testcases/events_only/events.go:25:2: data type github.com/wailsapp/wails/v3/pkg/application.Void for event 'events_only:nodata' is a non-empty interface: emitting events from the frontend with data other than `null` is not supported by encoding/json and will likely result in runtime errors
 [warn] /testcases/events_only/other.go:10:5: `application.RegisterEvent` is instantiated here but not called
 [warn] /testcases/events_only/other.go:13:2: `application.RegisterEvent` called here with non-constant event name
 [warn] /testcases/events_only/other.go:17:2: data type []T for event 'parametric' contains unresolved type parameters and will be ignored`
diff --git a/v3/internal/generator/testdata/package-lock.json b/v3/internal/generator/testdata/package-lock.json
index 0e30f5fd3..80f5e0882 100644
--- a/v3/internal/generator/testdata/package-lock.json
+++ b/v3/internal/generator/testdata/package-lock.json
@@ -1675,6 +1675,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -2226,6 +2227,7 @@
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"