You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/06/20 02:59:03 UTC
[40/50] [abbrv] ignite git commit: IGNITE-3319 Review.
IGNITE-3319 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2bc83e61
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2bc83e61
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2bc83e61
Branch: refs/heads/ignite-3262
Commit: 2bc83e61e05301c82a124ba46ca1ccf61ac7f0e8
Parents: f70157e
Author: Andrey Novikov <an...@apache.org>
Authored: Wed Jun 15 18:42:27 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Wed Jun 15 18:42:27 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/states/signin.state.js | 4 ++--
.../src/main/js/gulpfile.babel.js/tasks/bundle.js | 3 ++-
.../src/main/js/gulpfile.babel.js/tasks/copy.js | 1 +
.../src/main/js/gulpfile.babel.js/tasks/watch.js | 2 +-
.../src/main/js/gulpfile.babel.js/webpack/common.js | 11 ++++++-----
.../webpack/environments/development.js | 2 --
.../gulpfile.babel.js/webpack/environments/production.js | 2 --
.../src/main/js/gulpfile.babel.js/webpack/index.js | 9 +++------
modules/web-console/src/main/js/serve/agent.js | 2 +-
9 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/signin.state.js b/modules/web-console/src/main/js/app/modules/states/signin.state.js
index 916040e..a23a496 100644
--- a/modules/web-console/src/main/js/app/modules/states/signin.state.js
+++ b/modules/web-console/src/main/js/app/modules/states/signin.state.js
@@ -16,7 +16,7 @@
*/
import angular from 'angular';
-import signinTemplateUrl from 'views/signin.jade';
+import templateUrl from 'views/signin.jade';
angular
.module('ignite-console.states.login', [
@@ -29,7 +29,7 @@ angular
$stateProvider
.state('signin', {
url: '/',
- templateUrl: signinTemplateUrl,
+ templateUrl,
metaTags: {
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index f4e7fcc..d3e8dca 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -21,10 +21,11 @@ import webpackConfig from '../webpack';
import WebpackDevServer from 'webpack-dev-server';
gulp.task('bundle', (cb) => {
- if (process.env.NODE_ENV === 'development')
+ if (process.env.NODE_ENV === 'development') {
// Important! Call webpack and WebpackDevServer must be inline.
new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer)
.listen(webpackConfig.devServer.port, 'localhost', cb);
+ }
else
webpack(webpackConfig, cb);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index c0ec9b5..ac31fdd 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -23,6 +23,7 @@ import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, ig
gulp.task('copy', (cb) => {
const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
+
return sequence(tasks, cb);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 33b0727..b958816 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -22,7 +22,7 @@ import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPath
gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', 'copy:ignite_modules:js', cb));
-// Build + connect + watch task.
+// Build + watch task.
gulp.task('watch', ['build'], () => {
gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']);
gulp.watch(resourcePaths, ['copy:resource']);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/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 6160af1..e686762 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
@@ -22,10 +22,12 @@ import progressPlugin from './plugins/progress';
//import Manifest from 'manifest-revision-webpack-plugin';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
+
import {srcDir, destDir, rootDir} from '../paths';
const NODE_ENV = process.env.NODE_ENV || 'production';
const IS_DEVELOPMENT = NODE_ENV === 'development';
+
const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
export default () => {
@@ -35,29 +37,28 @@ export default () => {
node: {
fs: 'empty'
},
+
// Entry points.
entry: {
polyfill: 'babel-polyfill',
app: path.join(srcDir, 'index.js'),
vendor: path.join(srcDir, 'vendor.js')
},
-
+
// Output system.
output: {
path: destDir,
publicPath: './',
filename: '[name].js'
},
-
+
// Resolves modules.
resolve: {
extensions: ['', '.js'],
root: [rootDir],
modulesDirectories: [NODE_MODULES_PATH, './'],
- alias: {
- }
},
-
+
// Modules resolvers.
module: {
noParse: [],
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index 716bc25..defbb77 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -22,7 +22,6 @@ import jade from 'jade';
import path from 'path';
export default () => {
-
let plugins = [
new webpack.HotModuleReplacementPlugin(),
new HtmlWebpackPlugin({
@@ -34,7 +33,6 @@ export default () => {
})
];
-
return {
context: rootDir,
debug: true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/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 5630448..9bb5e1d 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
@@ -23,7 +23,6 @@ import jade from 'jade';
import {destDir, rootDir} from '../../paths';
export default () => {
-
const plugins = [
new HtmlWebpackPlugin({
filename: 'index.html',
@@ -54,5 +53,4 @@ export default () => {
},
plugins
};
-
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
index 25eda4c..6682f9c 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
@@ -20,16 +20,13 @@ import commonConfig from './common';
import devConfig from './environments/development';
import prodConfig from './environments/production';
-const ENV = process.env.NODE_ENV ? process.env.NODE_ENV : 'production';
+const env = process.env.NODE_ENV || 'production';
+// Config by environments.
const configs = {
- // Common config section.
- common: commonConfig,
-
- // Config by environments.
production: prodConfig,
development: devConfig
};
// Load config file by environment
-export default _.merge(configs.common(), configs[ENV]());
+export default _.merge(commonConfig(), configs[env]());
http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/serve/agent.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/serve/agent.js b/modules/web-console/src/main/js/serve/agent.js
index 7a79cda..456aba9 100644
--- a/modules/web-console/src/main/js/serve/agent.js
+++ b/modules/web-console/src/main/js/serve/agent.js
@@ -549,7 +549,7 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio, settings, mo
*/
attach(srv) {
if (this._server)
- throw 'Agent server already started';
+ throw 'Agent server already started!';
this._server = srv;