Merge branch 'master' into tooltip-ie

Author: zvonimirfras

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-components-angular",
-  "version": "0.1.0",
+  "version": "0.0.0",
   "description": "Next generation components",
   "main": "index.js",
   "scripts": {
@@ -95,7 +95,7 @@
     "@types/node": "8.5.2",
     "angular2-template-loader": "0.6.2",
     "babel-core": "6.26.3",
-    "carbon-components": "9.20.0",
+    "carbon-components": "9.42.3",
     "codelyzer": "4.0.2",
     "commitizen": "2.10.1",
     "core-js": "2.5.5",
@@ -128,7 +128,7 @@
     "run-sequence": "2.2.0",
     "rxjs": "6.2.2",
     "sass-loader": "7.0.1",
-    "semantic-release": "15.9.6",
+    "semantic-release": "15.10.6",
     "style-loader": "0.21.0",
     "stylelint": "8.4.0",
     "stylelint-webpack-plugin": "0.10.4",

package.json

@@ -17,7 +17,8 @@ if [[ $TRAVIS_BRANCH == "master" ]]; then
 	mkdir pages
 	cp -R dist/docs/documentation/ pages/documentation
 	cp -R dist/docs/storybook/* pages
-	version=$(node -e 'const package = require("./package.json"); console.log(package.version);')
+	version=$(node -e 'const package = require("./dist/package.json"); console.log(package.version);')
+	mkdir pages/$version
 	cp -R dist/docs/documentation/ pages/$version/documentation
 	cp -R dist/docs/storybook/* pages/$version
 	echo "angular.carbondesignsystem.com" > pages/CNAME

scripts/deploy.sh

@@ -1,3 +1,8 @@
+/**
+ * Deprecated in favour of `NotificationContent` (to be removed in v3.0).
+ *
+ * @deprecated
+ */
 export interface BannerContent {
 	type: string;
 	title: string;

src/banner/banner-content.interface.ts

@@ -13,10 +13,12 @@ import { NotificationContent } from "./banner-content.interface";
 import { I18n } from "./../i18n/i18n.module";
 
 /**
+ * Deprecated in favour of `InlineNotification` (to be removed in v3.0).
  * Banner messages are displayed toward the top of the UI and do not interrupt user’s work.
  *
  * @export
  * @class Banner
+ * @deprecated
  */
 @Component({
 	selector: "ibm-banner",
@@ -75,7 +77,9 @@ export class Banner implements OnInit {
 
 	@ViewChild("banner") banner;
 
-	constructor(protected bannerService: BannerService, protected i18n: I18n) {}
+	constructor(protected bannerService: BannerService, protected i18n: I18n) {
+		console.warn("`ibm-banner` has been deprecated in favour of `ibm-inline-notification`");
+	}
 
 	ngOnInit() {
 		if (!this.bannerObj.closeLabel) {

src/banner/banner.component.spec.ts

@@ -10,8 +10,12 @@ import { I18nModule } from "./../i18n/i18n.module";
 
 export { BannerService } from "./banner.service";
 export { Banner } from "./banner.component";
-export { Toast } from "./toast.component";
 
+/**
+ * Deprecated in favour of `NotificationModule` (to be removed in v3.0).
+ *
+ * @deprecated
+ */
 @NgModule({
 	declarations: [
 		Toast,

src/banner/banner.component.ts

@@ -10,15 +10,18 @@ import {
 } from "@angular/core";
 
 import { BannerContent, NotificationContent, ToastContent } from "./banner-content.interface";
-import { Banner, Toast } from "./banner.module";
+import { Banner } from "./banner.module";
+import { Toast } from "./toast.component";
 
 /**
+ * Deprecated in favour of `NotificationService` (to be removed in v3.0).
  * Provides a way to use the banner component.
  *
  * Banners are displayed toward the top of the UI and do not interrupt the user’s work.
  *
  * @export
  * @class BannerService
+ * @deprecated
  */
 @Injectable()
 export class BannerService implements OnDestroy {
@@ -43,6 +46,7 @@ export class BannerService implements OnDestroy {
 		private injector: Injector,
 		private componentFactoryResolver: ComponentFactoryResolver,
 		private applicationRef: ApplicationRef) {
+		console.warn("`BannerService` has been deprecated in favour of `NotificationService`");
 	}
 
 	/**

src/banner/banner.module.ts

@@ -5,10 +5,12 @@ import { ToastContent } from "./banner-content.interface";
 import { Banner } from "./banner.component";
 
 /**
+ * Deprecated in favour of `ToastNotification` (to be removed in v3.0).
  * Banner messages are displayed toward the top of the UI and do not interrupt user’s work.
  *
  * @export
  * @class Banner
+ * @deprecated
  */
 @Component({
 	selector: "ibm-toast",
@@ -52,6 +54,8 @@ export class Toast extends Banner implements OnInit {
 	@Input() bannerObj: ToastContent;
 
 	ngOnInit() {
+		console.warn("`ibm-toast` has been deprecated in favour of `ibm-toast-notification`");
+
 		if (!this.bannerObj.closeLabel) {
 			this.bannerObj.closeLabel = this.i18n.get().BANNER.CLOSE_BUTTON;
 		}