diff --git a/ui/pwa-helper/esbuild.mjs b/ui/pwa-helper/esbuild.mjs
index 0789cd66b..34de17cc4 100755
--- a/ui/pwa-helper/esbuild.mjs
+++ b/ui/pwa-helper/esbuild.mjs
@@ -152,6 +152,8 @@ else {
 
 /*
   TODO:
+  - Input Config
+  - version
   - Workbox and sw
   - Res (all assets) hash
   - PostCSS css file
diff --git a/uniquely/soffit-pwa/package.json b/uniquely/soffit-pwa/package.json
index fa34ef619..2fe71e6ac 100644
--- a/uniquely/soffit-pwa/package.json
+++ b/uniquely/soffit-pwa/package.json
@@ -17,17 +17,21 @@
     "directory": "ui/soffit-pwa"
   },
   "scripts": {
-    "b": "yarn build --debug",
-    "cb": "yarn build --debug --clean",
+    "b": "yarn build-dev",
+    "cb": "run-s clean build-dev",
     "s": "yarn start",
     "w": "yarn watch",
     "start": "NODE_OPTIONS=--enable-source-maps run-s clean build serve",
     "clean": "rm -rf dist build .tsbuildinfo",
-    "build": "./esbuild.mjs",
+    "build": "yarn build:es",
+    "build-dev": "run-s build:root build:tsc \"build:es --debug\"",
+    "build:es": "./esbuild.mjs",
     "build:tsc": "tsc --build",
+    "build:root": "cd ../../ && yarn build:ts",
     "serve": "wds",
-    "watch": "run-p watch:es serve",
-    "watch:es": "yarn build --clean --watch --debug"
+    "watch": "run-p watch:root watch:es serve",
+    "watch:es": "yarn build:es --clean --watch --debug",
+    "watch:root": "cd ../../ && yarn watch:ts"
   },
   "devDependencies": {
     "@alwatr/element": "^0.28.0",