From 04768f9798a6bfa47d650ffe955cfa77998aac38 Mon Sep 17 00:00:00 2001
From: Mario Romano <dnamario@hotmail.com>
Date: Thu, 15 Dec 2016 01:05:54 +0000
Subject: [PATCH] #1026 fix bundles

---
 demo-shell-ng2/config/loaders/system.js       |  23 ++-
 demo-shell-ng2/config/webpack.common.js       | 154 +++++++++---------
 demo-shell-ng2/config/webpack.dev.js          |   3 +-
 demo-shell-ng2/server/versions.js             |  42 -----
 .../ng2-activiti-analytics/.npmignore         |  12 +-
 .../ng2-activiti-analytics/package.json       |   2 +-
 .../ng2-activiti-diagrams/.npmignore          |  12 +-
 .../ng2-activiti-diagrams/package.json        |   2 +-
 ng2-components/ng2-activiti-form/.npmignore   |  12 +-
 ng2-components/ng2-activiti-form/package.json |   2 +-
 .../ng2-activiti-processlist/.npmignore       |  12 +-
 .../ng2-activiti-processlist/package.json     |   2 +-
 .../ng2-activiti-tasklist/.npmignore          |  12 +-
 .../ng2-activiti-tasklist/package.json        |   2 +-
 ng2-components/ng2-alfresco-core/.npmignore   |  12 +-
 ng2-components/ng2-alfresco-core/package.json |   2 +-
 .../ng2-alfresco-datatable/.npmignore         |  12 +-
 .../ng2-alfresco-datatable/package.json       |   2 +-
 .../ng2-alfresco-documentlist/.npmignore      |  12 +-
 .../ng2-alfresco-documentlist/package.json    |   2 +-
 ng2-components/ng2-alfresco-login/.npmignore  |  12 +-
 .../ng2-alfresco-login/package.json           |   2 +-
 ng2-components/ng2-alfresco-search/.npmignore |  12 +-
 .../ng2-alfresco-search/package.json          |   2 +-
 ng2-components/ng2-alfresco-tag/.npmignore    |  12 +-
 ng2-components/ng2-alfresco-tag/package.json  |   2 +-
 ng2-components/ng2-alfresco-upload/.npmignore |  12 +-
 .../ng2-alfresco-upload/package.json          |   2 +-
 .../ng2-alfresco-userinfo/.npmignore          |  12 +-
 .../ng2-alfresco-userinfo/package.json        |   2 +-
 ng2-components/ng2-alfresco-viewer/.npmignore |  15 +-
 .../ng2-alfresco-viewer/package.json          |   2 +-
 .../ng2-alfresco-webscript/.npmignore         |  12 +-
 .../ng2-alfresco-webscript/package.json       |   2 +-
 34 files changed, 145 insertions(+), 290 deletions(-)
 delete mode 100644 demo-shell-ng2/server/versions.js

diff --git a/demo-shell-ng2/config/loaders/system.js b/demo-shell-ng2/config/loaders/system.js
index 836b205604..3e3e4aa3b6 100644
--- a/demo-shell-ng2/config/loaders/system.js
+++ b/demo-shell-ng2/config/loaders/system.js
@@ -1,22 +1,27 @@
 const moduleIdRegex = /moduleId: module.id,/g;
 const moduleNameRegex = /moduleId: __moduleName,/g;
+const moduleIdPath = /module.id.replace/g;
 
 module.exports = function(source) {
     this.cacheable();
 
-    let result = source;
-
     if (moduleIdRegex.test(source)) {
-        result = source.replace(moduleIdRegex, (match) => {
-            return `// ${match}`;
-        });
+        source = source.replace(moduleIdRegex, (match) => {
+                return `// ${match}`;
+    });
     }
 
     if (moduleNameRegex.test(source)) {
-        result = source.replace(moduleNameRegex, (match) => {
-            return `// ${match}`;
-        });
+        source = source.replace(moduleNameRegex, (match) => {
+                return `// ${match}`;
+    });
     }
 
-    return result;
+    if (moduleIdPath.test(source)) {
+        source = source.replace(moduleIdPath, (match) => {
+                return `''.replace`;
+    });
+    }
+
+    return source;
 }
diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index 1d36e8b4c0..da0c42583a 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -21,97 +21,105 @@ let alfrescoLibs = glob.sync(pattern, options);
 // let alfrescoLibsModules = alfrescoLibs.map(p => path.join(p, 'node_modules'));
 
 module.exports = {
-  entry: {
-    'polyfills': './app/polyfills.ts',
-    'vendor': './app/vendor.ts',
-    'app': './app/main.ts'
-  },
+    entry: {
+        'polyfills': './app/polyfills.ts',
+        'vendor': './app/vendor.ts',
+        'app': './app/main.ts'
+    },
 
-  resolve: {
-    extensions: ['', '.ts', '.js'],
-    modules: [
-      helpers.root('app'),
-      helpers.root('node_modules')
+    resolve: {
+        extensions: ['', '.ts', '.js'],
+        modules: [
+            helpers.root('app'),
+            helpers.root('node_modules')
+        ],
+        root: rootPath,
+        fallback: rootPath
+    },
+
+    resolveLoader: {
+        alias: {
+            'systemjs-loader': helpers.root('config', 'loaders', 'system.js'),
+            'debug-loader': helpers.root('config', 'loaders', 'debug.js')
+        },
+        fallback: rootPath
+    },
+    module: {
+        preLoaders: [
+        {
+            test: /\.js$/,
+            include: [
+                ...alfrescoLibs
     ],
-    root: rootPath,
-    fallback: rootPath
-  },
-
-  resolveLoader: {
-      alias: {
-          'systemjs-loader': helpers.root('config', 'loaders', 'system.js'),
-          'debug-loader': helpers.root('config', 'loaders', 'debug.js')
-      },
-      fallback: rootPath
-  },
-
-  module: {
-    loaders: [
-      {
-        test: /\.ts$/,
-        loaders: ['awesome-typescript-loader', 'angular2-template-loader'],
-        exclude: /node_modules/
-      },
-      {
-        test: /\.js$/,
-        include: [
-          ...alfrescoLibs
+        loader: 'source-map-loader'
+    }
+],
+        loaders: [
+            {
+                test: /\.ts$/,
+                loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'],
+                exclude: ['node_modules','public']
+            },
+            {
+                test: /\.js$/,
+                include: [
+                    ...alfrescoLibs
         ],
         loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader']
-      },
-      {
-        test: /\.html$/,
+    },
+{
+    test: /\.html$/,
         exclude: alfrescoLibs,
-        loader: 'html'
-      },
-      {
-        test: /\.html$/,
+    loader: 'html'
+},
+{
+    test: /\.html$/,
         include: alfrescoLibs,
-        loader: 'html',
-        query: {
-            interpolate: true
-        }
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+    loader: 'html',
+    query: {
+    interpolate: true
+}
+},
+{
+    test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
         loader: 'file?name=assets/[name].[hash].[ext]'
-      },
-      {
-        test: /\.css$/,
+},
+{
+    test: /\.css$/,
         exclude: [
-          helpers.root('app'),
-          ...alfrescoLibs
-        ],
-        loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
-      },
-      {
-        test: /\.css$/,
+    helpers.root('app'),
+    ...alfrescoLibs
+],
+    loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
+},
+{
+    test: /\.css$/,
         include: [
-          helpers.root('app'),
-          ...alfrescoLibs
-        ],
-        loader: 'raw'
-      }
-    ]
-  },
+    helpers.root('app'),
+    ...alfrescoLibs
+],
+    loader: 'raw'
+}
+]
+},
 
-  plugins: [
+plugins: [
 
     new webpack.ProvidePlugin({
-      'dialogPolyfill': 'dialog-polyfill/dialog-polyfill'
+        'dialogPolyfill': 'dialog-polyfill/dialog-polyfill'
     }),
 
     new webpack.optimize.CommonsChunkPlugin({
-      name: ['app', 'vendor', 'polyfills']
+        name: ['app', 'vendor', 'polyfills']
     }),
 
     new HtmlWebpackPlugin({
-      template: 'index.html'
+        template: 'index.html'
     })
-  ],
+],
 
-  node: {
-      fs: 'empty',
-      module: false
-  }
+    node: {
+    fs: 'empty',
+        module: false
+}
 };
diff --git a/demo-shell-ng2/config/webpack.dev.js b/demo-shell-ng2/config/webpack.dev.js
index 063d88db58..40a565e070 100644
--- a/demo-shell-ng2/config/webpack.dev.js
+++ b/demo-shell-ng2/config/webpack.dev.js
@@ -5,7 +5,8 @@ var helpers = require('./helpers');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = webpackMerge(commonConfig, {
-    devtool: 'cheap-module-source-map',
+
+    devtool: 'cheap-module-eval-source-map',
 
     output: {
         path: helpers.root('dist'),
diff --git a/demo-shell-ng2/server/versions.js b/demo-shell-ng2/server/versions.js
deleted file mode 100644
index 020843cf53..0000000000
--- a/demo-shell-ng2/server/versions.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-
-// wsrv extension that provides dynamic '/versions' route
-
-exports.register = function (server, options, next) {
-
-    var packages = [
-        'ng2-activiti-form',
-        'ng2-alfresco-core',
-        'ng2-alfresco-datatable',
-        'ng2-alfresco-documentlist',
-        'ng2-alfresco-login',
-        'ng2-alfresco-search',
-        'ng2-alfresco-upload',
-        'ng2-alfresco-viewer',
-        'ng2-alfresco-webscript'
-    ];
-
-    server.route({
-        method: 'GET',
-        path: '/versions',
-        handler: function (request, reply) {
-            var result = {
-                packages: packages.map(function (packageName) {
-                    return {
-                        name: packageName,
-                        version: require('./../node_modules/' + packageName + '/package.json').version
-                    }
-                })
-            };
-
-            return reply(result).type('application/json');
-        }
-    });
-
-    next();
-};
-
-exports.register.attributes = {
-    name: 'ng2-module-versions',
-    version: '1.0.0'
-};
diff --git a/ng2-components/ng2-activiti-analytics/.npmignore b/ng2-components/ng2-activiti-analytics/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-activiti-analytics/.npmignore
+++ b/ng2-components/ng2-activiti-analytics/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json
index 64b3c0a69f..2c5fcdaeea 100644
--- a/ng2-components/ng2-activiti-analytics/package.json
+++ b/ng2-components/ng2-activiti-analytics/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-activiti-analytics.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "contributors": [
diff --git a/ng2-components/ng2-activiti-diagrams/.npmignore b/ng2-components/ng2-activiti-diagrams/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-activiti-diagrams/.npmignore
+++ b/ng2-components/ng2-activiti-diagrams/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json
index bdda55682f..849a080cef 100644
--- a/ng2-components/ng2-activiti-diagrams/package.json
+++ b/ng2-components/ng2-activiti-diagrams/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-activiti-diagrams.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "contributors": [
diff --git a/ng2-components/ng2-activiti-form/.npmignore b/ng2-components/ng2-activiti-form/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-activiti-form/.npmignore
+++ b/ng2-components/ng2-activiti-form/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json
index 0646be10ad..de9a156fe8 100644
--- a/ng2-components/ng2-activiti-form/package.json
+++ b/ng2-components/ng2-activiti-form/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-activiti-form.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-activiti-processlist/.npmignore b/ng2-components/ng2-activiti-processlist/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-activiti-processlist/.npmignore
+++ b/ng2-components/ng2-activiti-processlist/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json
index a68c8ad2ea..801fc68cfd 100644
--- a/ng2-components/ng2-activiti-processlist/package.json
+++ b/ng2-components/ng2-activiti-processlist/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-activiti-processlist.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-activiti-tasklist/.npmignore b/ng2-components/ng2-activiti-tasklist/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-activiti-tasklist/.npmignore
+++ b/ng2-components/ng2-activiti-tasklist/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json
index 4f8f2c241a..498f4980c2 100644
--- a/ng2-components/ng2-activiti-tasklist/package.json
+++ b/ng2-components/ng2-activiti-tasklist/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-activiti-tasklist.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-core/.npmignore b/ng2-components/ng2-alfresco-core/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-core/.npmignore
+++ b/ng2-components/ng2-alfresco-core/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index c4ba32d0cd..178e8db3db 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-core.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-datatable/.npmignore b/ng2-components/ng2-alfresco-datatable/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-datatable/.npmignore
+++ b/ng2-components/ng2-alfresco-datatable/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index f68dccbc11..7119f4f6b9 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-datatable.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-documentlist/.npmignore b/ng2-components/ng2-alfresco-documentlist/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-documentlist/.npmignore
+++ b/ng2-components/ng2-alfresco-documentlist/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index c9ac48f802..23a26f56fc 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-documentlist.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-login/.npmignore b/ng2-components/ng2-alfresco-login/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-login/.npmignore
+++ b/ng2-components/ng2-alfresco-login/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index b12a4a0714..2e832958ba 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-login.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-search/.npmignore b/ng2-components/ng2-alfresco-search/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-search/.npmignore
+++ b/ng2-components/ng2-alfresco-search/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index e80298d3d2..2f09660525 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-search.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-tag/.npmignore b/ng2-components/ng2-alfresco-tag/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-tag/.npmignore
+++ b/ng2-components/ng2-alfresco-tag/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json
index 1b733cebea..e2097ccb4c 100644
--- a/ng2-components/ng2-alfresco-tag/package.json
+++ b/ng2-components/ng2-alfresco-tag/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-tag.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-upload/.npmignore b/ng2-components/ng2-alfresco-upload/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-upload/.npmignore
+++ b/ng2-components/ng2-alfresco-upload/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index 8b612f93ac..66e55d7e27 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-upload.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-userinfo/.npmignore b/ng2-components/ng2-alfresco-userinfo/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-userinfo/.npmignore
+++ b/ng2-components/ng2-alfresco-userinfo/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json
index 7c3cbaab44..c1b0dc22d6 100644
--- a/ng2-components/ng2-alfresco-userinfo/package.json
+++ b/ng2-components/ng2-alfresco-userinfo/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-userinfo.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-viewer/.npmignore b/ng2-components/ng2-alfresco-viewer/.npmignore
index 540fa08a04..c1922c5b29 100644
--- a/ng2-components/ng2-alfresco-viewer/.npmignore
+++ b/ng2-components/ng2-alfresco-viewer/.npmignore
@@ -1,5 +1,6 @@
 npm-debug.log
 .idea
+demo/localTestFile.pdf
 
 coverage/
 demo/
@@ -7,18 +8,12 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
+
+*.tgz
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 02854454a6..93a9f0c0a9 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-viewer.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {
diff --git a/ng2-components/ng2-alfresco-webscript/.npmignore b/ng2-components/ng2-alfresco-webscript/.npmignore
index 540fa08a04..8bb008aff4 100644
--- a/ng2-components/ng2-alfresco-webscript/.npmignore
+++ b/ng2-components/ng2-alfresco-webscript/.npmignore
@@ -7,18 +7,10 @@ node_modules
 typings/
 fonts/
 
-
 /.editorconfig
 /.travis.yml
-*.ts
-!*.d.ts
-!*.js
-!*.js.map
 /*.json
-*.spec.js
-*.tgz
-/.npmignore
 /karma-test-shim.js
 /karma.conf.js
-/make.js
-/package/
+/gulpfile.ts
+/.npmignore
diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json
index 098f05a3e7..14e61b5975 100644
--- a/ng2-components/ng2-alfresco-webscript/package.json
+++ b/ng2-components/ng2-alfresco-webscript/package.json
@@ -22,7 +22,7 @@
     "build.umd": "gulp build.prod --color --env-config prod --build-type prod",
     "reinstall": "npm cache clean && npm install"
   },
-  "main": "bundles/ng2-alfresco-webscript.js",
+  "main": "./index.js",
   "module": "./index.js",
   "typings": "./index.d.ts",
   "repository": {