Revert "Revert "js && ds""

This reverts commit 0a26c245a6f037dcea8a14aafb2a005360a24206.