Refactor for TS

Author: 3aa49ec6bfc910647fa1c5a013e48eef

deploy/install-website.sh

@@ -45,27 +45,8 @@ Restart=always
 WantedBy=multi-user.target
 EOF
 
-cat << EOF >> /bin/node-teslausb/build/website/package.json
-{
-  "name": "website",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^1.0.0-rc.12"
-  }
-}
-EOF
-
 cd /bin/node-teslausb/build/website
-npm i
+npm i --production
 
 # Enable the service
 systemctl enable node-teslausb-www.service

deploy/install.sh

@@ -34,7 +34,7 @@ mkdir /mnt/TeslaCam
 cd /bin/node-teslausb/src/worker/configure && npm i && node .
 
 # Install required modules for worker
-cd /bin/node-teslausb/src/worker && npm i
+cd /bin/node-teslausb/build/worker && npm i --production
 
 # Create log directory
 mkdir /logs
@@ -48,7 +48,7 @@ DefaultDependencies=no
 [Service]
 Type=simple
 ExecStartPre=/bin/sleep 10
-ExecStart=/usr/bin/node /bin/node-teslausb/src/worker/index.js
+ExecStart=/usr/bin/node /bin/node-teslausb/build/worker/index.js
 WorkingDirectory=/bin/node-teslausb
 StandardOutput=append:/logs/worker.log
 StandardError=inherit

deploy/upgrade.sh

@@ -6,7 +6,7 @@
 cd /bin/node-teslausb
 git fetch --all
 git reset --hard origin/main
-cd /bin/node-teslausb/src/worker && npm i
+cd /bin/node-teslausb/build/worker && npm i --production
 
 cat << EOF > /lib/systemd/system/node-teslausb.service
 [Unit]
@@ -16,7 +16,7 @@ DefaultDependencies=no
 [Service]
 Type=simple
 ExecStartPre=/bin/sleep 10
-ExecStart=/usr/bin/node /bin/node-teslausb/src/worker/index.js
+ExecStart=/usr/bin/node /bin/node-teslausb/build/worker/index.js
 WorkingDirectory=/bin/node-teslausb
 StandardOutput=append:/logs/worker.log
 StandardError=inherit

src/website/package.json

@@ -4,12 +4,13 @@
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
-		"build": "vite build",
+		"build": "vite build && npm run copy-package-json",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check . && eslint .",
-		"format": "prettier --write ."
+		"format": "prettier --write .",
+		"copy-package-json": "cp package.json ../../build/website/package.json"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "^3.0.0",

src/worker/package.json

@@ -6,7 +6,8 @@
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsup"
+    "build": "tsup && npm run copy-package-json",
+    "copy-package-json": "cp package.json ../../build/worker/package.json"
   },
   "keywords": [],
   "author": "",