Refactor watch sources for reliability #646

Job	Run time
build-desktop (macos, development)	2m 7s
build-docker (macos)	16m 10s
build-desktop (macos, production)	2m 12s
build-docker (ubuntu)	1m 29s
build-desktop (ubuntu, development)	59s
build-desktop (ubuntu, production)	1m 25s
build-desktop (windows, development)	5m 1s
build-web (macos, development)	1m 52s
build-desktop (windows, production)	3m 2s
build-web (macos, production)	2m 18s
build-web (macos, test)	2m 50s
build-web (ubuntu, development)	1m 13s
build-web (ubuntu, production)	1m 29s
build-web (ubuntu, test)	1m 31s
build-web (windows, development)	5m 10s
build-web (windows, production)	5m 20s
build-web (windows, test)	4m 29s
	58m 37s

Provide feedback