From d64c2755eb12432fa3df7cd80949ffb7fa612173 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Fri, 15 Jul 2016 11:42:41 +0100
Subject: [PATCH] Improve 'login' package config

---
 .../ng2-alfresco-login/package.json           | 28 +++++--------------
 .../components/alfresco-login.component.ts    |  2 +-
 .../ng2-alfresco-login/{ => src}/i18n/en.json |  0
 .../ng2-alfresco-login/{ => src}/i18n/it.json |  0
 4 files changed, 8 insertions(+), 22 deletions(-)
 rename ng2-components/ng2-alfresco-login/{ => src}/i18n/en.json (100%)
 rename ng2-components/ng2-alfresco-login/{ => src}/i18n/it.json (100%)

diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index 98d95e3051..2bacb381ce 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -4,22 +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": "npm run tslint && typings install && rimraf dist && tsc && npm run copy-dist && 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 && npm run copy-images",
-    "copytemplates:w": "concurrently \"npm run copy-html-css:w\" \"npm run copy-images: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",
-    "copy-images": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src",
-    "copy-images:w": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src -w",
+    "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",
@@ -88,7 +81,6 @@
   "devDependencies": {
     "concurrently": "2.1.0",
     "cpx": "1.3.1",
-    "http-server": "0.8.5",
     "jasmine-core": "2.4.1",
     "karma": "0.13.22",
     "karma-chrome-launcher": "1.0.1",
@@ -110,13 +102,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-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index d578292197..c5fa4405bc 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -88,7 +88,7 @@ export class AlfrescoLoginComponent {
             }
         };
 
-        translate.addTranslationFolder('node_modules/ng2-alfresco-login');
+        translate.addTranslationFolder('node_modules/ng2-alfresco-login/dist/src');
 
         this.form.valueChanges.subscribe(data => this.onValueChanged(data));
 
diff --git a/ng2-components/ng2-alfresco-login/i18n/en.json b/ng2-components/ng2-alfresco-login/src/i18n/en.json
similarity index 100%
rename from ng2-components/ng2-alfresco-login/i18n/en.json
rename to ng2-components/ng2-alfresco-login/src/i18n/en.json
diff --git a/ng2-components/ng2-alfresco-login/i18n/it.json b/ng2-components/ng2-alfresco-login/src/i18n/it.json
similarity index 100%
rename from ng2-components/ng2-alfresco-login/i18n/it.json
rename to ng2-components/ng2-alfresco-login/src/i18n/it.json