windowpp 0.1.7 → 0.1.9

package/framework/src/FileSystem/Windows/filesearch.cpp

@@ -3,8 +3,12 @@
 //  Handles:  fs:exists, fs:stat, fs:readDir, fs:searchFiles
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 #include <filesystem>

package/framework/src/FileSystem/Windows/readfile.cpp

@@ -3,8 +3,12 @@
 //  Handles:  fs:readFile, fs:readBinaryFile
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 #include <fstream>

package/framework/src/FileSystem/Windows/savefile.cpp

@@ -5,8 +5,12 @@
 //            fs:createDir, fs:removeDir
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <shellapi.h>
 

package/framework/src/filedrop/filedrop.cpp

@@ -9,7 +9,9 @@
 #include <iostream>
 
 #ifdef _WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #include <shlobj.h>
 #include <objidl.h>

package/framework/src/platform/win32/app_win32.cpp

@@ -2,8 +2,12 @@
 //  app_win32.cpp — Win32 Application implementation
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include "app_win32.h"
 #include "window_win32.h"
 #include "win32_helpers.h"

package/framework/src/platform/win32/tray_win32.cpp

@@ -2,8 +2,12 @@
 //  tray_win32.cpp — Win32 System Tray implementation
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include "tray_win32.h"
 #include "win32_helpers.h"
 

package/framework/src/platform/win32/window_win32.cpp

@@ -2,8 +2,12 @@
 //  window_win32.cpp — Win32 Window implementation
 // ============================================================================
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include "window_win32.h"
 #include "win32_helpers.h"
 #include <algorithm>
@@ -80,11 +84,11 @@ void Win32Window::set_title(const std::string& title) {
 }
 
 void Win32Window::set_size(int w, int h) {
-    SetWindowPos(hwnd_, nullptr, 0, 0, w, h, SWPP_NOZORDER | SWPP_NOMOVE);
+    SetWindowPos(hwnd_, nullptr, 0, 0, w, h, SWP_NOZORDER | SWP_NOMOVE);
 }
 
 void Win32Window::set_position(int x, int y) {
-    SetWindowPos(hwnd_, nullptr, x, y, 0, 0, SWPP_NOZORDER | SWPP_NOSIZE);
+    SetWindowPos(hwnd_, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 }
 
 void Win32Window::set_min_size(int w, int h) {
@@ -110,7 +114,7 @@ void Win32Window::set_resizable(bool v) {
 
 void Win32Window::set_always_on_top(bool v) {
     SetWindowPos(hwnd_, v ? HWND_TOPMOST : HWND_NOTOPMOST,
-                 0, 0, 0, 0, SWPP_NOMOVE | SWPP_NOSIZE);
+                 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 }
 
 void Win32Window::set_opacity(float v) {
@@ -181,7 +185,7 @@ void Win32Window::fullscreen() {
         GetMonitorInfoW(MonitorFromWindow(hwnd_, MONITOR_DEFAULTTONEAREST), &mi);
         r = mi.rcMonitor;
         SetWindowPos(hwnd_, HWND_TOP, r.left, r.top,
-                     r.right - r.left, r.bottom - r.top, SWPP_NOZORDER);
+                     r.right - r.left, r.bottom - r.top, SWP_NOZORDER);
     }
 }
 
@@ -194,7 +198,7 @@ void Win32Window::center() {
     GetMonitorInfoW(MonitorFromWindow(hwnd_, MONITOR_DEFAULTTONEAREST), &mi);
     int x = mi.rcWork.left + (mi.rcWork.right - mi.rcWork.left - w) / 2;
     int y = mi.rcWork.top + (mi.rcWork.bottom - mi.rcWork.top - h) / 2;
-    SetWindowPos(hwnd_, nullptr, x, y, 0, 0, SWPP_NOZORDER | SWPP_NOSIZE);
+    SetWindowPos(hwnd_, nullptr, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 }
 
 void Win32Window::request_repaint() {

package/framework/src/platform/win32/window_win32.h

@@ -4,8 +4,12 @@
 
 #pragma once
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <dwmapi.h>
 #include <map>

package/framework/src/renderer/webview/webview_win32.cpp

@@ -583,7 +583,7 @@ public:
             inset,
             host_width,
             host_height,
-            SWPP_NOZORDER | SWPP_NOACTIVATE | SWPP_SHOWWINDOW);
+            SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW);
         }
         if (controller_) {
           RECT bounds = {0, 0, host_width, host_height};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windowpp",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "WindowPP CLI — build, dev, and scaffold for WindowPP apps",
   "type": "commonjs",
   "bin": {

package/templates/example/frontend/vite.config.ts

@@ -1,8 +1,11 @@
-import { resolve } from 'node:path';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const REPO_ROOT = '{{REPO_ROOT}}';
 
 export default defineConfig({
@@ -18,7 +21,7 @@ export default defineConfig({
   server: {
     port: 3000,
     fs: {
-      allow: [REPO_ROOT],
+      allow: [REPO_ROOT, __dirname],
     },
   },
   build: {

package/templates/solid/frontend/vite.config.ts

@@ -1,8 +1,11 @@
-import { resolve } from 'node:path';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
 import solidPlugin from 'vite-plugin-solid';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const REPO_ROOT = '{{REPO_ROOT}}';
 
 export default defineConfig({
@@ -18,7 +21,7 @@ export default defineConfig({
   server: {
     port: 3000,
     fs: {
-      allow: [REPO_ROOT],
+      allow: [REPO_ROOT, __dirname],
     },
   },
   build: {