diff --git a/CHANGELOG.md b/CHANGELOG.md index 360882dd68..2b33615c18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,8 +32,8 @@ ### BREAKING CHANGES -* dropdown: * dropdown property `disabled` renamed to `isDisabled` - +* dropdown: dropdown property `disabled` renamed to `isDisabled` +* ng2-bootstrap: missprint MODAL_DIRECTVES renamed to MODAL_DIRECTIVES diff --git a/components/typeahead/typeahead.directive.ts b/components/typeahead/typeahead.directive.ts index 13e4ec8ade..aaa6293055 100644 --- a/components/typeahead/typeahead.directive.ts +++ b/components/typeahead/typeahead.directive.ts @@ -7,6 +7,8 @@ import {TypeaheadUtils} from './typeahead-utils'; import {TypeaheadContainerComponent} from './typeahead-container.component'; import {TypeaheadOptions} from './typeahead-options.class'; +import {Observable} from 'rxjs/Rx'; + import 'rxjs/add/observable/from'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/filter'; @@ -14,8 +16,6 @@ import 'rxjs/add/operator/map'; import 'rxjs/add/operator/mergeMap'; import 'rxjs/add/operator/toArray'; -import {Observable} from 'rxjs/Observable'; - import {global} from '@angular/core/src/facade/lang'; /* tslint:disable */ const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent; diff --git a/package.json b/package.json index 83368f83a0..c2681895e9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "flow.lint": "npm run flow.eslint && npm run flow.tslint", "flow.changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -p angular -v", "flow.github-release": "./node_modules/.bin/conventional-github-releaser -p angular", - "flow.build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --progress --color", + "flow.build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --progress --color --display-error-details --display-cached", "flow.build:dev": "./node_modules/.bin/webpack --progress --color", "flow.serve:dev": "./node_modules/.bin/webpack-dev-server --hot --inline --colors --display-error-details --display-cached", "flow.serve:prod": "NODE_ENV=production ./node_modules/.bin/webpack-dev-server --hot --inline --colors --display-error-details --display-cached", @@ -87,7 +87,7 @@ "gulp-tslint": "5.0.0", "lite-server": "2.2.0", "marked": "0.3.5", - "ng2-webpack-config": "github:valor-software/ng2-webpack-config", + "ng2-webpack-config": "0.0.3", "pre-commit": "1.1.3", "reflect-metadata": "0.1.2", "require-dir": "0.3.0", diff --git a/typings.json b/typings.json index 3fdb203d2f..714cc54f0c 100644 --- a/typings.json +++ b/typings.json @@ -1,7 +1,6 @@ { "dependencies": { - "moment": "registry:npm/moment#2.10.5+20160211003958", - "webpack": "registry:npm/webpack#1.12.9+20160219013405" + "webpack": "registry:npm/webpack#1.12.9+20160418172948" }, "devDependencies": {}, "globalDependencies": {