Merge CfxUI update (mr-911)

06efa44 - feat(ext/ui): 2026.2 update
73e1e4b - fix(nui-core): trust ui_url overrides

Author: prikolium-cfx

.gitattributes

@@ -27,5 +27,3 @@ code/components/voip-mumble/include/lib*/** linguist-vendored
 ext/natives/natives_stash/* linguist-generated
 *.p linguist-generated
 
-# ensure cfx-ui is using autocrlf
-ext/cfx-ui/** text=auto

code/components/nui-core/src/NUIClient.cpp

@@ -34,13 +34,18 @@ static nui::IAudioSink* g_audioSink;
 
 static bool IsTrustedEntitlementFrame(const std::string& frameUrl)
 {
+	static ConVar<std::string> uiUrlVar("ui_url", ConVar_UserPref, "https://nui-game-internal/ui/app/index.html");
+	if (boost::algorithm::starts_with(frameUrl, uiUrlVar.GetValue()))
+	{
+		return true;
+	}
+
 	if (frameUrl.empty())
 	{
 		return false;
 	}
 
 	CefURLParts urlParts;
-
 	if (!CefParseURL(frameUrl, urlParts))
 	{
 		return false;

code/tools/build/run_postbuild.ps1

@@ -58,12 +58,12 @@ if ($Game -eq "server") {
 if (!$IsServer) {
     ## build UI
     Push-Location $WorkDir
-    $UICommit = (git rev-list -1 HEAD ext/ui-build/ ext/cfx-ui/)
+    $UICommit = (git rev-list -1 HEAD ext/ui-build/)
     Pop-Location
 
     Push-Location $WorkDir\ext\ui-build
     if (!(Test-Path data\.commit) -or $UICommit -ne (Get-Content data\.commit)) {
-        .\build.cmd | Out-Null
+        .\build.cmd $Game | Out-Null
 
         $UICommit | Out-File -Encoding ascii -NoNewline data\.commit
     }

code/tools/ci/psm1/cfxBuildUI.psm1

@@ -15,13 +15,10 @@ function Invoke-BuildUI {
         $haveNewerCommit = $Versions.UICommit -ne (Get-Content -ErrorAction Ignore $lastBuiltCommitFile)
 
         if (!$havePreviouslyBuiltArtifacts -or $haveNewerCommit) {
-            cmd /c build.cmd
+            cmd /c build.cmd $($Context.PremakeGameName)
             Test-LastExitCode "Failed to build CfxUI"
 
             $Versions.UICommit | Out-File -Encoding ascii -NoNewline $lastBuiltCommitFile
-
-            # delete node_modules to avoid them polluting the build cache
-            Remove-Item -Recurse -Force $Context.getPathInProject("ext\cfx-ui\node_modules")
         } else {
             Write-Output "Skipping UI build: existing artifacts are up to date"
         }

code/tools/ci/psm1/cfxVersions.psm1

@@ -96,7 +96,6 @@ function Get-CfxVersions {
         $versions.SDK = ((git rev-list $versions.SDKCommit | measure-object).Count * 10) + 1100000
 
         $UIPaths = @(
-            "ext/cfx-ui/"
             "ext/ui-build/"
         )
         $versions.UICommit = (git rev-list -1 HEAD $UIPaths)

ext/README.md

@@ -1,17 +1,16 @@
-# CitizenFX External Projects
-
-This directory contains external projects which are _generally_ part of the core build in some way, but not considered
-part of the main project.
-
-## ext/
-* [**cfx-ui/**](./cfx-ui): The main menu interface for the game clients.
-* [**event-doc-gen/**](./event-doc-gen): Generation tooling for _event_ documentation.
-* [**native-decls/**](./native-decls): Native function declarations for `CFX/` natives defined in the main project.
-* [**native-doc-gen/**](./native-doc-gen): Scripts to generate `native-decls` using the `native-doc-tooling` submodule.
-* [**native-doc-tooling/**](./native-doc-tooling): A submodule for the latest version of `native-doc-tooling`, which is used to generate native definitions from the documentation in `native-decls`.
-* [**natives/**](./natives): Code generation tooling to convert a native function database in 'intermediate' Lua format to runnable Lua/JS/C# and other intermediate formats.
-* [**nuget/**](./nuget): Build files for the `CitizenFX.Core.Client` and `CitizenFX.Core.Server` NuGet packages.
-* [**symbol-upload/**](./symbol-upload): A tool to collect Linux build symbols to upload to a .NET Core-style symbol server.
-* [**system-resources/**](./system-resources): System resources bundled with FXServer by default.
-* [**typings/**](./typings): Build files for the `@citizenfx/client` and `@citizenfx/server` NPM packages.
+# CitizenFX External Projects
+
+This directory contains external projects which are _generally_ part of the core build in some way, but not considered
+part of the main project.
+
+## ext/
+* [**event-doc-gen/**](./event-doc-gen): Generation tooling for _event_ documentation.
+* [**native-decls/**](./native-decls): Native function declarations for `CFX/` natives defined in the main project.
+* [**native-doc-gen/**](./native-doc-gen): Scripts to generate `native-decls` using the `native-doc-tooling` submodule.
+* [**native-doc-tooling/**](./native-doc-tooling): A submodule for the latest version of `native-doc-tooling`, which is used to generate native definitions from the documentation in `native-decls`.
+* [**natives/**](./natives): Code generation tooling to convert a native function database in 'intermediate' Lua format to runnable Lua/JS/C# and other intermediate formats.
+* [**nuget/**](./nuget): Build files for the `CitizenFX.Core.Client` and `CitizenFX.Core.Server` NuGet packages.
+* [**symbol-upload/**](./symbol-upload): A tool to collect Linux build symbols to upload to a .NET Core-style symbol server.
+* [**system-resources/**](./system-resources): System resources bundled with FXServer by default.
+* [**typings/**](./typings): Build files for the `@citizenfx/client` and `@citizenfx/server` NPM packages.
 * [**ui-build/**](./ui-build): Scripts and data files for building `citizen/ui.zip` including root helpers, legacy UI scripts and a packed version of `cfx-ui`.