Update to commonjs, and build via zpm.
Merge 1.2.0