ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [44/50] [abbrv] ignite git commit: IGNITE-3319 Fixed plugin definition.
Date Mon, 20 Jun 2016 02:59:07 GMT
IGNITE-3319 Fixed plugin definition.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0254f6a2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0254f6a2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0254f6a2

Branch: refs/heads/ignite-3262
Commit: 0254f6a29763ae77228ebcd51167ff3d0509f3e7
Parents: 567dbbe
Author: Maxim Afanasiev <mafkus@gmail.com>
Authored: Thu Jun 16 16:27:12 2016 +0700
Committer: Maxim Afanasiev <mafkus@gmail.com>
Committed: Thu Jun 16 16:27:12 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/gulpfile.babel.js/webpack/common.js      | 11 +++--------
 .../gulpfile.babel.js/webpack/environments/production.js |  1 -
 .../src/main/js/gulpfile.babel.js/webpack/manifest.json  |  1 -
 modules/web-console/src/main/js/package.json             |  1 +
 4 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 1369328..6cd238b 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -157,17 +157,12 @@ export default () => {
             }),
             new webpack.DefinePlugin({'NODE_ENV': JSON.stringify(NODE_ENV)}),
             // new webpack.NoErrorsPlugin(),
-            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
+            new webpack.optimize.DedupePlugin(),
             new webpack.optimize.CommonsChunkPlugin({
                 name: 'common',
-                async: true,
-                children: true,
-                minChunks: Infinity
+                chunks: ['vendor', 'app']
             }),
-            // new Manifest(path.join(_path + '/config', 'manifest.json'), {
-            //     rootAssetPath: rootAssetPath,
-            //     ignorePaths: ['.DS_Store']
-            // }),
+            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
             new ExtractTextPlugin('assets/css/[name]' + (development ? '' : '.[chunkhash]')
+ '.css', {allChunks: true}),
             new HtmlWebpackPlugin({
                 filename: 'index.html',

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index b2bfe78..1fede99 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -21,7 +21,6 @@ import {destDir, rootDir} from '../../paths';
 
 export default () => {
     const plugins = [
-        new webpack.optimize.DedupePlugin(),
         new webpack.optimize.UglifyJsPlugin({
             path: destDir,
             minimize: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
deleted file mode 100644
index 1b08f72..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"assets":{"app.map":"app.js.map","polyfill.map":"polyfill.js.map","vendor.map":"vendor.js.map","common.map":"common.js.map"},"publicPath":"/"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 0c8669c..e7cc110 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -83,6 +83,7 @@
     "ngtemplate-loader": "^1.3.1",
     "node-sass": "^3.4.2",
     "nodemailer": "^2.3.0",
+    "nvd3": "^1.8.3",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0",


Mime
View raw message