From 094e5974168deea85488dd43d16d829113212e9f Mon Sep 17 00:00:00 2001
From: PwLDev <64767383+PwLDev@users.noreply.github.com>
Date: Mon, 4 May 2026 11:18:20 -0700
Subject: [PATCH] update milsko upstream

---
 binding.gyp   | 17 ++++++++++++++---
 bun.lock      |  8 ++++----
 deps/milsko   |  2 +-
 package.json  |  8 ++------
 tsconfig.json |  7 ++++++-
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index abf3038..a973bb3 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -2,7 +2,12 @@
     "targets": [
         {
             "target_name": "milsko",
-            "sources": ["src/milsko.cpp"],
+            "sources": [
+                "src/milsko.cpp",
+                "src/widget.cpp",
+                "src/classes.cpp",
+                "src/pixmap.cpp",
+            ],
             "include_dirs": [
                 "<!@(node -p \"require('node-addon-api').include\")",
                 "deps/milsko/include",
@@ -132,12 +137,18 @@
                         #     "deps/milsko/src/backend/nococoa.m"
                         # ],
                         # "defines": ["USE_COCOA"]
-                        "include_dirs": ["/opt/X11/include"],
                         "link_settings": {
-                            "ldflags": ["-lX11"]
+                            "libraries": [
+                                "-lobjc",
+                                "-framework Cocoa",
+                                "-L/opt/X11/lib",
+                                "-lX11",
+                            ]
                         },
+                        "include_dirs": ["/opt/X11/include"],
                         "sources": [
                             "deps/milsko/src/backend/x11.c",
+                            "deps/milsko/src/backend/nococoa.m",
                         ],
                         "defines": ["USE_X11"]
                     }
diff --git a/bun.lock b/bun.lock
index 81e26a2..69aaf52 100644
--- a/bun.lock
+++ b/bun.lock
@@ -10,7 +10,7 @@
       },
       "devDependencies": {
         "@types/node": "^25.6.0",
-        "fast-xml-parser": "^5.6.0",
+        "fast-xml-parser": "^5.7.2",
         "node-gyp": "^12.2.0",
         "prebuildify": "^6.0.1",
         "prettier": "^3.8.2",
@@ -23,7 +23,7 @@
 
     "@isaacs/fs-minipass": ["@isaacs/fs-minipass@4.0.1", "", { "dependencies": { "minipass": "^7.0.4" } }, "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w=="],
 
-    "@nodable/entities": ["@nodable/entities@1.1.0", "", {}, "sha512-bidpxmTBP0pOsxULw6XlxzQpTgrAGLDHGBK/JuWhPDL6ZV0GZ/PmN9CA9do6e+A9lYI6qx6ikJUtJYRxup141g=="],
+    "@nodable/entities": ["@nodable/entities@2.1.0", "", {}, "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA=="],
 
     "@npmcli/agent": ["@npmcli/agent@4.0.0", "", { "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.1", "lru-cache": "^11.2.1", "socks-proxy-agent": "^8.0.3" } }, "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA=="],
 
@@ -59,9 +59,9 @@
 
     "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="],
 
-    "fast-xml-builder": ["fast-xml-builder@1.1.4", "", { "dependencies": { "path-expression-matcher": "^1.1.3" } }, "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg=="],
+    "fast-xml-builder": ["fast-xml-builder@1.1.7", "", { "dependencies": { "path-expression-matcher": "^1.1.3" } }, "sha512-Yh7/7rQuMXICNr0oMYDR2yHP6oUvmQsTToFeOWj/kIDhAwQ+c4Ol/lbcwOmEM5OHYQmh6S6EQSQ1sljCKP36bQ=="],
 
-    "fast-xml-parser": ["fast-xml-parser@5.6.0", "", { "dependencies": { "@nodable/entities": "^1.1.0", "fast-xml-builder": "^1.1.4", "path-expression-matcher": "^1.5.0", "strnum": "^2.2.3" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-5G+uaEBbOm9M4dgMOV3K/rBzfUNGqGqoUTaYJM3hBwM8t71w07gxLQZoTsjkY8FtfjabqgQHEkeIySBDYeBmJw=="],
+    "fast-xml-parser": ["fast-xml-parser@5.7.2", "", { "dependencies": { "@nodable/entities": "^2.1.0", "fast-xml-builder": "^1.1.5", "path-expression-matcher": "^1.5.0", "strnum": "^2.2.3" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w=="],
 
     "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" } }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
 
diff --git a/deps/milsko b/deps/milsko
index e878ae0..49294dc 160000
--- a/deps/milsko
+++ b/deps/milsko
@@ -1 +1 @@
-Subproject commit e878ae0253162dae9c63af106d61b5bde95d1fc8
+Subproject commit 49294dc975ea17a33726069e4d9803ba228e66ff
diff --git a/package.json b/package.json
index bf9160d..91b08fc 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
   "name": "milsko",
   "version": "1.0.1",
-  "upstream": "v1.0a",
   "description": "Lightweight and cross-platform native GUI toolkit",
+  "upstream": "ea20a31694",
   "main": "dist/index.js",
-  "type": "module",
   "scripts": {
     "install": "node-gyp-build",
     "build": "tsc && node-gyp rebuild",
@@ -27,12 +26,9 @@
     "url": "https://forgejo.nishi.boats/pyrite-dev/milsko-node/issues"
   },
   "homepage": "https://forgejo.nishi.boats/pyrite-dev/milsko-node#readme",
-  "engines": {
-    "node": ">= 18"
-  },
   "devDependencies": {
     "@types/node": "^25.6.0",
-    "fast-xml-parser": "^5.6.0",
+    "fast-xml-parser": "^5.7.2",
     "node-gyp": "^12.2.0",
     "prebuildify": "^6.0.1",
     "prettier": "^3.8.2",
diff --git a/tsconfig.json b/tsconfig.json
index eb9671c..54669ff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,5 +13,10 @@
     "declaration": true,
     "isolatedModules": true
   },
-  "exclude": ["scripts"]
+  "exclude": [
+    "scripts",
+    "examples",
+    "node_modules", 
+    "dist"
+  ]
 }