refactor: move gui to own folder

.changeset/blue-boxes-admire.md

@@ -0,0 +1,5 @@
+---
+"deemix-gui": minor
+---
+
+Monorepo refactor

.gitignore

@@ -3,58 +3,15 @@ logs
 *.log
 npm-debug.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
 node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
 
 # Output of 'npm pack'
 *.tgz
 
 # dotenv environment variables file
 .env
 
-# next.js build output
-.next
-
 # IDE
 .vscode
 .idea

.husky/pre-commit

@@ -1,2 +1 @@
-pnpm reset-version
 npx lint-staged

index.js → gui/index.js

@@ -18,7 +18,7 @@ const argv = yargs(hideBin(process.argv)).options({
 	host: { type: "string", default: "0.0.0.0" },
 	dev: { type: "boolean", default: false },
 }).argv;
-const { DeemixServer } = require("./server/dist/app.js");
+const { DeemixServer } = require("../server/dist/app.js");
 
 const PORT = process.env.DEEMIX_SERVER_PORT || argv.port;
 process.env.DEEMIX_SERVER_PORT = PORT;

gui/package.json

@@ -0,0 +1,91 @@
+{
+  "name": "deemix-gui",
+  "version": "0.0.0",
+  "private": true,
+  "description": "A standalone electron app that wraps deemix-webui",
+  "main": "index.js",
+  "author": "Bambanah",
+  "license": "GPL-3.0-only",
+  "scripts": {
+    "dev": "electron . --dev",
+    "build": "pnpm set-version && electron-builder && pnpm reset-version",
+    "build:server": "pnpm -C server build",
+    "build:webui": "pnpm -C webui build",
+    "dist": "pnpm set-version && electron-builder && pnpm reset-version",
+    "dist:dir": "pnpm set-version && pnpm predist && electron-builder --dir && pnpm reset-version",
+    "lint": "run-s lint:*",
+    "lint:es": "eslint .",
+    "lint:ts": "pnpm -C server lint:ts",
+    "set-version": "node scripts/set-version.mjs",
+    "reset-version": "node scripts/reset-version.mjs"
+  },
+  "devDependencies": {
+    "electron": "^22.0.0",
+    "electron-builder": "^23.6.0"
+  },
+  "dependencies": {
+    "electron-context-menu": "^3.6.1",
+    "electron-window-state-manager": "^0.3.2",
+    "yargs": "^17.6.2"
+  },
+  "build": {
+    "appId": "app.deemix.gui",
+    "productName": "deemix-gui",
+    "files": [
+      "index.js",
+      "preload.js",
+      "../server/dist/**/*",
+      "../webui/public/**/*",
+      "build/**/*",
+      "package.json"
+    ],
+    "mac": {
+      "target": [
+        {
+          "target": "dmg",
+          "arch": "x64"
+        },
+        {
+          "target": "dmg",
+          "arch": "arm64"
+        }
+      ],
+      "artifactName": "deemix-gui_${arch}.${ext}",
+      "category": "public.app-category.music"
+    },
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": "x64"
+        },
+        {
+          "target": "portable",
+          "arch": "x64"
+        }
+      ]
+    },
+    "linux": {
+      "target": [
+        "appimage",
+        "deb"
+      ],
+      "artifactName": "deemix-gui.${ext}",
+      "category": "AudioVideo,Audio",
+      "icon": "build/icon.icns"
+    },
+    "nsis": {
+      "artifactName": "${productName}_setup.${ext}",
+      "oneClick": false,
+      "license": "LICENSE.txt",
+      "allowToChangeInstallationDirectory": true,
+      "uninstallDisplayName": "${productName}",
+      "deleteAppDataOnUninstall": true
+    },
+    "portable": {
+      "artifactName": "${productName}.${ext}",
+      "requestExecutionLevel": "user"
+    }
+  },
+  "packageManager": "[email protected]+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247"
+}

scripts/gen-version.mjs → gui/scripts/gen-version.mjs

@@ -11,6 +11,4 @@ function generateVersion() {
 	return `${year}.${month}.${day}-r${commitsNumber}.${commitHash}`;
 }
 
-console.log(generateVersion());
-
 export default generateVersion;

package.json

@@ -9,19 +9,15 @@
   "license": "GPL-3.0-only",
   "scripts": {
     "dev": "pnpm -C webui dev",
-    "build": "run-s build:*",
+    "dev:gui": "pnpm -C gui dev",
+    "build": "run-s build:server build:webui",
     "build:server": "pnpm -C server build",
     "build:webui": "pnpm -C webui build",
-    "start-server": "pnpm -C server start",
-    "predist": "pnpm build",
-    "start": "electron . --dev",
-    "dist": "pnpm set-version && electron-builder && pnpm reset-version",
-    "dist:dir": "pnpm set-version && pnpm predist && electron-builder --dir && pnpm reset-version",
+    "build:gui": "pnpm build && pnpm -C gui build",
+    "start:server": "pnpm -C server start",
     "lint": "run-s lint:*",
     "lint:es": "eslint .",
     "lint:ts": "pnpm -C server lint:ts",
-    "set-version": "node scripts/set-version.mjs",
-    "reset-version": "node scripts/reset-version.mjs",
     "prepare": "husky"
   },
   "devDependencies": {
@@ -39,68 +35,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "electron-context-menu": "^3.6.1",
-    "electron-window-state-manager": "^0.3.2",
     "yargs": "^17.6.2"
   },
-  "build": {
-    "appId": "app.deemix.gui",
-    "productName": "deemix-gui",
-    "files": [
-      "index.js",
-      "preload.js",
-      "server/dist/**/*",
-      "webui/public/**/*",
-      "build/**/*",
-      "package.json"
-    ],
-    "mac": {
-      "target": [
-        {
-          "target": "dmg",
-          "arch": "x64"
-        },
-        {
-          "target": "dmg",
-          "arch": "arm64"
-        }
-      ],
-      "artifactName": "deemix-gui_${arch}.${ext}",
-      "category": "public.app-category.music"
-    },
-    "win": {
-      "target": [
-        {
-          "target": "nsis",
-          "arch": "x64"
-        },
-        {
-          "target": "portable",
-          "arch": "x64"
-        }
-      ]
-    },
-    "linux": {
-      "target": [
-        "appimage",
-        "deb"
-      ],
-      "artifactName": "deemix-gui.${ext}",
-      "category": "AudioVideo,Audio",
-      "icon": "build/icon.icns"
-    },
-    "nsis": {
-      "artifactName": "${productName}_setup.${ext}",
-      "oneClick": false,
-      "license": "LICENSE.txt",
-      "allowToChangeInstallationDirectory": true,
-      "uninstallDisplayName": "${productName}",
-      "deleteAppDataOnUninstall": true
-    },
-    "portable": {
-      "artifactName": "${productName}.${ext}",
-      "requestExecutionLevel": "user"
-    }
-  },
   "packageManager": "[email protected]+sha512.faf344af2d6ca65c4c5c8c2224ea77a81a5e8859cbc4e06b1511ddce2f0151512431dd19e6aff31f2c6a8f5f2aced9bd2273e1fed7dd4de1868984059d2c4247"
 }