Merge branch 'master' into core

Conflicts:
	package-lock.json
	package.json

.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "env": {
-    "es6": true,
+    "es2017": true,
     "node": true,
     "browser": true
   },

index.js

@@ -62,7 +62,7 @@ const argumentArrayContains = function (args, item) {
   }, false);
 };
 
-module.exports = function (config) {
+module.exports = async function (config) {
   config = Object.assign({
     roundToEvenWidth: true,
     roundToEvenHeight: true,
@@ -195,28 +195,24 @@ module.exports = function (config) {
   }
 
   var overallError;
-  return timesnap(timesnapConfig)
-    .then(function () {
-      if (convertProcess) {
-        convertProcess.stdin.end();
-      }
-    })
-    .then(function () {
-      // wait for ffmpeg to finish
-      if (processPromise) {
-        return processPromise;
-      } else {
-        return makeProcessPromise();
-      }
-    }).catch(function (err) {
-      overallError = err;
-      log(err);
-    }).then(function () {
-      if (frameMode && !config.keepFrames) {
-        deleteFolder(frameDirectory);
-      }
-      if (overallError) {
-        throw overallError;
-      }
-    });
+  try {
+    await timesnap(timesnapConfig);
+    if (convertProcess) {
+      convertProcess.stdin.end();
+    }
+    if (processPromise) {
+      await processPromise;
+    } else {
+      await makeProcessPromise();
+    }
+  } catch (err) {
+    overallError = err;
+    log(err);
+  }
+  if (frameMode && !config.keepFrames) {
+    deleteFolder(frameDirectory);
+  }
+  if (overallError) {
+    throw overallError;
+  }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timecut-core",
-  "version": "0.2.2-prerelease",
+  "version": "0.3.0-prerelease",
   "description": "Record smooth movies of web pages",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "timesnap-core": "0.2.1"
+    "timesnap-core": "0.3.0"
   },
   "devDependencies": {
     "eslint": "^6.8.0"