ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [01/51] [abbrv] ignite git commit: IGNITE-3319 Migrated frontend build to webpack.
Date Fri, 01 Jul 2016 07:17:48 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3262 4abab8954 -> 2f7912359


http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/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 776ebdc..aea4a2c 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -4,8 +4,8 @@
   "description": "Interactive Web console for configuration, executing SQL queries and monitoring
of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-    "start": "jspm i && gulp build --debug && node serve",
-    "eslint": "node_modules/.bin/gulp eslint"
+    "dev": "cross-env NODE_ENV=development gulp watch",
+    "build": "cross-env NODE_ENV=production gulp build"
   },
   "author": "",
   "contributors": [
@@ -18,254 +18,108 @@
   "keywords": "grid",
   "homepage": "https://ignite.apache.org/",
   "engines": {
-    "node": ">=0.12.4"
+    "npm": "^3.x.x",
+    "node": "^4.x.x"
   },
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
   "dependencies": {
-    "async": "1.5.2",
+    "angular": "^1.5.5",
+    "angular-animate": "^1.5.5",
+    "angular-aria": "^1.5.5",
+    "angular-cookies": "^1.5.5",
+    "angular-drag-and-drop-lists": "^1.4.0",
+    "angular-gridster": "^0.13.3",
+    "angular-motion": "^0.4.4",
+    "angular-nvd3": "^1.0.7",
+    "angular-retina": "^0.3.13",
+    "angular-sanitize": "^1.5.5",
+    "angular-smart-table": "^2.1.8",
+    "angular-socket-io": "^0.7.0",
+    "angular-strap": "^2.3.8",
+    "angular-touch": "^1.5.5",
+    "angular-tree-control": "^0.2.26",
+    "angular-ui-grid": "^3.1.1",
+    "angular-ui-router": "^0.3.1",
     "body-parser": "^1.15.0",
     "bootstrap-sass": "^3.3.6",
+    "brace": "^0.8.0",
     "connect-mongo": "^1.1.0",
     "cookie-parser": "~1.4.0",
-    "debug": "~2.2.0",
-    "express": "~4.13.3",
+    "es6-promise": "^3.0.2",
+    "express": "^4.14.0",
     "express-session": "^1.12.0",
+    "file-saver": "^1.3.2",
     "fire-up": "^1.0.0",
-    "jade": "~1.11.0",
-    "jszip": "^2.6.0",
+    "font-awesome": "^4.6.3",
+    "glob": "^7.0.3",
+    "jquery": "^3.0.0",
+    "jszip": "^3.0.0",
     "lodash": "^4.8.2",
     "mongoose": "^4.4.11",
     "mongoose-deep-populate": "^3.0.0",
     "nconf": "^0.8.2",
     "nodemailer": "^2.3.0",
+    "nvd3": "^1.8.3",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0",
     "passport.socketio": "^3.6.1",
+    "query-command-supported": "^1.0.0",
     "require-dir": "^0.3.0",
     "socket.io": "^1.4.5",
+    "socket.io-client": "^1.4.6",
+    "ui-router-metatags": "^1.0.3",
     "ws": "^0.8.0"
   },
   "devDependencies": {
-    "babel-core": "^6.7.2",
-    "babel-eslint": "^6.0.2",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-register": "^6.7.2",
-    "gulp": "^3.9.0",
-    "gulp-cached": "^1.1.0",
-    "gulp-connect": "^3.2.2",
-    "gulp-environments": "^0.1.1",
-    "gulp-eslint": "^2.0.0",
-    "gulp-html-replace": "^1.5.5",
-    "gulp-ignore": "^2.0.1",
+    "assets-webpack-plugin": "^3.2.0",
+    "autoprefixer-core": "^6.0.1",
+    "babel-core": "^6.7.6",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-plugin-transform-runtime": "^6.7.5",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-angular": "^6.0.15",
+    "babel-runtime": "^6.6.1",
+    "bootstrap-loader": "^1.0.10",
+    "cross-env": "^1.0.7",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.9.0",
+    "eslint-loader": "^1.0.0",
+    "expose-loader": "^0.7.1",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.9.0",
+    "gulp": "^3.9.1",
     "gulp-inject": "^4.0.0",
     "gulp-jade": "^1.1.0",
     "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^2.1.0",
     "gulp-sequence": "^0.4.1",
     "gulp-util": "^3.0.7",
-    "http-proxy-middleware": "^0.13.0",
-    "jspm": "^0.16.32",
-    "mocha": "~2.4.5",
+    "html-loader": "^0.4.3",
+    "html-webpack-plugin": "^2.21.0",
+    "imagemin-pngquant": "^5.0.0",
+    "jade": "^1.11.0",
+    "jade-html-loader": "0.0.3",
+    "json-loader": "^0.5.4",
+    "mocha": "~2.5.3",
     "morgan": "^1.7.0",
-    "should": "^8.3.0",
-    "supertest": "^1.1.0"
-  },
-  "jspm": {
-    "directories": {
-      "packages": "build/jspm_packages"
-    },
-    "configFile": "build/system.config.js",
-    "dependencies": {
-      "ace": "github:ajaxorg/ace-builds@1.2.3",
-      "angular": "github:angular/bower-angular@^1.5.0",
-      "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
-      "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
-      "angular-gridster": "github:ManifestWebDesign/angular-gridster@^0.13.5",
-      "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-      "angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
-      "angular-retina": "github:jrief/angular-retina@0.3.8",
-      "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
-      "angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
-      "angular-socket-io": "github:btford/angular-socket-io@^0.7.0",
-      "angular-strap": "github:mgcrea/angular-strap@2.3.8",
-      "angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
-      "angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
-      "angular-ui-router": "github:angular-ui/ui-router@^0.2.15",
-      "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@^1.0.3",
-      "blob": "github:eligrey/Blob.js@master",
-      "bootstrap-carousel": "github:twbs/bootstrap@^3.3.6",
-      "css": "github:systemjs/plugin-css@^0.1.20",
-      "file-saver": "github:eligrey/FileSaver.js@master",
-      "font-awesome": "npm:font-awesome@4.5.0",
-      "jade": "github:johnsoftek/plugin-jade@^0.6.0",
-      "jquery": "github:components/jquery@^2.1.4",
-      "json": "github:systemjs/plugin-json@^0.1.0",
-      "jszip": "github:Stuk/jszip@^2.5.0",
-      "lodash": "github:lodash/lodash@^4.2.6",
-      "pdfmake": "github:bpampuch/pdfmake@^0.1.20",
-      "query-command-supported": "github:zenorocha/document.queryCommandSupported@^1.0.0",
-      "socket.io-client": "github:socketio/socket.io-client@1.4.5",
-      "text": "github:systemjs/plugin-text@^0.0.7"
-    },
-    "devDependencies": {
-      "babel": "npm:babel-core@^5.8.24",
-      "babel-runtime": "npm:babel-runtime@^5.8.24",
-      "clean-css": "npm:clean-css@^3.4.8",
-      "core-js": "npm:core-js@^1.1.4"
-    },
-    "overrides": {
-      "github:angular/bower-angular@1.5.0": {
-        "format": "global",
-        "dependencies": {
-          "jquery": "github:components/jquery@^2.1.4"
-        },
-        "shim": {
-          "angular": {
-            "deps": [
-              "jquery"
-            ]
-          }
-        }
-      },
-      "github:btford/angular-socket-io@0.7.0": {
-        "dependencies": {
-          "socket.io-client": "github:socketio/socket.io-client@1.4.5"
-        }
-      },
-      "github:socketio/socket.io-client@1.4.5": {
-        "format": "global",
-        "main": "socket.io",
-        "shim": {
-          "socket.io": {
-            "exports": "io"
-          }
-        }
-      },
-      "github:Stuk/jszip@2.5.0": {
-        "format": "global",
-        "main": "./dist/jszip"
-      },
-      "github:bpampuch/pdfmake@0.1.20": {
-        "format": "global",
-        "main": "vfs_fonts",
-        "shim": {
-          "vfs_fonts": {
-            "deps": [
-              "./pdfmake"
-            ],
-            "exports": "pdfMake"
-          }
-        }
-      },
-      "github:zenorocha/document.queryCommandSupported@1.0.0": {
-        "format": "global"
-      },
-      "github:krispo/angular-nvd3@1.0.4": {
-        "main": "dist/angular-nvd3",
-        "dependencies": {
-          "nvd3": "npm:nvd3@1.8.1",
-          "d3": "npm:d3@3.5.14"
-        },
-        "shim": {
-          "dist/angular-nvd3": {
-            "deps": [
-              "d3",
-              "nvd3",
-              "nvd3/build/nv.d3.css!"
-            ]
-          }
-        }
-      },
-      "github:components/jquery@2.1.4": {
-        "format": "global"
-      },
-      "github:ajaxorg/ace-builds@1.2.3": {
-        "format": "global",
-        "main": "theme-chrome",
-        "shim": {
-          "theme-chrome": {
-            "exports": "ace",
-            "deps": [
-              "./ace",
-              "./mode-xml",
-              "./mode-java",
-              "./mode-sql",
-              "./ext-language_tools",
-              "./mode-dockerfile"
-            ]
-          },
-          "ace": {
-            "exports": "ace"
-          },
-          "mode-xml": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-java": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-sql": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "ext-language_tools": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "worker-xml": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-dockerfile": {
-            "deps": [
-              "./ace"
-            ]
-          }
-        }
-      },
-      "github:angular-ui/bower-ui-grid@3.0.7": {
-        "dependencies": {
-          "pdfmake": "github:bpampuch/pdfmake@^0.1.20"
-        }
-      },
-      "github:mgcrea/angular-strap@2.3.8": {
-        "directories": {
-          "lib": "dist"
-        },
-        "main": "angular-strap.tpl",
-        "dependencies": {
-          "angular": "^1",
-          "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
-          "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-          "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0"
-        },
-        "shim": {
-          "angular-strap.tpl": {
-            "deps": [
-              "./angular-strap",
-              "angular"
-            ]
-          }
-        }
-      },
-      "github:eligrey/FileSaver.js@master": {
-        "format": "global",
-        "dependencies": {
-          "blob": "github:eligrey/Blob.js@master"
-        }
-      },
-      "github:eligrey/Blob.js@master": {
-        "format": "global"
-      },
-      "github:jrief/angular-retina@0.3.8": {
-        "main": "build/angular-retina.min"
-      }
-    }
+    "ng-annotate-loader": "0.1.0",
+    "ngtemplate-loader": "^1.3.1",
+    "node-sass": "^3.4.2",
+    "postcss-loader": "^0.9.1",
+    "resolve-url-loader": "^1.4.3",
+    "sass-loader": "^3.1.1",
+    "should": "^9.0.2",
+    "style-loader": "^0.13.1",
+    "supertest": "^1.1.0",
+    "url": "^0.11.0",
+    "url-loader": "^0.5.6",
+    "webpack": "^1.13.1",
+    "webpack-dev-server": "^1.14.1"
   }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/public/stylesheets/_font-awesome-custom.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/public/stylesheets/_font-awesome-custom.scss
b/modules/web-console/src/main/js/public/stylesheets/_font-awesome-custom.scss
index 6ce9550..514acc2 100644
--- a/modules/web-console/src/main/js/public/stylesheets/_font-awesome-custom.scss
+++ b/modules/web-console/src/main/js/public/stylesheets/_font-awesome-custom.scss
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/variables";
-$fa-font-path: "/jspm_packages/npm/font-awesome@4.5.0/fonts";
+@import '~font-awesome/scss/variables';
 
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/mixins";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/path";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/core";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/larger";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/fixed-width";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/list";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/bordered-pulled";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/animated";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/rotated-flipped";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/stacked";
-@import "../../build/jspm_packages/npm/font-awesome@4.5.0/scss/icons";
+$fa-font-path: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/fonts';
+
+@import '~font-awesome/scss/mixins';
+@import '~font-awesome/scss/path';
+@import '~font-awesome/scss/core';
+@import '~font-awesome/scss/larger';
+@import '~font-awesome/scss/fixed-width';
+@import '~font-awesome/scss/list';
+@import '~font-awesome/scss/bordered-pulled';
+@import '~font-awesome/scss/animated';
+@import '~font-awesome/scss/rotated-flipped';
+@import '~font-awesome/scss/stacked';
+@import '~font-awesome/scss/icons';

http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/public/stylesheets/style.scss b/modules/web-console/src/main/js/public/stylesheets/style.scss
index 2c047ac..43e4dd4 100644
--- a/modules/web-console/src/main/js/public/stylesheets/style.scss
+++ b/modules/web-console/src/main/js/public/stylesheets/style.scss
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-@import "font-awesome-custom";
-@import "bootstrap-custom";
-
+@import "./font-awesome-custom";
+@import "./bootstrap-custom";
 @import "./variables";
 
 @import "./../../app/directives/information/information.scss";
@@ -26,14 +25,14 @@
     font-family: 'Roboto Slab';
     font-style: normal;
     font-weight: 400;
-    src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(//fonts.gstatic.com/s/robotoslab/v6/y7lebkjgREBJK96VQi37ZiwlidHJgAgmTjOEEzwu1L8.ttf)
format('truetype');
+    src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(https://fonts.gstatic.com/s/robotoslab/v6/y7lebkjgREBJK96VQi37ZiwlidHJgAgmTjOEEzwu1L8.ttf)
format('truetype');
 }
 
 @font-face {
     font-family: 'Roboto Slab';
     font-style: normal;
     font-weight: 700;
-    src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(//fonts.gstatic.com/s/robotoslab/v6/dazS1PrQQuCxC3iOAJFEJTdGNerWpg2Hn6A-BxWgZ_I.ttf)
format('truetype');
+    src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(https://fonts.gstatic.com/s/robotoslab/v6/dazS1PrQQuCxC3iOAJFEJTdGNerWpg2Hn6A-BxWgZ_I.ttf)
format('truetype');
 }
 
 hr {

http://git-wip-us.apache.org/repos/asf/ignite/blob/5baae1ec/modules/web-console/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.jade b/modules/web-console/src/main/js/views/index.jade
index 8514533..2bfd96d 100644
--- a/modules/web-console/src/main/js/views/index.jade
+++ b/modules/web-console/src/main/js/views/index.jade
@@ -30,11 +30,6 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
         meta(name='keywords' content='{{$meta.keywords}}')
         meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' content='{{::value}}')
 
-        // build:css
-        link(rel='stylesheet', href='/vendors.css')
-        link(rel='stylesheet', href='/app.css')
-        // endbuild
-
     body.theme-line.body-overlap.greedy
 
         .splash.splash-max-foreground(hide-on-state-change)
@@ -52,15 +47,3 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
                 label {{IgniteDemoMode ? "Demo" : "Beta" }}
 
         .wrapper(ui-view='')
-
-
-        // build:js
-        script(src='jspm_packages/system.js')
-        script(src='system.config.js')
-        script(src='vendors.js')
-        script(src='app.js')
-        script System.import('app/index');
-        // endbuild
-
-        // ignite:plugins
-        // endignite
\ No newline at end of file


Mime
View raw message