#1026 fix bundles

2025-07-24 17:32:15 +00:00 · 2016-12-15 01:05:54 +00:00
parent e133fd6408
commit 04768f9798
34 changed files with 145 additions and 290 deletions
--- 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) => {
+        source = source.replace(moduleIdRegex, (match) => {
                return `// ${match}`;
    });
    }

    if (moduleNameRegex.test(source)) {
-        result = source.replace(moduleNameRegex, (match) => {
+        source = source.replace(moduleNameRegex, (match) => {
                return `// ${match}`;
    });
    }

-    return result;
+    if (moduleIdPath.test(source)) {
+        source = source.replace(moduleIdPath, (match) => {
+                return `''.replace`;
+    });
+    }
+
+    return source;
 }
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -44,13 +44,21 @@ module.exports = {
        },
        fallback: rootPath
    },
-
    module: {
+        preLoaders: [
+        {
+            test: /\.js$/,
+            include: [
+                ...alfrescoLibs
+    ],
+        loader: 'source-map-loader'
+    }
+],
        loaders: [
            {
                test: /\.ts$/,
-        loaders: ['awesome-typescript-loader', 'angular2-template-loader'],
-        exclude: /node_modules/
+                loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'],
+                exclude: ['node_modules','public']
            },
            {
                test: /\.js$/,
@@ -59,43 +67,43 @@ module.exports = {
        ],
        loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader']
    },
-      {
+{
    test: /\.html$/,
        exclude: alfrescoLibs,
    loader: 'html'
-      },
-      {
+},
+{
    test: /\.html$/,
        include: alfrescoLibs,
    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$/,
        exclude: [
    helpers.root('app'),
    ...alfrescoLibs
-        ],
+],
    loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
-      },
-      {
+},
+{
    test: /\.css$/,
        include: [
    helpers.root('app'),
    ...alfrescoLibs
-        ],
+],
    loader: 'raw'
-      }
-    ]
-  },
+}
+]
+},

-  plugins: [
+plugins: [

    new webpack.ProvidePlugin({
        'dialogPolyfill': 'dialog-polyfill/dialog-polyfill'
@@ -108,10 +116,10 @@ module.exports = {
    new HtmlWebpackPlugin({
        template: 'index.html'
    })
-  ],
+],

    node: {
    fs: 'empty',
        module: false
-  }
+}
 };
--- 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'),
--- a/demo-shell-ng2/server/versions.js
+++ b/demo-shell-ng2/server/versions.js
@@ -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'
-};
--- 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
--- 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": [
--- 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
--- 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": [
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {
--- 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
--- 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": {