--- a/makefile	Sat Apr 09 11:52:50 2022 -0700
+++ b/makefile	Mon May 09 18:45:04 2022 -0700
@@ -1,46 +1,60 @@
 ### setup ###
 
 packages:
-	sudo aptitude install coffeescript normalize-audio audacity python3-pygame libffi-dev tix libzmq3-dev python3-dev libssl-dev python3-opencv python3-cairo npm git virtualenv python3-virtualenv nginx-full python3-tk zlib1g-dev libjpeg8-dev curl
-
-# also pip3 install -U invoke (don't use ubuntu's version)
+	sudo aptitude install -y \
+		audacity \
+		coffeescript \
+		curl \
+		git \
+		libffi-dev \
+		libjpeg8-dev \
+		libssl-dev \
+		libzmq3-dev \
+		nginx-core \
+		nginx-full \
+		normalize-audio \
+		npm \
+		python3-cairo \
+		python3-dev \
+		python3-opencv \
+		python3-pygame \
+		python3-tk \
+		tix \
+		zlib1g-dev
 
 gst_packages:
-	sudo aptitude install python3-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio python3-gst-1.0 gir1.2-goocanvas-2.0
+	sudo aptitude install -y \
+		gir1.2-goocanvas-2.0 \
+		gir1.2-gst-plugins-base-1.0 \
+		gir1.2-gstreamer-1.0 \
+		gstreamer1.0-plugins-good \
+		gstreamer1.0-pulseaudio \
+		gstreamer1.0-tools \
+		libgirepository-1.0-1 \
+		libgirepository1.0-dev \
+		python3-gi \
+		python3-gst-1.0
 
-node_modules/bower/bin/bower:
-	pnpm install
-
+pnpm:
+	# holding pnpm back because we don't have the latest nodejs: https://pnpm.io/installation#compatibility
+	sudo npm install -g pnpm@6.32.12
+	
 bin/node:
 	ln -sf `which nodejs` bin/node
 
-bower: node_modules/bower/bin/bower bin/node
-	cd light9/web/lib; nodejs ../../../node_modules/bower/bin/bower install
-
-npm_install:
-	pnpm install
+js: pnpm
+	pnpm install --reporter append-only
 
-node_modules/n3/n3-browser.js:
-	(cd node_modules/n3; pnpx browserify --standalone N3 --require n3 -o n3-browser.js)
-
-light9/web/lib/debug/debug-build.js:
-	pnpx browserify light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build.js --standalone debug
+py:
+	pdm sync
 
-light9/web/lib/debug/debug-build-es6.js:
-	pnpx browserify light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build-es6.js --standalone debug
-	echo "\nexport default window.debug;" >> light9/web/lib/debug/debug-build-es6.js
+refresh: packages gst_packages js py
 
-lit_fix:
-	perl -pi -e "s,'lit-html,'/node_modules/lit-html,; s,lit-html',lit-html/lit-html.js'," node_modules/lit-element/lit-element.js
+
 
-round_fix:
-	perl -pi -e 's/module.exports = rounding/export { rounding }/' node_modules/significant-rounding/index.js
+
 
-light9/web/lib/underscore/underscore-min-es6.js:
-	cp light9/web/lib/underscore/underscore-min.js light9/web/lib/underscore/underscore-min-es6.js
-	perl -pi -e 's/call\(this\);/call(window); export default window._;/' light9/web/lib/underscore/underscore-min-es6.js
 
-npm: npm_install node_modules/n3/n3-browser.js light9/web/lib/debug/debug-build.js light9/web/lib/debug/debug-build-es6.js lit_fix round_fix light9/web/lib/underscore/underscore-min-es6.js
 
 
 bin/ascoltami2: gst_packages link_to_sys_packages