Merge pull request #102 from r-hannuschka/development

2.1.1

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.1.1
+
+### bugfixes
+
+- fixed bug peer dependency angular-pipes still exists
+- fixed bug tsconfig paths not working in lib package
+- fixed bug response 404 show html source from 404 page
+
+# Changelog
+
 ## 2.1.0
 
 ### features

README.md

@@ -14,7 +14,7 @@ ___
 npm
 
 ```bash
-npm i --save @r-hannuschka/ngx-fileupload angular-pipes
+npm i --save @r-hannuschka/ngx-fileupload
 ```
 
 ## Demo

src/lib/README.md

@@ -14,7 +14,7 @@ ___
 npm
 
 ```bash
-npm i --save @r-hannuschka/ngx-fileupload angular-pipes
+npm i --save @r-hannuschka/ngx-fileupload
 ```
 
 ## Demo

src/lib/ngx-fileupload/ngx-file-upload.module.ts

@@ -2,8 +2,8 @@ import { NgModule } from "@angular/core";
 import { CommonModule } from "@angular/common";
 import { HttpClientModule } from "@angular/common/http";
 
-import { UploadViewComponent, UploadFileDirective, UploadItemComponent } from "@lib/ui";
-import { FileSizePipe } from "@lib/utils/ui";
+import { UploadViewComponent, UploadFileDirective, UploadItemComponent } from "./ui";
+import { FileSizePipe } from "./utils/ui";
 
 @NgModule({
     declarations: [

src/lib/ngx-fileupload/ui/upload-file/upload-file.ts

@@ -3,9 +3,9 @@ import { HttpClient } from "@angular/common/http";
 import { takeUntil } from "rxjs/operators";
 import { Subject } from "rxjs";
 
-import { Validator, ValidationFn, UploadState } from "@lib/data/api";
-import { UploadModel } from "@lib/data/upload.model";
-import { FileUpload } from "@lib/utils/http/file-upload";
+import { Validator, ValidationFn, UploadState } from "../../data/api";
+import { UploadModel } from "../../data/upload.model";
+import { FileUpload } from "../../utils/http/file-upload";
 
 /**
  * directive to add uploads with drag / drop

src/lib/ngx-fileupload/ui/upload-item/upload-item.component.ts

@@ -1,9 +1,9 @@
 
 import { Component, OnInit, Input, ViewChild, TemplateRef, HostListener, OnDestroy, Output, EventEmitter } from "@angular/core";
-import { FileUpload } from "@lib/utils/http/file-upload";
-import { UploadControl } from "@lib/utils/upload-control";
-import { UploadModel } from "@lib/data/upload.model";
-import { UploadData, UploadState, Upload } from "@lib/data/api";
+import { FileUpload } from "../../utils/http/file-upload";
+import { UploadControl } from "../../utils/upload-control";
+import { UploadModel } from "../../data/upload.model";
+import { UploadData, UploadState, Upload } from "../../data/api";
 import { Subscription } from "rxjs";
 
 export interface FileUploadItemContext {

src/lib/ngx-fileupload/ui/upload-view/upload-view.ts

@@ -3,8 +3,8 @@ import { delay } from "rxjs/operators";
 import { of } from "rxjs";
 
 import { Upload } from "../../data/api/upload";
-import { FileUploadItemContext } from "@lib/ui";
-import { Validator, ValidationFn } from "@lib/data/api/validation";
+import { FileUploadItemContext } from "../../ui";
+import { Validator, ValidationFn } from "../../data/api/validation";
 
 /**
  * NgxFileUploadComponent is a wrapper contain NgxFileUploadDirective and NgxFileUploadComponent

src/lib/ngx-fileupload/utils/http/file-upload.ts

@@ -1,8 +1,8 @@
 import { HttpClient, HttpEvent, HttpEventType, HttpProgressEvent, HttpResponse, HttpErrorResponse } from "@angular/common/http";
 import { Subject, BehaviorSubject, Observable } from "rxjs";
 import { takeUntil, filter } from "rxjs/operators";
-import { UploadState, UploadResponse, UploadData, Upload} from "@lib/data/api";
-import { UploadModel } from "@lib/data/upload.model";
+import { UploadState, UploadResponse, UploadData, Upload} from "../../data/api";
+import { UploadModel } from "../../data/upload.model";
 
 /**
  * Upload Options
@@ -198,7 +198,6 @@ export class FileUpload implements Upload {
      * status code
      */
     private handleResponse(res: HttpResponse<any>) {
-
         const uploadResponse: UploadResponse = {
             success: res.ok,
             body: res.body,
@@ -226,7 +225,7 @@ export class FileUpload implements Upload {
      */
     private handleError(response: HttpErrorResponse) {
 
-        let errors: any[] = response.error instanceof ProgressEvent ? response.message : response.error;
+        let errors: any[] = response.error instanceof ProgressEvent || response.status === 404 ? response.message : response.error;
         errors = Array.isArray(errors) ? errors : [errors];
 
         const uploadResponse: UploadResponse = {

src/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@r-hannuschka/ngx-fileupload",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "angular fileupload library",
   "repository": {
     "url": "git+https://github.com/r-hannuschka/ngx-fileupload.git",
@@ -17,8 +17,7 @@
   ],
   "peerDependencies": {
     "@angular/common": "^8.0.1",
-    "@angular/core": "^8.0.1",
-    "angular-pipes": "^9.0.2"
+    "@angular/core": "^8.0.1"
   },
   "author": "Ralf Hannuschka (https://github.com/r-hannuschka)",
   "bugs": {

src/lib/public-api.ts

@@ -2,9 +2,9 @@
  * Public API Surface of ngx-fileupload
  */
 export * from "./ngx-fileupload/ngx-file-upload.module";
-export * from "@lib/data/api";
-export * from "@lib/data/upload.model";
-export * from "@lib/ui";
-export * from "@lib/utils/http/file-upload";
-export * from "@lib/utils/validation";
-export * from "@lib/utils/upload-control";
+export * from "./ngx-fileupload/data/api";
+export * from "./ngx-fileupload/data/upload.model";
+export * from "./ngx-fileupload/ui";
+export * from "./ngx-fileupload/utils/http/file-upload";
+export * from "./ngx-fileupload/utils/validation";
+export * from "./ngx-fileupload/utils/upload-control";

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-fileupload",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",