Merge branch 'master' into 'release'

Voltstro · Voltstro · commit 960a2a7ad0c5 · 2025-07-19T23:25:30.000+10:00
Release 2.2.7

See merge request voltstro-studios/uwb/unitywebbrowser!31
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.7] - 2025-07-19
+
+### Changed
+
+- Update CEF to 137.0.19
+- Bump deps
+
+### Fixed
+
+- Fix not all code paths return a value (#400)
+- Fix some key events not working (#412)
 
 ## [2.2.6] - 2025-02-23
 
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ Unity 2021.3.x
 
 ### Install
 
-1. Setup [VoltUPM](https://github.com/Voltstro/VoltstroUPM#setup)
-2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPM
+1. Setup [VoltUPR](https://upr.voltstro.dev/-/web/about)
+2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPR
 3. Install UnityWebBrowser packages
 
 For a more in-depth installation guide, check out the [setup article](https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/setup/).
diff --git a/docs/articles/dev/publishing.md b/docs/articles/dev/publishing.md
@@ -26,13 +26,13 @@ A PR to the `release` branch should be created. Follow standard PR review proces
 
 Once merged to the `release` branch, wait for CI to complete build. The CI will output the different packages compiled as artifacts. Downloads the artifacts as they will need to be pushed.
 
-## Push to VoltUPM
+## Push to VoltUPR
 
-Use npm to push to VoltUPM.
+Use npm to push to VoltUPR.
 
 > [!NOTE]
 > 
-> Cloudflare does not allow uploads of 100MB or larger. Some packages are larger. Add VoltUPM's server ip to `/etc/hosts`, then push. Ensure VoltUPM's server firewall has whitelisted IP from where push will be done.
+> Cloudflare does not allow uploads of 100MB or larger. Some packages are larger. Add VoltUPR's server ip to `/etc/hosts`, then push. Ensure VoltUPR's server firewall has whitelisted IP from where push will be done.
 
 ## Git Tagging
 
diff --git a/docs/articles/user/setup.md b/docs/articles/user/setup.md
@@ -19,31 +19,31 @@ At a base level, UWB supports all major desktop platforms (Windows, Linux and Ma
 >
 > UWB does however support being code trimmed.
 
-## VoltUPM Setup
+## VoltUPR Setup
 
-VoltUPM is a Unity registry that we provide for hosting some of our packages, including all of UWB's packages. To use it, your project needs to be configured to use the VoltUPM registry.
+VoltUPR is a custom Unity registry that we provide for hosting some of our packages, including all of UWB's packages. To use it, your project needs to be configured to use the VoltUPR registry.
 
-To setup the registry with your project, [see here](https://github.com/Voltstro/VoltstroUPM#setup). The VoltUPM page also lists some other info that you may be interested in.
+To setup the registry with your project, [see here](https://upr.voltstro.dev/-/web/about). The VoltUPR page also lists some other info that you may be interested in.
 
 **HOWEVER**, an additional scope needs to be added. You need to make sure `com.cysharp.unitask` is added (more details are provided in the [UniTask part](#unitask)). Once you are done configuring your projects registries, your configuration should look like:
 
 ![Registry](~/assets/images/articles/user/setup/Registry.webp)
 
 > [!NOTE]
-> If you are using [UnityNuGet](https://github.com/xoofx/UnityNuGet), and you choose not to use VoltUPM as a `org.nuget.*` scope mirror, then don't have the `org.nuget` scope defined for VoltUPM.
+> If you are using [UnityNuGet](https://github.com/bdovaz/UnityNuGet) already, and you choose not to use VoltUPR as a `org.nuget.*` scope mirror, then don't have the `org.nuget` scope defined for VoltUPR.
 
 ### UniTask
 
-The reason why we need to add the additional `com.cysharp.unitask` scope to VoltUPM is because UWB depends on [UniTask](https://github.com/Cysharp/UniTask). VoltUPM does provide a mirror copy of UniTask (from OpenUPM),
+The reason why we need to add the additional `com.cysharp.unitask` scope to VoltUPR is because UWB depends on [UniTask](https://github.com/Cysharp/UniTask). VoltUPR does provide a mirror copy of UniTask (from OpenUPM),
 however you may already have UniTask installed either via [OpenUPM](https://openupm.com/packages/com.cysharp.unitask/), or via [Git](https://github.com/Cysharp/UniTask#install-via-git-url). If you do have it installed already,
-and you don't want to use VoltUPM's mirror of it, then DO NOT define the additional scope as apart of VoltUPM.
+and you don't want to use VoltUPR's mirror of it, then DO NOT define the additional scope as apart of VoltUPR.
 
 > [!WARNING]
 > If you already have UniTask installed via Git, please make sure it is the latest version!
 
 ## Packages Installation
 
-Once you have VoltUPM registry added to your project, you can install the packages via the Unity package manager GUI.
+Once you have VoltUPR registry added to your project, you can install the packages via the Unity package manager GUI.
 
 ![Packages](~/assets/images/articles/user/setup/Packages.webp)
 
diff --git a/docs/assets/images/articles/user/setup/Packages.webp b/docs/assets/images/articles/user/setup/Packages.webp
diff --git a/docs/assets/images/articles/user/setup/Registry.webp b/docs/assets/images/articles/user/setup/Registry.webp
diff --git a/docs/assets/images/articles/user/setup/StandardPackages.webp b/docs/assets/images/articles/user/setup/StandardPackages.webp
diff --git a/renovate.json b/renovate.json
@@ -3,5 +3,9 @@
   "assignees": ["voltstro"],
   "ignorePaths": [
     "src/Packages/**"
+  ],
+  "timezone": "Australia/Brisbane",
+  "schedule": [
+    "* * 1 * *"
   ]
 }
diff --git a/src/Packages/UnityWebBrowser.Communication.Pipes/package.json b/src/Packages/UnityWebBrowser.Communication.Pipes/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.communication.pipes",
   "displayName": "Unity Web Browser Pipes Communication",
   "description": "Adds support to use pipes in UWB.",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -18,7 +18,7 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser": "2.2.6",
+    "dev.voltstro.unitywebbrowser": "2.2.7",
     "org.nuget.voltrpc.communication.pipes": "3.1.0"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.linux.x64",
   "displayName": "Unity Web Browser CEF Engine (Linux x64)",
   "description": "CEF engine for Unity Web Browser (Linux x64).",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.7"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.macos.arm64",
   "displayName": "Unity Web Browser CEF Engine (MacOS arm64)",
   "description": "CEF engine for Unity Web Browser (MacOS arm64).",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.7"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.MacOS-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.macos.x64",
   "displayName": "Unity Web Browser CEF Engine (MacOS x64)",
   "description": "CEF engine for Unity Web Browser (MacOS x64).",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.7"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/package.json b/src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef.win.x64",
   "displayName": "Unity Web Browser CEF Engine (Win x64)",
   "description": "CEF engine for Unity Web Browser (Win x64).",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -17,6 +17,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.7"
   }
 }
diff --git a/src/Packages/UnityWebBrowser.Engine.Cef/package.json b/src/Packages/UnityWebBrowser.Engine.Cef/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser.engine.cef",
   "displayName": "Unity Web Browser CEF Engine",
   "description": "CEF engine for Unity Web Browser.",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -18,6 +18,6 @@
   "documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
   "licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
   "dependencies": {
-    "dev.voltstro.unitywebbrowser": "2.2.6"
+    "dev.voltstro.unitywebbrowser": "2.2.7"
   }
 }
diff --git a/src/Packages/UnityWebBrowser/README.md b/src/Packages/UnityWebBrowser/README.md
@@ -27,8 +27,8 @@ Unity 2021.3.x
 
 ### Install
 
-1. Setup [VoltUPM](https://github.com/Voltstro/VoltstroUPM#setup)
-2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPM
+1. Setup [VoltUPR](https://upr.voltstro.dev/-/web/about)
+2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPR
 3. Install UnityWebBrowser packages
 
 For a more in-depth installation guide, check out the [setup article](https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/setup/).
diff --git a/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs b/src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.6")]
-[assembly: AssemblyFileVersion("2.2.6")]
+[assembly: AssemblyVersion("2.2.7")]
+[assembly: AssemblyFileVersion("2.2.7")]
 
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
 [assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]
diff --git a/src/Packages/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs b/src/Packages/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs
@@ -146,6 +146,8 @@ public static Platform GetRunningPlatform()
             return Platform.Linux64;
 #elif UNITY_STANDALONE_OSX
             return System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64 ? Platform.MacOSArm64 : Platform.MacOS;
+#else
+            throw new PlatformNotSupportedException();
 #endif
         }
         
@@ -185,4 +187,4 @@ internal static void SetAllTextureColorToOne(Texture2D texture, Color32 color)
             texture.Apply();
         }
     }
-}
+}
diff --git a/src/Packages/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs b/src/Packages/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs
@@ -114,10 +114,13 @@ public static WindowsKey UnityKeyCodeToWindowKey(this KeyCode key)
                     return WindowsKey.OemQuotes;
                 case KeyCode.Quote:
                     return WindowsKey.OemQuotes;
+                case KeyCode.LeftBracket:
                 case KeyCode.LeftParen:
                     return WindowsKey.OemOpenBrackets;
+                case KeyCode.RightBracket:
                 case KeyCode.RightParen:
                     return WindowsKey.OemCloseBrackets;
+                case KeyCode.Equals:
                 case KeyCode.Plus:
                     return WindowsKey.Oemplus;
                 case KeyCode.Comma:
@@ -129,25 +132,23 @@ public static WindowsKey UnityKeyCodeToWindowKey(this KeyCode key)
                 case KeyCode.Semicolon:
                     return WindowsKey.OemSemicolon;
                 case KeyCode.RightShift:
-                    return WindowsKey.RShiftKey;
                 case KeyCode.LeftShift:
-                    return WindowsKey.LShiftKey;
+                    return WindowsKey.ShiftKey;
                 case KeyCode.RightControl:
-                    return WindowsKey.RControlKey;
                 case KeyCode.LeftControl:
-                    return WindowsKey.LControlKey;
+                    return WindowsKey.ControlKey;
                 case KeyCode.RightAlt:
-                    return WindowsKey.Alt;
                 case KeyCode.LeftAlt:
-                    return WindowsKey.Alt;
+                    return WindowsKey.Menu;
                 case KeyCode.Print:
                     return WindowsKey.Print;
                 case KeyCode.Backslash:
-                    return WindowsKey.OemBackslash;
+                    return WindowsKey.Oem5;
                 case KeyCode.Slash:
                     return WindowsKey.OemQuestion;
+                case KeyCode.BackQuote:
                 case KeyCode.Tilde:
-                    return WindowsKey.Oemtilde;
+                    return WindowsKey.Oem3;
                 
                 case KeyCode.Alpha1:
                     return WindowsKey.D1;
@@ -265,16 +266,14 @@ public static WindowsKey UnityKeyToWindowKey(this Key key)
                     return WindowsKey.Oemplus;
                 
                 case Key.LeftShift:
-                    return WindowsKey.LShiftKey;
                 case Key.RightShift:
-                    return WindowsKey.RShiftKey;
+                    return WindowsKey.ShiftKey;
                 case Key.RightAlt:
                 case Key.LeftAlt:
-                    return WindowsKey.Alt;
+                    return WindowsKey.Menu;
                 case Key.LeftCtrl:
-                    return WindowsKey.LControlKey;
                 case Key.RightCtrl:
-                    return WindowsKey.RControlKey;
+                    return WindowsKey.ControlKey;
                 
                 case Key.Escape:
                     return WindowsKey.Escape;
@@ -309,7 +308,7 @@ public static WindowsKey UnityKeyToWindowKey(this Key key)
                     return WindowsKey.Pause;
                 
                 case Key.Backslash:
-                    return WindowsKey.OemBackslash;
+                    return WindowsKey.Oem5;
                 case Key.Slash:
                     return WindowsKey.OemQuestion;
                 
@@ -347,7 +346,7 @@ public static WindowsKey UnityKeyToWindowKey(this Key key)
                     return WindowsKey.NumPad9;
                 
                 case Key.Backquote:
-                    return WindowsKey.Oemtilde;
+                    return WindowsKey.Oem3;
                 case Key.F1:
                     return WindowsKey.F1;
                 case Key.F2:
diff --git a/src/Packages/UnityWebBrowser/package.json b/src/Packages/UnityWebBrowser/package.json
@@ -2,7 +2,7 @@
   "name": "dev.voltstro.unitywebbrowser",
   "displayName": "Unity Web Browser",
   "description": "Unity Web Browser (UWB) is a Unity package that allows displaying and interacting with the web from within Unity.",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
diff --git a/src/ThirdParty/CefGlue b/src/ThirdParty/CefGlue
@@ -1 +1 @@
-Subproject commit 26390789852e7316b7e9decfb7fa2f1eaa4714ef
+Subproject commit 8e03f22232177c98c47bdfa9145809e7a3b1559e
diff --git a/src/UnityWebBrowser.Engine.Cef/version.json b/src/UnityWebBrowser.Engine.Cef/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.2.6+13342",
+  "version": "2.2.6+7151",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],
diff --git a/src/UnityWebBrowser.Pages/package.json b/src/UnityWebBrowser.Pages/package.json
@@ -15,7 +15,7 @@
     "vite-plugin-minify": "^2.1.0",
     "vite-plugin-singlefile": "^2.1.0"
   },
-  "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
+  "packageManager": "pnpm@10.13.1",
   "pnpm": {
     "onlyBuiltDependencies": [
       "esbuild"
diff --git a/src/UnityWebBrowser.Pages/pnpm-lock.yaml b/src/UnityWebBrowser.Pages/pnpm-lock.yaml
diff --git a/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json b/src/UnityWebBrowser.UnityProject/Packages/packages-lock.json
diff --git a/src/VoltstroStudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj b/src/VoltstroStudios.UnityWebBrowser.Engine.Shared/VoltstroStudios.UnityWebBrowser.Engine.Shared.csproj
diff --git a/src/VoltstroStudios.UnityWebBrowser.Tests/VoltstroStudios.UnityWebBrowser.Tests.csproj b/src/VoltstroStudios.UnityWebBrowser.Tests/VoltstroStudios.UnityWebBrowser.Tests.csproj
diff --git a/src/version.json b/src/version.json

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,9 @@`
`3`	`3`	`"assignees": ["voltstro"],`
`4`	`4`	`"ignorePaths": [`
`5`	`5`	`"src/Packages/**"`
	`6`	`+ ],`
	`7`	`+ "timezone": "Australia/Brisbane",`
	`8`	`+ "schedule": [`
	`9`	`+ "* * 1 * *"`
`6`	`10`	`]`
`7`	`11`	`}`