Mercurial > hg > ng2-query-ismi
changeset 62:7787ca310644 webpack tip
update @angular to 4.4.5.
| author | Robert Casties <casties@mpiwg-berlin.mpg.de> |
|---|---|
| date | Wed, 18 Oct 2017 17:46:41 +0200 |
| parents | 6adf95d9a190 |
| children | |
| files | .hgignore config/webpack.common.js package.json src/app/app-config.ts src/app/app.module.ts src/index.html src/vendor.ts |
| diffstat | 7 files changed, 27 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Apr 24 19:39:25 2017 +0200 +++ b/.hgignore Wed Oct 18 17:46:41 2017 +0200 @@ -8,4 +8,6 @@ syntax: regexp ^\.settings$ syntax: regexp -^app/app-config\.ts$ \ No newline at end of file +^app/app-config\.ts$ +syntax: regexp +^dist$ \ No newline at end of file
--- a/config/webpack.common.js Mon Apr 24 19:39:25 2017 +0200 +++ b/config/webpack.common.js Wed Oct 18 17:46:41 2017 +0200 @@ -2,6 +2,8 @@ var HtmlWebpackPlugin = require('html-webpack-plugin'); var ExtractTextPlugin = require('extract-text-webpack-plugin'); var helpers = require('./helpers'); +//var path = require('path') +//var webpackLinkPlugin = require('webpack-link'); module.exports = { entry: { @@ -62,5 +64,9 @@ new HtmlWebpackPlugin({ template: 'src/index.html' }) + +// new webpackLinkPlugin({ +// localModule: path.resolve(__dirname, '../ng2-table') +// }) ] };
--- a/package.json Mon Apr 24 19:39:25 2017 +0200 +++ b/package.json Wed Oct 18 17:46:41 2017 +0200 @@ -8,23 +8,22 @@ }, "license": "MIT", "dependencies": { - "@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", + "@angular/common": "~4.4.5", + "@angular/compiler": "~4.4.5", + "@angular/core": "~4.4.5", + "@angular/forms": "~4.4.5", + "@angular/http": "~4.4.5", + "@angular/platform-browser": "~4.4.5", + "@angular/platform-browser-dynamic": "~4.4.5", "core-js": "^2.4.1", + "ng2-table": "^1.3.2", + "ngx-bootstrap": "^1.9.3", "rxjs": "5.0.1", - "zone.js": "^0.8.4", - "ng2-bootstrap": "^1.4.2", - "ng2-table": "^1.3.2" + "zone.js": "^0.8.4" }, "devDependencies": { + "@types/jasmine": "2.5.36", "@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", @@ -47,4 +46,4 @@ "webpack-dev-server": "2.4.1", "webpack-merge": "^3.0.0" } -} \ No newline at end of file +}
--- a/src/app/app-config.ts Mon Apr 24 19:39:25 2017 +0200 +++ b/src/app/app-config.ts Wed Oct 18 17:46:41 2017 +0200 @@ -1,6 +1,6 @@ -//export const NEO4J_BASE_URL = 'https://ismi-dev.mpiwg-berlin.mpg.de/neo4j-ismi/db/data'; -export const NEO4J_BASE_URL = 'http://localhost:7474/db/data'; +export const NEO4J_BASE_URL = 'https://ismi.mpiwg-berlin.mpg.de/neo4j-ismi/db/data'; +//export const NEO4J_BASE_URL = 'http://localhost:7474/db/data'; export const NEO4J_AUTHENTICATION = {'user': 'neo4j', 'password': 'neo5j'};
--- a/src/app/app.module.ts Mon Apr 24 19:39:25 2017 +0200 +++ b/src/app/app.module.ts Wed Oct 18 17:46:41 2017 +0200 @@ -4,7 +4,7 @@ import { HttpModule } from '@angular/http'; import { Ng2TableModule } from 'ng2-table/ng2-table'; -import { PaginationModule } from 'ng2-bootstrap'; +import { PaginationModule } from 'ngx-bootstrap'; import { QueryAppComponent } from './query-app.component'; import { QuerySelectComponent } from './query-select.component';
--- a/src/index.html Mon Apr 24 19:39:25 2017 +0200 +++ b/src/index.html Wed Oct 18 17:46:41 2017 +0200 @@ -1,6 +1,6 @@ <html> <head> - <meta charset="utf-8" /> + <meta charset="utf-8" /> <title>ISMI Query Builder</title> </head>
--- a/src/vendor.ts Mon Apr 24 19:39:25 2017 +0200 +++ b/src/vendor.ts Wed Oct 18 17:46:41 2017 +0200 @@ -4,12 +4,12 @@ import '@angular/core'; import '@angular/common'; import '@angular/http'; -import '@angular/router'; +//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 'ngx-bootstrap'; import 'ng2-table'; import './assets/css/bootstrap-3.3.5.min.css'; import './assets/css/glyphicons.css';