diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop index 2552588..b7a11f4 100644 --- a/Jenkinsfile.develop +++ b/Jenkinsfile.develop @@ -12,9 +12,7 @@ pipeline { } stage('build'){ steps { - sh '''ng build common - cp projects/common/src/assets/resumable.js dist/common/fesm2015 - cp projects/common/src/assets/resumable.js dist/common/fesm5''' + sh '''ng build common''' } } stage('npm publish'){ diff --git a/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.service.ts b/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.service.ts index 156e830..1f877f0 100644 --- a/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.service.ts +++ b/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.service.ts @@ -4,7 +4,7 @@ import { Subject , of } from 'rxjs'; import { HttpClient, HttpParams } from "@angular/common/http"; -declare var require; // avoid missing property error on require +declare var Resumable; // avoid missing property error on require @Injectable() export class ResumableFileUploadService { @@ -26,8 +26,8 @@ export class ResumableFileUploadService { init = function () { this.ref - require.ensure([], require => { - let Resumable = require('./resumable.js'); + // require.ensure([], require => { + //let Resumable = require('./resumable.js'); var other = this; this.resumable = new Resumable( { @@ -105,7 +105,7 @@ export class ResumableFileUploadService { if (this.dropElement) this.resumable.assignDrop(this.dropElement); if (this.fileBrowseElement) this.resumable.assignBrowse(this.fileBrowseElement); if (this.directoryBrowseElement) this.resumable.assignBrowse(this.directoryBrowseElement, true); - }); + } addFiles = (files: any[], event: any, geoRefJson?: string, attributes?: any) => { diff --git a/projects/common/src/assets/resumable.js b/projects/common/src/lib/components/resumable-file-upload/resumable.js similarity index 100% rename from projects/common/src/assets/resumable.js rename to projects/common/src/lib/components/resumable-file-upload/resumable.js diff --git a/projects/common/tsconfig.lib.json b/projects/common/tsconfig.lib.json index 7d312cd..cfaa8a0 100644 --- a/projects/common/tsconfig.lib.json +++ b/projects/common/tsconfig.lib.json @@ -11,7 +11,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "importHelpers": true, - "types": [], + "types": ["node_modules/resumable/resumable.js"], "lib": [ "dom", "es2018"