Only use wasm build tag and not js

Jacalz · Jan 1, 2024 · dfef916 · dfef916
1 parent b4f8d64
commit dfef916
Show file tree

Hide file tree

Showing 41 changed files with 77 additions and 82 deletions.
diff --git a/app/app_darwin.go b/app/app_darwin.go
@@ -1,5 +1,5 @@
-//go:build !ci && !js && !wasm && !test_web_driver
-// +build !ci,!js,!wasm,!test_web_driver
+//go:build !ci && !wasm && !test_web_driver
+// +build !ci,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/app_desktop_darwin.go b/app/app_desktop_darwin.go
@@ -1,5 +1,5 @@
-//go:build !ci && !ios && !js && !wasm && !test_web_driver
-// +build !ci,!ios,!js,!wasm,!test_web_driver
+//go:build !ci && !ios && !wasm && !test_web_driver
+// +build !ci,!ios,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/app_goxjs.go b/app/app_goxjs.go
@@ -1,7 +1,7 @@
-//go:build !ci && (!android || !ios || !mobile) && (js || wasm || test_web_driver)
+//go:build !ci && (!android || !ios || !mobile) && (wasm || test_web_driver)
 // +build !ci
 // +build !android !ios !mobile
-// +build js wasm test_web_driver
+// +build wasm test_web_driver
 
 package app
 

diff --git a/app/app_notlegacy_darwin.go b/app/app_notlegacy_darwin.go
@@ -1,5 +1,5 @@
-//go:build !ci && !legacy && !js && !wasm && !test_web_driver
-// +build !ci,!legacy,!js,!wasm,!test_web_driver
+//go:build !ci && !legacy && !wasm && !test_web_driver
+// +build !ci,!legacy,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/app_openurl_web.go b/app/app_openurl_web.go
@@ -1,5 +1,5 @@
-//go:build !ci && !js && !wasm && test_web_driver
-// +build !ci,!js,!wasm,test_web_driver
+//go:build !ci && !wasm && test_web_driver
+// +build !ci,!wasm,test_web_driver
 
 package app
 

diff --git a/app/app_other.go b/app/app_other.go
@@ -1,5 +1,5 @@
-//go:build ci || (!linux && !darwin && !windows && !freebsd && !openbsd && !netbsd && !js && !wasm && !test_web_driver)
-// +build ci !linux,!darwin,!windows,!freebsd,!openbsd,!netbsd,!js,!wasm,!test_web_driver
+//go:build ci || (!linux && !darwin && !windows && !freebsd && !openbsd && !netbsd && !wasm && !test_web_driver)
+// +build ci !linux,!darwin,!windows,!freebsd,!openbsd,!netbsd,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/app_theme_web.go b/app/app_theme_web.go
@@ -1,5 +1,5 @@
-//go:build !ci && !js && !wasm && test_web_driver
-// +build !ci,!js,!wasm,test_web_driver
+//go:build !ci && !wasm && test_web_driver
+// +build !ci,!wasm,test_web_driver
 
 package app
 

diff --git a/app/app_windows.go b/app/app_windows.go
@@ -1,5 +1,5 @@
-//go:build !ci && !js && !android && !ios && !wasm && !test_web_driver
-// +build !ci,!js,!android,!ios,!wasm,!test_web_driver
+//go:build !ci && !android && !ios && !wasm && !test_web_driver
+// +build !ci,!android,!ios,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/app_xdg.go b/app/app_xdg.go
@@ -1,6 +1,5 @@
-//go:build !ci && !js && !wasm && !test_web_driver && (linux || openbsd || freebsd || netbsd) && !android
+//go:build !ci && !wasm && !test_web_driver && (linux || openbsd || freebsd || netbsd) && !android
 // +build !ci
-// +build !js
 // +build !wasm
 // +build !test_web_driver
 // +build linux openbsd freebsd netbsd

diff --git a/app/settings_desktop.go b/app/settings_desktop.go
@@ -1,5 +1,5 @@
-//go:build !android && !ios && !mobile && !js && !wasm && !test_web_driver
-// +build !android,!ios,!mobile,!js,!wasm,!test_web_driver
+//go:build !android && !ios && !mobile && !wasm && !test_web_driver
+// +build !android,!ios,!mobile,!wasm,!test_web_driver
 
 package app
 

diff --git a/app/settings_file.go b/app/settings_file.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package app
 

diff --git a/app/settings_goxjs.go b/app/settings_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package app
 

diff --git a/internal/cache/texture_desktop.go b/internal/cache/texture_desktop.go
@@ -1,5 +1,5 @@
-//go:build !android && !ios && !mobile && !js && !wasm && !test_web_driver
-// +build !android,!ios,!mobile,!js,!wasm,!test_web_driver
+//go:build !android && !ios && !mobile && !wasm && !test_web_driver
+// +build !android,!ios,!mobile,!wasm,!test_web_driver
 
 package cache
 

diff --git a/internal/cache/texture_goxjs.go b/internal/cache/texture_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package cache
 

diff --git a/internal/driver/glfw/clipboard.go b/internal/driver/glfw/clipboard.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/clipboard_goxjs.go b/internal/driver/glfw/clipboard_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/device_desktop.go b/internal/driver/glfw/device_desktop.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm
-// +build !js,!wasm
+//go:build !wasm
+// +build !wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/device_goxjs.go b/internal/driver/glfw/device_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm
-// +build js wasm
+//go:build wasm
+// +build wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/device_test.go b/internal/driver/glfw/device_test.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm
-// +build !js,!wasm
+//go:build !wasm
+// +build !wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/driver_desktop.go b/internal/driver/glfw/driver_desktop.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/driver_goxjs.go b/internal/driver/glfw/driver_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js
-// +build js
+//go:build wasm
+// +build wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/driver_web.go b/internal/driver/glfw/driver_web.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/glfw_core.go b/internal/driver/glfw/glfw_core.go
@@ -1,6 +1,5 @@
-//go:build ((!gles && !arm && !arm64) || darwin) && !js && !wasm && !test_web_driver
+//go:build ((!gles && !arm && !arm64) || darwin) && !wasm && !test_web_driver
 // +build !gles,!arm,!arm64 darwin
-// +build !js
 // +build !wasm
 // +build !test_web_driver
 

diff --git a/internal/driver/glfw/glfw_es.go b/internal/driver/glfw/glfw_es.go
@@ -1,7 +1,6 @@
-//go:build (gles || arm || arm64) && !darwin && !js && !wasm && !test_web_driver
+//go:build (gles || arm || arm64) && !darwin && !wasm && !test_web_driver
 // +build gles arm arm64
 // +build !darwin
-// +build !js
 // +build !wasm
 // +build !test_web_driver
 

diff --git a/internal/driver/glfw/glfw_goxjs.go b/internal/driver/glfw/glfw_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/loop_desktop.go b/internal/driver/glfw/loop_desktop.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/loop_goxjs.go b/internal/driver/glfw/loop_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/menu_darwin.go b/internal/driver/glfw/menu_darwin.go
@@ -1,5 +1,5 @@
-//go:build !no_native_menus && !js && !wasm && !test_web_driver
-// +build !no_native_menus,!js,!wasm,!test_web_driver
+//go:build !no_native_menus && !wasm && !test_web_driver
+// +build !no_native_menus,!wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/menu_notweb.go b/internal/driver/glfw/menu_notweb.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/menu_other.go b/internal/driver/glfw/menu_other.go
@@ -1,5 +1,5 @@
-//go:build !darwin || js || wasm || test_web_driver || no_native_menus
-// +build !darwin js wasm test_web_driver no_native_menus
+//go:build !darwin || wasm || test_web_driver || no_native_menus
+// +build !darwin wasm test_web_driver no_native_menus
 
 package glfw
 

diff --git a/internal/driver/glfw/menu_web.go b/internal/driver/glfw/menu_web.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/shortcuts_other.go b/internal/driver/glfw/shortcuts_other.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm
-// +build !js,!wasm
+//go:build !wasm
+// +build !wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/shortcuts_wasm.go b/internal/driver/glfw/shortcuts_wasm.go
@@ -1,5 +1,5 @@
-//go:build js && wasm
-// +build js,wasm
+//go:build wasm
+// +build wasm
 
 package glfw
 

diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/window_desktop_test.go b/internal/driver/glfw/window_desktop_test.go
@@ -1,5 +1,5 @@
-//go:build !js && !wasm && !test_web_driver
-// +build !js,!wasm,!test_web_driver
+//go:build !wasm && !test_web_driver
+// +build !wasm,!test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/window_goxjs.go b/internal/driver/glfw/window_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package glfw
 

diff --git a/internal/driver/glfw/window_x11.go b/internal/driver/glfw/window_x11.go
@@ -1,7 +1,6 @@
-//go:build !wayland && (linux || freebsd || openbsd || netbsd) && !js && !wasm && !test_web_driver
+//go:build !wayland && (linux || freebsd || openbsd || netbsd) && !wasm && !test_web_driver
 // +build !wayland
 // +build linux freebsd openbsd netbsd
-// +build !js
 // +build !wasm
 // +build !test_web_driver
 

diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go
@@ -1,5 +1,5 @@
-//go:build (!gles && !arm && !arm64 && !android && !ios && !mobile && !js && !test_web_driver && !wasm) || (darwin && !mobile && !ios && !js && !wasm && !test_web_driver)
-// +build !gles,!arm,!arm64,!android,!ios,!mobile,!js,!test_web_driver,!wasm darwin,!mobile,!ios,!js,!wasm,!test_web_driver
+//go:build (!gles && !arm && !arm64 && !android && !ios && !mobile && !test_web_driver && !wasm) || (darwin && !mobile && !ios && !wasm && !test_web_driver)
+// +build !gles,!arm,!arm64,!android,!ios,!mobile,!test_web_driver,!wasm darwin,!mobile,!ios,!wasm,!test_web_driver
 
 package gl
 

diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go
@@ -1,10 +1,9 @@
-//go:build (gles || arm || arm64) && !android && !ios && !mobile && !darwin && !js && !wasm && !test_web_driver
+//go:build (gles || arm || arm64) && !android && !ios && !mobile && !darwin && !wasm && !test_web_driver
 // +build gles arm arm64
 // +build !android
 // +build !ios
 // +build !mobile
 // +build !darwin
-// +build !js
 // +build !wasm
 // +build !test_web_driver
 

diff --git a/internal/painter/gl/gl_gomobile.go b/internal/painter/gl/gl_gomobile.go
@@ -1,6 +1,6 @@
-//go:build (android || ios || mobile) && (!js || !wasm || !test_web_driver)
+//go:build (android || ios || mobile) && (!wasm || !test_web_driver)
 // +build android ios mobile
-// +build !js !wasm !test_web_driver
+// +build !wasm !test_web_driver
 
 package gl
 

diff --git a/internal/painter/gl/gl_goxjs.go b/internal/painter/gl/gl_goxjs.go
@@ -1,5 +1,5 @@
-//go:build js || wasm || test_web_driver
-// +build js wasm test_web_driver
+//go:build wasm || test_web_driver
+// +build wasm test_web_driver
 
 package gl