diff --git a/.eslintrc.json b/.eslintrc.json index cf2179dd..45d0d73b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -45,6 +45,7 @@ }, "rules": { "semi": "off", + "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/semi": [ "error" ], @@ -60,6 +61,13 @@ "plugin:@nx/javascript" ], "rules": {} + }, + { + "files": ["*.json"], + "parser": "jsonc-eslint-parser", + "rules": { + "@nx/dependency-checks": "error" + } } ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index ea87ee81..74212e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# [6.0.0](https://github.com/valor-software/ng2-file-upload/compare/v5.0.0...v6.0.0) (2024-07-02) +* Added angular 17 support + + # [5.0.0](https://github.com/valor-software/ng2-file-upload/compare/v4.0.0...v5.0.0) (2023-07-21) diff --git a/apps/demo/server/uploads/unnamed1719848822817.jpg b/apps/demo/server/uploads/unnamed1719848822817.jpg new file mode 100644 index 00000000..72fee048 Binary files /dev/null and b/apps/demo/server/uploads/unnamed1719848822817.jpg differ diff --git a/apps/demo/src/app/components/file-upload/simple-demo.ts b/apps/demo/src/app/components/file-upload/simple-demo.ts index 0a30c1a3..6f0b9ef0 100644 --- a/apps/demo/src/app/components/file-upload/simple-demo.ts +++ b/apps/demo/src/app/components/file-upload/simple-demo.ts @@ -21,7 +21,7 @@ export class SimpleDemoComponent { disableMultipart: true, // 'DisableMultipart' must be 'true' for formatDataFunction to be called. formatDataFunctionIsAsync: true, formatDataFunction: async item => { - return new Promise((resolve, reject) => { + return new Promise((resolve, ) => { resolve({ name: item._file.name, length: item._file.size, diff --git a/apps/demo/src/typings.d.ts b/apps/demo/src/typings.d.ts index f18e8b97..25cb602a 100644 --- a/apps/demo/src/typings.d.ts +++ b/apps/demo/src/typings.d.ts @@ -11,6 +11,7 @@ declare const PR:any; // declare const global:any; // eslint-disable-next-line @typescript-eslint/prefer-namespace-keyword declare module jasmine { + // eslint-disable-next-line @typescript-eslint/no-unused-vars interface Matchers { toHaveCssClass(expected: any): boolean; } diff --git a/libs/ng2-file-upload/file-upload/file-uploader.class.ts b/libs/ng2-file-upload/file-upload/file-uploader.class.ts index a4940bb4..9954cc7b 100644 --- a/libs/ng2-file-upload/file-upload/file-uploader.class.ts +++ b/libs/ng2-file-upload/file-upload/file-uploader.class.ts @@ -344,7 +344,7 @@ export class FileUploader { }; xhr.onload = () => { const headers = this._parseHeaders(xhr.getAllResponseHeaders()); - const response = this._transformResponse(xhr.response, headers); + const response = this._transformResponse(xhr.response); const gist = this._isSuccessCode(xhr.status) ? 'Success' : 'Error'; const method = `_on${gist}Item`; (this as any)[ method ](item, response, xhr.status, headers); @@ -352,13 +352,13 @@ export class FileUploader { }; xhr.onerror = () => { const headers = this._parseHeaders(xhr.getAllResponseHeaders()); - const response = this._transformResponse(xhr.response, headers); + const response = this._transformResponse(xhr.response); this._onErrorItem(item, response, xhr.status, headers); this._onCompleteItem(item, response, xhr.status, headers); }; xhr.onabort = () => { const headers = this._parseHeaders(xhr.getAllResponseHeaders()); - const response = this._transformResponse(xhr.response, headers); + const response = this._transformResponse(xhr.response); this._onCancelItem(item, response, xhr.status, headers); this._onCompleteItem(item, response, xhr.status, headers); }; @@ -446,7 +446,7 @@ export class FileUploader { return (status >= 200 && status < 300) || status === 304; } - protected _transformResponse(response: string, headers: ParsedResponseHeaders): string { + protected _transformResponse(response: string): string { return response; } diff --git a/libs/ng2-file-upload/package.json b/libs/ng2-file-upload/package.json index 6c009289..680dc231 100644 --- a/libs/ng2-file-upload/package.json +++ b/libs/ng2-file-upload/package.json @@ -1,6 +1,6 @@ { "name": "ng2-file-upload", - "version": "5.0.0", + "version": "6.0.0", "description": "Angular file uploader", "author": "Dmitriy Shekhovtsov ", "license": "MIT", diff --git a/libs/ng2-file-upload/project.json b/libs/ng2-file-upload/project.json index 377327b2..81cff5fd 100644 --- a/libs/ng2-file-upload/project.json +++ b/libs/ng2-file-upload/project.json @@ -11,8 +11,7 @@ ], "options": { "tsConfig": "libs/ng2-file-upload/tsconfig.lib.json", - "project": "libs/ng2-file-upload/ng-package.json", - "updateBuildableProjectDepsInPackageJson": true + "project": "libs/ng2-file-upload/ng-package.json" }, "configurations": { "production": { diff --git a/package-lock.json b/package-lock.json index b20ced74..25e8154b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ng2-file-upload-demo", - "version": "5.0.0", + "version": "6.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ng2-file-upload-demo", - "version": "5.0.0", + "version": "6.0.0", "license": "MIT", "dependencies": { "@nx/workspace": "17.1.3", diff --git a/package.json b/package.json index a05f19fd..2059a7fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng2-file-upload-demo", - "version": "5.0.0", + "version": "6.0.0", "private": true, "description": "Angular file upload directives", "scripts": {