From 352a7dc1aad609d588208a7f4c3c9fcb21e9363a Mon Sep 17 00:00:00 2001 From: Gurkirat Khaira <777gurkirat@gmail.com> Date: Tue, 9 Jun 2026 20:14:46 -0400 Subject: [PATCH 1/2] chore: unify cross-platform build scripts and configure Windows AppX --- .npmrc | 1 + frontend | 2 +- package-lock.json | 36 ++++++++++++++++++++++++++++++++++-- package.json | 16 +++++++++++----- 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..4fd0219 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true \ No newline at end of file diff --git a/frontend b/frontend index 6f14627..3c17960 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 6f1462718dce548be5dcc0848c8fede77bd256a2 +Subproject commit 3c17960cb3dfa36112be2fe53c01535846877d69 diff --git a/package-lock.json b/package-lock.json index 3a99f46..f4dbe34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "flo-desktop", - "version": "1.6.4", + "version": "1.6.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "flo-desktop", - "version": "1.6.4", + "version": "1.6.7", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -38,7 +38,11 @@ "@types/ws": "^8.5.10", "electron": "^31.1.0", "electron-builder": "^26.8.1", + "kill-port": "^2.0.1", "typescript": "^5.4.5" + }, + "engines": { + "node": ">=22.0.0" } }, "node_modules/@develar/schema-utils": { @@ -3343,6 +3347,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-them-args": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/get-them-args/-/get-them-args-1.3.2.tgz", + "integrity": "sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==", + "dev": true, + "license": "MIT" + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -3957,6 +3968,20 @@ "json-buffer": "3.0.1" } }, + "node_modules/kill-port": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kill-port/-/kill-port-2.0.1.tgz", + "integrity": "sha512-e0SVOV5jFo0mx8r7bS29maVWp17qGqLBZ5ricNSajON6//kmb7qqqNnml4twNE8Dtj97UQD+gNFOaipS/q1zzQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-them-args": "1.3.2", + "shell-exec": "1.0.2" + }, + "bin": { + "kill-port": "cli.js" + } + }, "node_modules/lazy-val": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", @@ -5669,6 +5694,13 @@ "node": ">=8" } }, + "node_modules/shell-exec": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz", + "integrity": "sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==", + "dev": true, + "license": "MIT" + }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", diff --git a/package.json b/package.json index 107c716..1cc30c4 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,17 @@ "name": "flo-desktop", "version": "1.6.7", "description": "Flo - Self-hosted Point of Sale System", + "engines": { + "node": ">=22.0.0" + }, "main": "dist/index.js", "scripts": { - "dev": "npm run build:frontend && npm run build && electron .", + "clean": "npx kill-port 3001 3002", + "predev": "git submodule update --init", + "dev": "npm run clean && npm run build:frontend && npm run build && electron .", "dev:frontend": "cd frontend && npm run dev", "build": "tsc", - "build:frontend": "cd frontend && npm ci && NEXT_BUILD_MODE=desktop NEXT_PUBLIC_API_URL=http://localhost:3001/api npm run build", + "build:frontend": "cd frontend && npm ci && npx cross-env NEXT_BUILD_MODE=desktop NEXT_PUBLIC_API_URL=http://localhost:3001/api npm run build", "build:all-platforms": "npm run build:frontend && npm run build && electron-builder --win --mac --linux", "postinstall": "git submodule update --init --recursive && npx @electron/rebuild -f -w better-sqlite3", "build:win": "npm run build:frontend && npm run build && electron-builder --win", @@ -45,6 +50,7 @@ "@types/ws": "^8.5.10", "electron": "^31.1.0", "electron-builder": "^26.8.1", + "kill-port": "^2.0.1", "typescript": "^5.4.5" }, "dependencies": { @@ -104,9 +110,9 @@ "appx": { "applicationId": "FloCafe", "backgroundColor": "#1e1e2e", - "publisherDisplayName": "YOUR_PUBLISHER_DISPLAY_NAME", - "identityName": "YOUR_IDENTITY_NAME", - "publisher": "CN=YOUR_PUBLISHER_CN", + "publisherDisplayName": "Codify Apps Private Limited", + "identityName": "CodifyAppsPrivateLimited.FloCafe", + "publisher": "CN=34AFD24D-EC88-44B8-B309-08BB8A6BB5F7", "displayName": "Flo Cafe", "languages": [ "en-US" From c7787873be0d2b35c70748d613845b2058bcfc0b Mon Sep 17 00:00:00 2001 From: Gurkirat Khaira <777gurkirat@gmail.com> Date: Tue, 9 Jun 2026 20:45:32 -0400 Subject: [PATCH 2/2] fix: correct appx build script syntax --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cc30c4..c164c66 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "build:all-platforms": "npm run build:frontend && npm run build && electron-builder --win --mac --linux", "postinstall": "git submodule update --init --recursive && npx @electron/rebuild -f -w better-sqlite3", "build:win": "npm run build:frontend && npm run build && electron-builder --win", - "build:appx": "npm run build:frontend && npm run build && electron-builder --win --target appx", + "build:appx": "npm run build:frontend && npm run build && electron-builder --win appx", "build:mac": "npm run build:frontend && npm run build && electron-builder --mac", "build:mas": "MAS_BUILD=1 npm run build:frontend && MAS_BUILD=1 npm run build && MAS_BUILD=1 electron-builder --mac mas --universal", "build:mas-dev": "MAS_BUILD=1 npm run build:frontend && MAS_BUILD=1 npm run build && MAS_BUILD=1 electron-builder --mac masDev",