# HG changeset patch # User casties # Date 1490813937 -7200 # Node ID 7b9d616695d3ae60e8716893b9ffbffc38ed12bd # Parent 0d51fefdbae6e438db9b58111e18bdb02b47e330 new setup using webpack (and Angular 4). diff -r 0d51fefdbae6 -r 7b9d616695d3 bs-config.json --- a/bs-config.json Wed Mar 29 19:01:29 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -{ - "server": { - "baseDir": "src", - "routes": { - "/node_modules": "node_modules" - } - } -} diff -r 0d51fefdbae6 -r 7b9d616695d3 config/helpers.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/helpers.js Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,7 @@ +var path = require('path'); +var _root = path.resolve(__dirname, '..'); +function root(args) { + args = Array.prototype.slice.call(arguments, 0); + return path.join.apply(path, [_root].concat(args)); +} +exports.root = root; diff -r 0d51fefdbae6 -r 7b9d616695d3 config/webpack.common.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/webpack.common.js Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,66 @@ +var webpack = require('webpack'); +var HtmlWebpackPlugin = require('html-webpack-plugin'); +var ExtractTextPlugin = require('extract-text-webpack-plugin'); +var helpers = require('./helpers'); + +module.exports = { + entry: { + 'polyfills': './src/polyfills.ts', + 'vendor': './src/vendor.ts', + 'app': './src/main.ts' + }, + + resolve: { + extensions: ['.ts', '.js'] + }, + + module: { + rules: [ + { + test: /\.ts$/, + loaders: [ + { + loader: 'awesome-typescript-loader', + options: { configFileName: helpers.root('src', 'tsconfig.json') } + } , 'angular2-template-loader' + ] + }, + { + test: /\.html$/, + loader: 'html-loader' + }, + { + test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/, + loader: 'file-loader?name=assets/[name].[hash].[ext]' + }, + { + test: /\.css$/, + exclude: helpers.root('src', 'app'), + loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader?sourceMap' }) + }, + { + test: /\.css$/, + include: helpers.root('src', 'app'), + loader: 'raw-loader' + } + ] + }, + + plugins: [ + // Workaround for angular/angular#11580 + new webpack.ContextReplacementPlugin( + // The (\\|\/) piece accounts for path separators in *nix and Windows + /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, + helpers.root('./src'), // location of your src + {} // a map of your routes + ), + + new webpack.optimize.CommonsChunkPlugin({ + name: ['app', 'vendor', 'polyfills'] + }), + + new HtmlWebpackPlugin({ + template: 'src/index.html' + }) + ] +}; diff -r 0d51fefdbae6 -r 7b9d616695d3 config/webpack.dev.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/webpack.dev.js Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,24 @@ +var webpackMerge = require('webpack-merge'); +var ExtractTextPlugin = require('extract-text-webpack-plugin'); +var commonConfig = require('./webpack.common.js'); +var helpers = require('./helpers'); + +module.exports = webpackMerge(commonConfig, { + devtool: 'cheap-module-eval-source-map', + + output: { + path: helpers.root('dist'), + publicPath: 'http://localhost:8080/', + filename: '[name].js', + chunkFilename: '[id].chunk.js' + }, + + plugins: [ + new ExtractTextPlugin('[name].css') + ], + + devServer: { + historyApiFallback: true, + stats: 'minimal' + } +}); diff -r 0d51fefdbae6 -r 7b9d616695d3 config/webpack.prod.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/webpack.prod.js Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,38 @@ +var webpack = require('webpack'); +var webpackMerge = require('webpack-merge'); +var ExtractTextPlugin = require('extract-text-webpack-plugin'); +var commonConfig = require('./webpack.common.js'); +var helpers = require('./helpers'); + +const ENV = process.env.NODE_ENV = process.env.ENV = 'production'; + +module.exports = webpackMerge(commonConfig, { + devtool: 'source-map', + + output: { + path: helpers.root('dist'), + publicPath: '/', + filename: '[name].[hash].js', + chunkFilename: '[id].[hash].chunk.js' + }, + + plugins: [ + new webpack.NoEmitOnErrorsPlugin(), + new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618 + mangle: { + keep_fnames: true + } + }), + new ExtractTextPlugin('[name].[hash].css'), + new webpack.DefinePlugin({ + 'process.env': { + 'ENV': JSON.stringify(ENV) + } + }), + new webpack.LoaderOptionsPlugin({ + htmlLoader: { + minimize: false // workaround for ng2 + } + }) + ] +}); diff -r 0d51fefdbae6 -r 7b9d616695d3 package.json --- a/package.json Wed Mar 29 19:01:29 2017 +0200 +++ b/package.json Wed Mar 29 20:58:57 2017 +0200 @@ -2,59 +2,49 @@ "name": "ng2-ismi-query-app", "version": "1.1.0", "scripts": { - "build": "tsc -p src/", - "build:watch": "tsc -p src/ -w", - "build:e2e": "tsc -p e2e/", - "serve": "lite-server -c=bs-config.json", - "serve:e2e": "lite-server -c=bs-config.e2e.json", - "prestart": "npm run build", - "start": "concurrently \"npm run build:watch\" \"npm run serve\"", - "pree2e": "npm run build:e2e", - "e2e": "concurrently \"npm run serve:e2e\" \"npm run protractor\" --kill-others --success first", - "preprotractor": "webdriver-manager update", - "protractor": "protractor protractor.config.js", - "pretest": "npm run build", - "test": "concurrently \"npm run build:watch\" \"karma start karma.conf.js\"", - "pretest:once": "npm run build", - "test:once": "karma start karma.conf.js --single-run", - "lint": "tslint ./src/**/*.ts -t verbose" + "start": "webpack-dev-server --inline --progress --port 8080", + "test": "karma start", + "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail" }, - "keywords": [], - "author": "", "license": "MIT", "dependencies": { - "@angular/common": "~2.4.0", - "@angular/compiler": "~2.4.0", - "@angular/core": "~2.4.0", - "@angular/forms": "~2.4.0", - "@angular/http": "~2.4.0", - "@angular/platform-browser": "~2.4.0", - "@angular/platform-browser-dynamic": "~2.4.0", - "@angular/router": "~3.4.0", - "angular-in-memory-web-api": "~0.2.4", + "@angular/common": "~4.0.0", + "@angular/compiler": "~4.0.0", + "@angular/core": "~4.0.0", + "@angular/forms": "~4.0.0", + "@angular/http": "~4.0.0", + "@angular/platform-browser": "~4.0.0", + "@angular/platform-browser-dynamic": "~4.0.0", + "@angular/router": "~4.0.0", "core-js": "^2.4.1", + "rxjs": "5.0.1", + "zone.js": "^0.8.4", "ng2-bootstrap": "^1.4.2", - "rxjs": "5.0.1", - "systemjs": "0.19.40", - "zone.js": "^0.7.4" + "ng2-table": "^1.3.2" }, "devDependencies": { - "concurrently": "^3.2.0", - "lite-server": "^2.2.2", - "typescript": "~2.0.10", - "canonical-path": "0.0.2", - "tslint": "^3.15.1", - "lodash": "^4.16.4", - "jasmine-core": "~2.4.1", - "karma": "^1.3.0", + "@types/node": "^6.0.45", + "@types/jasmine": "2.5.36", + "angular2-template-loader": "^0.6.0", + "awesome-typescript-loader": "^3.0.4", + "css-loader": "^0.26.1", + "extract-text-webpack-plugin": "2.0.0-beta.5", + "file-loader": "^0.9.0", + "html-loader": "^0.4.3", + "html-webpack-plugin": "^2.16.1", + "jasmine-core": "^2.4.1", + "karma": "^1.2.0", "karma-chrome-launcher": "^2.0.0", - "karma-cli": "^1.0.1", "karma-jasmine": "^1.0.2", - "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "~4.0.14", - "rimraf": "^2.5.4", - "@types/node": "^6.0.46", - "@types/jasmine": "2.5.36" - }, - "repository": {} -} + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^2.0.1", + "null-loader": "^0.1.1", + "raw-loader": "^0.5.1", + "rimraf": "^2.5.2", + "style-loader": "^0.13.1", + "typescript": "~2.1.6", + "webpack": "2.2.1", + "webpack-dev-server": "2.4.1", + "webpack-merge": "^3.0.0" + } +} \ No newline at end of file diff -r 0d51fefdbae6 -r 7b9d616695d3 src/app/query.service.js --- a/src/app/query.service.js Wed Mar 29 19:01:29 2017 +0200 +++ b/src/app/query.service.js Wed Mar 29 20:58:57 2017 +0200 @@ -10,8 +10,8 @@ }; var core_1 = require('@angular/core'); var http_1 = require('@angular/http'); -require('rxjs/Rx'); // import all RxJS operators -//import 'rxjs/add/operator/map'; +//import 'rxjs/Rx'; // import all RxJS operators +require('rxjs/add/operator/map'); var app_config_1 = require('./app-config'); var query_mode_1 = require('./query-mode'); var query_state_1 = require('./query-state'); diff -r 0d51fefdbae6 -r 7b9d616695d3 src/app/query.service.js.map --- a/src/app/query.service.js.map Wed Mar 29 19:01:29 2017 +0200 +++ b/src/app/query.service.js.map Wed Mar 29 20:58:57 2017 +0200 @@ -1,1 +1,1 @@ -{"version":3,"file":"query.service.js","sourceRoot":"","sources":["query.service.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"query.service.js","sourceRoot":"","sources":["query.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,qBAAyB,eAAe,CAAC,CAAA;AACzC,qBAA4B,eAAe,CAAC,CAAA;AAE5C,gDAAgD;AAChD,QAAO,uBAAuB,CAAC,CAAA;AAE/B,2BAAmD,cAAc,CAAC,CAAA;AAClE,2BAAwD,cAAc,CAAC,CAAA;AACvE,4BAAyB,eAAe,CAAC,CAAA;AAEzC,4BAA4B,eAAe,CAAC,CAAA;AAC5C,kCAAgC,qBAAqB,CAAC,CAAA;AACtD,oCAA8B,uBAAuB,CAAC,CAAA;AAGtD;IAOI,sBAAoB,KAAW;QAAX,UAAK,GAAL,KAAK,CAAM;QALxB,kBAAa,GAAG,OAAO,CAAC;QACxB,uBAAkB,GAAG,EAAE,CAAC;QAK3B,mBAAmB;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,wBAAU,EAAE,CAAC;IAClC,CAAC;IAED,4BAAK,GAAL,UAAM,cAAsB;QACxB,2BAA2B;QAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,wBAAwB;QACxB,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;IAED,+BAAQ,GAAR;QACI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,oCAAa,GAAb,UAAc,KAAa;QACvB,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;YACb,MAAM,CAAC,8BAAiB,CAAC;QAC7B,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,wBAAW,CAAC;QACvB,CAAC;IACL,CAAC;IAED;;OAEG;IACH,sCAAe,GAAf,UAAgB,SAAoB;QAChC,IAAI,OAAO,GAAU,EAAE,CAAC;QACxB,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC;YAAC,MAAM,CAAC,OAAO,CAAC;QACtC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC;YAC7B,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC;QAC/B,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC,CAAC;YACxC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;QACzC,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,cAAc,CAAC,CAAC,CAAC;YACzC,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjE,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,mBAAmB,CAAC,CAAC,CAAC;YAC9C,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,KAAK,eAAe,CAAC,CAAC,CAAC;YAC1C,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,CAAC,OAAO,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,uCAAgB,GAAhB;QAAA,iBAiBC;QAhBG,IAAI,KAAK,GAAG,4IAEiC,CAAC;QAE9C,IAAI,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,GAAG,CAAC,SAAS,CACT,UAAA,IAAI;YACA,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACnC,KAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;iBAClC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC;iBACxB,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EAAd,CAAc,CAAC,CAAC;YACpC,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,KAAI,CAAC,WAAW,CAAC,CAAC;QACjD,CAAC,EACL,UAAA,GAAG,IAAI,OAAA,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,EAAlC,CAAkC,EACzC,cAAM,OAAA,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAArC,CAAqC,CAC9C,CAAC;IACN,CAAC;IAED;;OAEG;IACH,mCAAY,GAAZ,UAAa,KAAa,EAAE,IAAe;QACvC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACH,wCAAiB,GAAjB;QACI,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,eAAe,GAAG,EAAE,CAAC;QACzB,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI,EAAE,OAAO;YACnC,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAEzB;;eAEG;YACH,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC;gBACrB,UAAU,GAAG,aAAW,IAAI,SAAI,MAAM,CAAC,UAAU,MAAG,CAAC;gBACrD,UAAU,GAAG,EAAE,CAAC;gBAChB,WAAW,GAAI,aAAW,IAAM,CAAC;gBACjC,UAAU,GAAG,MAAM,CAAC;YACxB,CAAC;YAED;;eAEG;YACH,EAAE,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;gBACnB,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;oBACd,gCAAgC;oBAChC,UAAU,GAAG,aAAW,IAAI,2BAAsB,OAAO,QAAK,CAAC;oBAC/D,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAC9D,UAAU,GAAG,EAAE,CAAC;oBAChB,WAAW,GAAI,aAAW,IAAM,CAAC;oBACjC,UAAU,GAAG,MAAM,CAAC;gBACxB,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,mBAAmB;oBACnB,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;wBACd,UAAU,GAAG,QAAQ,CAAC;oBAC1B,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,UAAU,IAAI,OAAO,CAAC;oBAC1B,CAAC;oBACD,UAAU,IAAI,MAAI,IAAI,2BAAsB,OAAO,MAAG,CAAC;oBACvD,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAClE,CAAC;YACL,CAAC;YAED;;eAEG;YACH,EAAE,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;gBACzB,IAAI,IAAI,CAAC,CAAC;gBACV,IAAI,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;gBAC9B,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;oBACnB,UAAU,IAAI,SAAQ,GAAG,CAAC,UAAU,EAAE,cAAU,IAAI,MAAG,CAAC;gBAC5D,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,mBAAmB;oBACnB,UAAU,IAAI,UAAS,GAAG,CAAC,UAAU,EAAE,aAAS,IAAI,MAAG,CAAC;gBAC5D,CAAC;gBACD,WAAW,GAAI,sBAAoB,IAAM,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC;YACxB,CAAC;YAED;;eAEG;YACH,EAAE,CAAC,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC;gBAC1D,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;oBACd,UAAU,GAAG,QAAQ,CAAC;gBAC1B,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,UAAU,IAAI,OAAO,CAAC;gBAC1B,CAAC;gBACD,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC;oBACjC,qBAAqB;oBACrB,UAAU,IAAI,MAAI,IAAI,2BAAsB,OAAO,MAAG,CAAC;oBACvD,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAClE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC;wBAC/B,oCAAoC;wBACpC,UAAU,IAAI,YAAU,IAAI,YAAO,MAAM,CAAC,SAAS,iCAA4B,OAAO,OAAI,CAAC;wBAC3F,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;oBACxD,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,UAAU,IAAI,YAAU,IAAI,SAAI,MAAM,CAAC,SAAS,iCAA4B,OAAO,OAAI,CAAC;wBACxF,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;oBACpD,CAAC;gBACL,CAAC;YACL,CAAC;YAED;;eAEG;YACH,EAAE,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC;gBAC3B,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;oBACd,UAAU,GAAG,QAAQ,CAAC;gBAC1B,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,UAAU,IAAI,OAAO,CAAC;gBAC1B,CAAC;gBACD,UAAU,IAAI,aAAU,IAAI,SAAI,MAAM,CAAC,SAAS,2BAAsB,OAAO,QAAI;sBAC3E,kBAAe,IAAI,SAAI,MAAM,CAAC,SAAS,2BAAsB,OAAO,QAAI,CAAC;gBAC/E,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;gBAChD,WAAW,CAAC,aAAU,OAAO,CAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;YACpD,CAAC;QAEL,CAAC,CAAC,CAAC;QACH,gBAAgB;QAChB,WAAW,GAAG,UAAU,GAAG,CAAC,UAAU,GAAG,IAAI,GAAC,UAAU,GAAG,EAAE,CAAC,GAAG,IAAI,GAAG,WAAW,CAAC;QACpF,yCAAyC;QACzC,eAAe,GAAG,UAAU,GAAG,GAAG,GAAG,UAAU,GAAG,2BAAwB,IAAI,eAAW;cACnF,sDAAsD,CAAC;QAC7D,wCAAwC;QACxC,YAAY,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,0BAA0B,CAAC;QAClF,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,0BAA0B,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,qBAAqB,GAAG,eAAe,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,YAAY,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;IACxC,CAAC;IAED;;;;OAIG;IACH,+BAAQ,GAAR;QAAA,iBAqFC;QApFG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,YAAY,CAAC;QACrC;;WAEG;QACH,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7C,IAAI,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5C,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC;QACD,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC;QACD,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnD,GAAG,CAAC,SAAS,CACT,UAAA,IAAI;YACA,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YAC1C,IAAI,MAAM,GAAG,CAAC,CAAC;YACf;;eAEG;YACH,KAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC;YACxE,KAAI,CAAC,KAAK,CAAC,UAAU,GAAG,KAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAClD,kBAAkB;YAClB,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,KAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,CAAC;gBACzB,IAAI,CAAC,GAAG,CAAC,CAAC,KAAI,CAAC,aAAa,CAAC,CAAC;gBAC9B,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;oBACtB,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC;gBACrB,IAAI,IAAI,CAAC,GAAG,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACzC,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;YACrC,KAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;YAC7B,8BAA8B;YAC9B,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC;YAC9D;;eAEG;YACH,EAAE,CAAC,CAAC,KAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBACnC,MAAM,IAAI,CAAC,CAAC;gBACZ,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC,CAAC;gBAC9D,KAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBACnC,oDAAoD;gBACpD,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC;oBACrB,KAAI,CAAC,KAAK,CAAC,UAAU,GAAG,2BAAa,CAAC,CAAC,EAAE,qCAAiB,CAAC,CAAC;oBAC5D,KAAK,CAAC;gBACV,CAAC;gBACD,KAAI,CAAC,KAAK,CAAC,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtE,CAAC;YACD;;eAEG;YACH,EAAE,CAAC,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAChC,iCAAiC;gBACjC,MAAM,IAAI,CAAC,CAAC;gBACZ,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC;qBACxD,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EAAd,CAAc,CAAC;qBAC9B,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,qCAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EAA3B,CAA2B,CAAC,CAAC;gBAC9C,KAAI,CAAC,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;YACtC,CAAC;YACD,EAAE,CAAC,CAAC,KAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBAC/B,iCAAiC;gBACjC,MAAM,IAAI,CAAC,CAAC;gBACZ,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAX,CAAW,CAAC;qBACxD,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EAAd,CAAc,CAAC;qBAC9B,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,qCAAe,CAAC,IAAI,EAAE,KAAK,CAAC,EAA5B,CAA4B,CAAC,CAAC;gBAC/C,KAAI,CAAC,KAAK,CAAC,eAAe,GAAG,KAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzE,CAAC;QACL,CAAC,EACD,UAAA,GAAG,IAAI,OAAA,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,EAAzC,CAAyC,EAChD,cAAM,OAAA,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,EAA5C,CAA4C,CACrD,CAAC;IACN,CAAC;IAGD,uCAAgB,GAAhB,UAAiB,UAAoB,EAAE,UAAgB;QAAvD,iBAYC;QAZsC,0BAAgB,GAAhB,kBAAgB;QACnD,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;YACb,UAAU,CAAC,OAAO,CAAC,UAAC,GAAG;gBACnB,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;oBAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,KAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAhD,CAAgD,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,yCAAkB,GAAlB,UAAmB,OAAiB,EAAE,MAAW;QAAX,sBAAW,GAAX,UAAQ,EAAE,CAAC;QAC7C,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,OAAO,GAAG,IAAI,cAAO,EAAE,CAAC;QAC5B,IAAI,IAAI,GAAG,iCAAoB,CAAC;QAChC,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,GAAG,IAAI,CAAI,IAAI,CAAC,IAAI,SAAI,IAAI,CAAC,QAAU,CAAC,CAAC,CAAC;QAClF,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAC7C,yBAAyB;QACzB,IAAI,IAAI,GAAG,EAAC,SAAS,EAAE,OAAO,EAAC,CAAC;QAChC,iCAAiC;QACjC,IAAI,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,EAAC,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAC,MAAM,CAAC,CAAC,CAAC,GAAC,EAAE,EAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,8BAA8B;QAC9B,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,YAAY,EAAE,UAAU,EAAC,CAAC,CAAC;QACtD,mCAAmC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,2BAAc,GAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC;aAE3E,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,IAAI,EAAE,EAAV,CAAU,CAAC,CAAC;QACxB,oBAAoB;QACpB,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IAvVL;QAAC,iBAAU,EAAE;;oBAAA;IAyVb,mBAAC;AAAD,CAAC,AAxVD,IAwVC;AAxVY,oBAAY,eAwVxB,CAAA"} \ No newline at end of file diff -r 0d51fefdbae6 -r 7b9d616695d3 src/app/query.service.ts --- a/src/app/query.service.ts Wed Mar 29 19:01:29 2017 +0200 +++ b/src/app/query.service.ts Wed Mar 29 20:58:57 2017 +0200 @@ -1,8 +1,8 @@ import {Injectable} from '@angular/core'; import {Http, Headers} from '@angular/http'; -import 'rxjs/Rx'; // import all RxJS operators -//import 'rxjs/add/operator/map'; +//import 'rxjs/Rx'; // import all RxJS operators +import 'rxjs/add/operator/map'; import {NEO4J_BASE_URL, NEO4J_AUTHENTICATION} from './app-config'; import {QueryMode, QUERY_MODES, FIRST_QUERY_MODES} from './query-mode'; diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/favicon.ico Binary file src/assets/images/favicon.ico has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/sort_asc.png Binary file src/assets/images/sort_asc.png has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/sort_asc_disabled.png Binary file src/assets/images/sort_asc_disabled.png has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/sort_both.png Binary file src/assets/images/sort_both.png has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/sort_desc.png Binary file src/assets/images/sort_desc.png has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/assets/images/sort_desc_disabled.png Binary file src/assets/images/sort_desc_disabled.png has changed diff -r 0d51fefdbae6 -r 7b9d616695d3 src/index.html --- a/src/index.html Wed Mar 29 19:01:29 2017 +0200 +++ b/src/index.html Wed Mar 29 20:58:57 2017 +0200 @@ -2,23 +2,6 @@ ISMI Query Builder - - - - - - - - - - - - - - - diff -r 0d51fefdbae6 -r 7b9d616695d3 src/main.ts --- a/src/main.ts Wed Mar 29 19:01:29 2017 +0200 +++ b/src/main.ts Wed Mar 29 20:58:57 2017 +0200 @@ -1,5 +1,11 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { enableProdMode } from '@angular/core'; import { AppModule } from './app/app.module'; +if (process.env.ENV === 'production') { + console.log("Running in ProdMode!"); + enableProdMode(); +} +// boot platformBrowserDynamic().bootstrapModule(AppModule); diff -r 0d51fefdbae6 -r 7b9d616695d3 src/polyfills.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/polyfills.ts Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,11 @@ +import 'core-js/es6'; +import 'core-js/es7/reflect'; +require('zone.js/dist/zone'); + +if (process.env.ENV === 'production') { + // Production +} else { + // Development and test + Error['stackTraceLimit'] = Infinity; + require('zone.js/dist/long-stack-trace-zone'); +} diff -r 0d51fefdbae6 -r 7b9d616695d3 src/systemjs.config.js --- a/src/systemjs.config.js Wed Mar 29 19:01:29 2017 +0200 +++ b/src/systemjs.config.js Wed Mar 29 20:58:57 2017 +0200 @@ -20,13 +20,11 @@ '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js', '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js', '@angular/http': 'npm:@angular/http/bundles/http.umd.js', - '@angular/router': 'npm:@angular/router/bundles/router.umd.js', '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js', // other libraries 'rxjs': 'npm:rxjs', - 'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js', - + // ng2-table 'ng2-bootstrap': 'npm:ng2-bootstrap', 'ng2-table': 'npm:ng2-table' }, diff -r 0d51fefdbae6 -r 7b9d616695d3 src/vendor.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/vendor.ts Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,18 @@ +// Angular +import '@angular/platform-browser'; +import '@angular/platform-browser-dynamic'; +import '@angular/core'; +import '@angular/common'; +import '@angular/http'; +import '@angular/router'; +// RxJS +import 'rxjs'; +// Other vendors for example jQuery, Lodash or Bootstrap +// You can import js, ts, css, sass, ... +import 'ng2-bootstrap'; +import 'ng2-table'; +import './assets/css/bootstrap-3.3.5.min.css'; +import './assets/css/glyphicons.css'; +import './assets/css/jquery.dataTables-1.10.9.css'; +import './assets/css/prism-okaidia.css'; +import './assets/css/style.css'; diff -r 0d51fefdbae6 -r 7b9d616695d3 webpack.config.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/webpack.config.js Wed Mar 29 20:58:57 2017 +0200 @@ -0,0 +1,1 @@ +module.exports = require('./config/webpack.dev.js');