Merge branch 'master' into linting

Author: KnorpelSenf

lib/JobsResource.ts

@@ -18,7 +18,7 @@ export interface Job {
     tasks: JobTask[];
 }
 type NotPresentWhenInsideJob = 'job_id' | 'status';
-interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
+export interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
     name: string;
     status: JobTaskStatus;
 }

lib/TasksResource.ts

@@ -1,5 +1,6 @@
 import FormData, { Stream } from 'form-data';
 import CloudConvert from './CloudConvert';
+import { JobTask } from './JobsResource';
 
 export type TaskEvent = 'created' | 'updated' | 'finished' | 'failed';
 export type TaskStatus = 'waiting' | 'processing' | 'finished' | 'error';
@@ -415,7 +416,7 @@ export default class TasksResource {
         await this.cloudConvert.axios.delete('tasks/' + id);
     }
 
-    async upload(task: Task, stream: Stream): Promise<any> {
+    async upload(task: Task | JobTask, stream: Stream): Promise<any> {
         if (task.operation !== 'import/upload') {
             throw new Error('The task operation is not import/upload');
         }

package.json

@@ -37,7 +37,6 @@
         "typescript": "^3.9.7"
     },
     "files": [
-        "lib/",
         "built/"
     ],
     "scripts": {
@@ -47,4 +46,4 @@
         "test-integration": "mocha --require esm tests/integration",
         "lint": "eslint --ext .ts --ext .js --ext .json ."
     }
-}
+}