From aaed924b6fc0f792f68c9f7fa3f4e08ba51c1e69 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 15 Jul 2016 11:55:50 +0100 Subject: [PATCH] Improve 'upload' package config --- .../ng2-alfresco-upload/package.json | 27 ++++++------------- .../file-uploading-dialog.component.ts | 2 +- .../src/components/upload-button.component.ts | 2 +- .../components/upload-drag-area.component.ts | 2 +- .../{ => src}/i18n/en.json | 0 .../{ => src}/i18n/it.json | 0 .../src/services/upload.service.ts | 1 + 7 files changed, 12 insertions(+), 22 deletions(-) rename ng2-components/ng2-alfresco-upload/{ => src}/i18n/en.json (100%) rename ng2-components/ng2-alfresco-upload/{ => src}/i18n/it.json (100%) diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index fdc802f06d..d05fdb5692 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -4,20 +4,15 @@ "version": "0.2.0", "author": "Alfresco Software, Ltd.", "scripts": { + "postinstall": "typings install", "clean": "rimraf dist node_modules typings", "typings": "typings install", - "build": "npm run tslint && typings install && rimraf dist && tsc && npm run copytemplates && license-check", - "build:w": "npm run tslint && typings install && rimraf dist && npm run watch-task", - "watch-task": "concurrently \"npm run tsc:w\" \"npm run copytemplates:w\" \"license-check\"", - "tslint": "npm run tslint-src && npm run tslint-root", - "tslint-src": "tslint -c tslint.json src/{,**/}**.ts", - "tslint-root": "tslint -c tslint.json *.ts", - "copytemplates": "npm run copy-html-css && npm run copy-i18n", - "copytemplates:w": "concurrently \"npm run copy-html-css:w\" \"npm run copy-i18n:w\"", - "copy-html-css": "cpx \"./src/**/*.{html,css}\" ./dist/src", - "copy-html-css:w": "cpx \"./src/**/*.{html,css}\" ./dist/src -w", - "copy-i18n": "cpx \"./i18n/**/*.json\" ./dist/i18n", - "copy-i18n:w": "cpx \"./i18n/**/*.json\" ./dist/i18n -w", + "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", + "build:w": "npm run tslint && rimraf dist && npm run watch-task", + "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", + "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts", + "copy-dist": "cpx \"./src/**/*.{html,css,json,png,jpg,gif,svg}\" ./dist/src", + "copy-dist:w": "cpx \"./src/**/*.{html,css,json,png,jpg,gif,svg}\" ./dist/src -w", "tsc": "tsc", "tsc:w": "tsc -w", "pretest": "npm run build", @@ -108,13 +103,7 @@ }, "license-check-config": { "src": [ - "**/*.js", - "**/*.ts", - "!/**/coverage/**/*", - "!/**/demo/**/*", - "!/**/node_modules/**/*", - "!/**/typings/**/*", - "!*.js" + "./dist/**/*.js" ], "path": "assets/license_header.txt", "blocking": true, diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index b79b6f8958..5ee809f61b 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -56,7 +56,7 @@ export class FileUploadingDialogComponent implements OnInit { constructor(private cd: ChangeDetectorRef, translate: AlfrescoTranslationService, private _uploaderService: UploadService) { - translate.addTranslationFolder('node_modules/ng2-alfresco-upload'); + translate.addTranslationFolder('node_modules/ng2-alfresco-upload/dist/src'); } ngOnInit() { diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 67dea42301..4938e4c8b3 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -92,7 +92,7 @@ export class UploadButtonComponent { let formFields = this.createFormFields(); this._uploaderService.setOptions(formFields); this.translate = translate; - this.translate.addTranslationFolder('node_modules/ng2-alfresco-upload'); + this.translate.addTranslationFolder('node_modules/ng2-alfresco-upload/dist/src'); } /** diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index c6994d8acb..8b92fec338 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -66,7 +66,7 @@ export class UploadDragAreaComponent { this._uploaderService.setOptions(formFields); this.translate = translate; - this.translate.addTranslationFolder('node_modules/ng2-alfresco-upload'); + this.translate.addTranslationFolder('node_modules/ng2-alfresco-upload/dist/src'); } /** diff --git a/ng2-components/ng2-alfresco-upload/i18n/en.json b/ng2-components/ng2-alfresco-upload/src/i18n/en.json similarity index 100% rename from ng2-components/ng2-alfresco-upload/i18n/en.json rename to ng2-components/ng2-alfresco-upload/src/i18n/en.json diff --git a/ng2-components/ng2-alfresco-upload/i18n/it.json b/ng2-components/ng2-alfresco-upload/src/i18n/it.json similarity index 100% rename from ng2-components/ng2-alfresco-upload/i18n/it.json rename to ng2-components/ng2-alfresco-upload/src/i18n/it.json diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index 84865481dc..1c66757ee1 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import { EventEmitter, Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable';