Update dependencies and more updates

package.json

@@ -3,11 +3,14 @@
   "version": "3.3.1-beta.1",
   "description": "Implementation of MozJPEG in pure JavaScript, using Emscripten",
   "main": "dist/mozjpeg.js",
-  "jsnext:main": "dist/mozjpeg.es2015.js",
+  "jsnext:main": "dist/mozjpeg.es6.js",
+  "module": "dist/mozjpeg.es6.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rollup -c rollup.config.js",
-    "uglify": "uglifyjs dist/mozjpeg.js -o dist/mozjpeg.min.js -m -c"
+    "build": "npm run build:cjpeg && npm run build:rollup && npm run build:uglify",
+    "build:cjpeg": "./build-js.sh",
+    "build:rollup": "rollup -c rollup.config.js",
+    "build:uglify": "uglifyjs dist/mozjpeg.js -o dist/mozjpeg.min.js -m -c"
   },
   "repository": {
     "type": "git",
@@ -35,8 +38,8 @@
     "dist"
   ],
   "devDependencies": {
-    "rollup": "^0.32.0",
-    "rollup-plugin-commonjs": "^3.0.0",
+    "rollup": "^0.57.1",
+    "rollup-plugin-commonjs": "^9.1.0",
     "uglify-js": "^3.3.18"
   }
 }

post.js

@@ -2,7 +2,7 @@
 	try { 
 		file = FS.readFile("/output.jpg");
 	} catch (e) {
-		return new Error("No output: " + stderr);
+		throw new Error("No output: " + stderr);
 	}
 
 	FS.unlink("/output.jpg");

pre.js

@@ -1,21 +1,25 @@
 module.exports = function(file, options) {
 	// file: Typed array containing file in PPM, PGM, BMP, or Targa format.
-	// options: hash containing options to pass to cjpeg
+	// options: hash containing options to pass to cjpeg or an array of arguments
 	// returns: object, data = typed array with file output, stderr = command output
 
 	var stdout = "";
 	var stderr = "";
 
 	var args = ["-outfile", "/output.jpg"];
 
-	for (var key in options) {
-		if (!options.hasOwnProperty(key)) continue;
+	if (Array.isArray(options)) {
+		args = args.concat(options);
+	} else {
+		for (var key in options) {
+			if (!options.hasOwnProperty(key)) continue;
 
-		if (options[key]) {
-			args.push("-" + key);
-			if (typeof options[key] !== "boolean") {
-				// option has a value
-				args.push(String(options[key]));
+			if (options[key]) {
+				args.push("-" + key);
+				if (typeof options[key] !== "boolean") {
+					// option has a value
+					args.push(String(options[key]));
+				}
 			}
 		}
 	}

rollup.config.js

@@ -1,14 +1,15 @@
-import commonjs from 'rollup-plugin-commonjs';
+import commonjs from "rollup-plugin-commonjs";
 
 export default {
-	entry: 'index.js',
+	input: "index.js",
 	plugins: [commonjs()],
-	moduleName: "mozjpeg",
-	targets: [{
-		dest: 'dist/mozjpeg.js',
-		format: 'umd'
+	output: [{
+		file: "dist/mozjpeg.js",
+		format: "umd",
+		name: "mozjpeg"
 	}, {
-		dest: 'dist/mozjpeg.es6.js',
-		format: 'es'
+		file: "dist/mozjpeg.es6.js",
+		format: "es",
+		name: "mozjpeg"
 	}]
 };