From 8ca6c8d03a8ef0ea13d54b41ed178f366c892d10 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Wed, 15 Jun 2016 14:19:40 +0100
Subject: [PATCH] Improve 'ng2-alfresco-search' imports

---
 .../components/search/search-bar.component.ts |  2 +-
 .../app/components/search/search.component.ts |  2 +-
 demo-shell-ng2/systemjs.config.js             | 21 ++++++++++---------
 ng2-components/ng2-alfresco-search/.gitignore |  4 ++--
 .../ng2-alfresco-search/demo/src/main.ts      |  2 +-
 .../{ng2-alfresco-search.ts => index.ts}      |  0
 6 files changed, 16 insertions(+), 15 deletions(-)
 rename ng2-components/ng2-alfresco-search/{ng2-alfresco-search.ts => index.ts} (100%)

diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts
index 6afe6d8b8c..d445d356b2 100644
--- a/demo-shell-ng2/app/components/search/search-bar.component.ts
+++ b/demo-shell-ng2/app/components/search/search-bar.component.ts
@@ -17,7 +17,7 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router-deprecated';
-import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search/dist/ng2-alfresco-search';
+import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
 import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
 import {
     AlfrescoAuthenticationService,
diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts
index 4af77dd72d..4a8bf72da3 100644
--- a/demo-shell-ng2/app/components/search/search.component.ts
+++ b/demo-shell-ng2/app/components/search/search.component.ts
@@ -16,7 +16,7 @@
  */
 
 import { Component } from '@angular/core';
-import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search/dist/ng2-alfresco-search';
+import { ALFRESCO_SEARCH_DIRECTIVES } from 'ng2-alfresco-search';
 
 declare let __moduleName: string;
 
diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js
index 3d12a1d10e..013d5f1210 100644
--- a/demo-shell-ng2/systemjs.config.js
+++ b/demo-shell-ng2/systemjs.config.js
@@ -13,11 +13,11 @@
         'ng2-translate': 'node_modules/ng2-translate',
         'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
         'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist',
-        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist',
-        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login',
-        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search',
-        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
-        'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer'
+        'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist/dist',
+        'ng2-alfresco-login': 'node_modules/ng2-alfresco-login/dist',
+        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist',
+        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload/dist',
+        'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer/dist'
     };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
@@ -26,13 +26,14 @@
         'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
         'ng2-translate': { defaultExtension: 'js' },
+        
         'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js'},
         'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js'},
-        'ng2-alfresco-documentlist': {defaultExtension: 'js'},
-        'ng2-alfresco-login': {defaultExtension: 'js'},
-        'ng2-alfresco-search': {defaultExtension: 'js'},
-        'ng2-alfresco-upload': {defaultExtension: 'js'},
-        'ng2-alfresco-viewer': {defaultExtension: 'js'}
+        'ng2-alfresco-documentlist': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-login': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-upload': { main: 'index.js', defaultExtension: 'js'},
+        'ng2-alfresco-viewer': { main: 'index.js', defaultExtension: 'js'}
     };
     var ngPackageNames = [
         'common',
diff --git a/ng2-components/ng2-alfresco-search/.gitignore b/ng2-components/ng2-alfresco-search/.gitignore
index 121768e216..787032431d 100644
--- a/ng2-components/ng2-alfresco-search/.gitignore
+++ b/ng2-components/ng2-alfresco-search/.gitignore
@@ -6,6 +6,6 @@ coverage/
 dist/
 src/**/*.js
 src/**/*.js.map
-ng2-alfresco-search.js
-ng2-alfresco-search.js.map
+index.js
+index.js.map
 !systemjs.config.js
diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts
index 240bc14f2d..4386921fac 100644
--- a/ng2-components/ng2-alfresco-search/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts
@@ -31,7 +31,7 @@ import {
     ALFRESCO_SEARCH_PROVIDERS,
     ALFRESCO_SEARCH_DIRECTIVES,
     AlfrescoService
-} from 'ng2-alfresco-search/dist/ng2-alfresco-search';
+} from 'ng2-alfresco-search';
 
 @Component({
     selector: 'alfresco-search-demo',
diff --git a/ng2-components/ng2-alfresco-search/ng2-alfresco-search.ts b/ng2-components/ng2-alfresco-search/index.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-search/ng2-alfresco-search.ts
rename to ng2-components/ng2-alfresco-search/index.ts