From 8b424152d9aafefeed7819a3b7c8c3d5a9fb30b5 Mon Sep 17 00:00:00 2001
From: EricApostal <eaposta@ncsu.edu>
Date: Thu, 19 Dec 2024 10:07:12 -0500
Subject: [PATCH] remove submodules, remove webview_cef depend from macos and
 windows

---
 .github/workflows/build.yml     | 22 +++++++++++-----------
 .gitmodules                     | 12 ------------
 bonfire/pubspec.lock            |  7 +++----
 bonfire/windows/runner/main.cpp |  3 ---
 webview_cef                     |  1 +
 5 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 .gitmodules
 create mode 160000 webview_cef

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5a94da6d..3d2cdc8d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,17 +98,17 @@ jobs:
             & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\InstallCleanup.exe"
           shell: pwsh
 
-        - name: Install Visual Studio 2022 Enterprise
-          run: |
-            Invoke-WebRequest -Uri https://aka.ms/vs/17/release.ltsc.17.10/vs_enterprise.exe -OutFile vs_enterprise.exe
-            $process = Start-Process -FilePath '.\vs_enterprise.exe' -ArgumentList "--add", "Microsoft.VisualStudio.Workload.Azure", "--quiet", "--norestart", "--wait", "--includeRecommended" -Wait -PassThru
-            Write-Output $process.ExitCode
-            $process = Start-Process -FilePath '.\vs_enterprise.exe' -ArgumentList "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", "--quiet", "--norestart", "--wait", "--includeRecommended" -Wait -PassThru
-            Write-Output $process.ExitCode
-          shell: pwsh
-
-        - name: Set up Visual Studio
-          uses: microsoft/setup-msbuild@v1.1
+        # - name: Install Visual Studio 2022 Enterprise
+        #   run: |
+        #     Invoke-WebRequest -Uri https://aka.ms/vs/17/release.ltsc.17.10/vs_enterprise.exe -OutFile vs_enterprise.exe
+        #     $process = Start-Process -FilePath '.\vs_enterprise.exe' -ArgumentList "--add", "Microsoft.VisualStudio.Workload.Azure", "--quiet", "--norestart", "--wait", "--includeRecommended" -Wait -PassThru
+        #     Write-Output $process.ExitCode
+        #     $process = Start-Process -FilePath '.\vs_enterprise.exe' -ArgumentList "--add", "Microsoft.VisualStudio.Workload.NativeDesktop", "--quiet", "--norestart", "--wait", "--includeRecommended" -Wait -PassThru
+        #     Write-Output $process.ExitCode
+        #   shell: pwsh
+
+        # - name: Set up Visual Studio
+        #   uses: microsoft/setup-msbuild@v1.1
 
         - name: Set up Flutter
           uses: subosito/flutter-action@v2
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 3d32e728..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "firebridge"]
-	path = firebridge
-	url = https://github.com/OpenBonfire/firebridge
-[submodule "fireview"]
-	path = fireview
-	url = https://github.com/EricApostal/fireview
-[submodule "firebridge_extensions"]
-	path = firebridge_extensions
-	url = https://github.com/OpenBonfire/firebridge_extensions
-[submodule "markdown_viewer"]
-	path = markdown_viewer
-	url = https://github.com/OpenBonfire/markdown_viewer
diff --git a/bonfire/pubspec.lock b/bonfire/pubspec.lock
index 7f0194bf..4fb30ad8 100644
--- a/bonfire/pubspec.lock
+++ b/bonfire/pubspec.lock
@@ -1930,10 +1930,9 @@ packages:
   webview_cef:
     dependency: transitive
     description:
-      name: webview_cef
-      sha256: "2e660bf593dc1168beb7b765dd477a703e0b29968669f017e178c2c716f6437f"
-      url: "https://pub.dev"
-    source: hosted
+      path: "../webview_cef"
+      relative: true
+    source: path
     version: "0.2.2"
   webview_flutter:
     dependency: transitive
diff --git a/bonfire/windows/runner/main.cpp b/bonfire/windows/runner/main.cpp
index 6d3636cb..e46ca4ef 100644
--- a/bonfire/windows/runner/main.cpp
+++ b/bonfire/windows/runner/main.cpp
@@ -12,7 +12,6 @@ auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP);
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
                       _In_ wchar_t *command_line, _In_ int show_command)
 {
-  initCEFProcesses();
   // Attach to console when present (e.g., 'flutter run') or create a
   // new console when running with a debugger.
   if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent())
@@ -45,8 +44,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   {
     ::TranslateMessage(&msg);
     ::DispatchMessage(&msg);
-
-    handleWndProcForCEF(msg.hwnd, msg.message, msg.wParam, msg.lParam);
   }
 
   ::CoUninitialize();
diff --git a/webview_cef b/webview_cef
new file mode 160000
index 00000000..ebd53198
--- /dev/null
+++ b/webview_cef
@@ -0,0 +1 @@
+Subproject commit ebd531984ae59663a1b5e8f154214106a0a4d7c2