From 77456226540c3073fc169551c0baca5c23ea1f32 Mon Sep 17 00:00:00 2001
From: dboss3 <dboss3@users.noreply.github.com>
Date: Fri, 2 Jun 2017 10:45:07 -0400
Subject: [PATCH] Upgraded to Angular 4

---
 angular-cli.json           |  2 +-
 demo/src/app/app.module.ts |  2 +-
 demo/src/typings.d.ts      |  4 ++--
 karma.conf.js              |  8 ++++----
 package.json               | 40 ++++++++++++++++++++------------------
 scripts/typings.d.ts       |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/angular-cli.json b/angular-cli.json
index 1563f9b4..181a1ae9 100644
--- a/angular-cli.json
+++ b/angular-cli.json
@@ -19,8 +19,8 @@
       ],
       "scripts": [
       ],
+      "environmentSource": "environments/environment.ts",
       "environments": {
-        "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
       }
diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index 59d5402d..a8b50bf3 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TabsModule, ButtonsModule } from 'ng2-bootstrap';
+import { TabsModule, ButtonsModule } from 'ngx-bootstrap';
 
 import { SelectModule } from '../../../src/select/select.module';
 import { AppComponent } from './app.component';
diff --git a/demo/src/typings.d.ts b/demo/src/typings.d.ts
index 30da4eeb..b69b93f5 100644
--- a/demo/src/typings.d.ts
+++ b/demo/src/typings.d.ts
@@ -6,8 +6,8 @@ declare const ENV:string;
 // google code-prettify
 declare const PR:any;
 
-declare const require:any;
-declare const global:any;
+// declare var require:any;
+// declare var global:any;
 
 declare module jasmine {
   interface Matchers {
diff --git a/karma.conf.js b/karma.conf.js
index 1a74f896..4a3b74cb 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,18 +6,18 @@ const customLaunchers = require('./scripts/sauce-browsers').customLaunchers;
 module.exports = function (config) {
   const configuration = {
     basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
+    frameworks: ['jasmine', '@angular/cli'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
+      require('@angular/cli/plugins/karma')
     ],
     files: [
       {pattern: './scripts/test.ts', watched: false}
     ],
     preprocessors: {
-      './scripts/test.ts': ['angular-cli']
+      './scripts/test.ts': ['@angular/cli']
     },
     remapIstanbulReporter: {
       reports: {
@@ -62,7 +62,7 @@ module.exports = function (config) {
     configuration.reporters.push('saucelabs');
     configuration.sauceLabs = {
       verbose: true,
-      testName: 'ng2-bootstrap unit tests',
+      testName: 'ngx-bootstrap unit tests',
       recordScreenshots: false,
       username: process.env.SAUCE_USERNAME,
       accessKey: process.env.SAUCE_ACCESS_KEY,
diff --git a/package.json b/package.json
index 87c5d711..54edb25e 100644
--- a/package.json
+++ b/package.json
@@ -45,27 +45,28 @@
   },
   "homepage": "https://github.com//psilospore/ng-next-select#readme",
   "peerDependencies": {
-    "@angular/common": "^2.3.0",
-    "@angular/core": "^2.3.0"
+    "@angular/common": "4.0.1",
+    "@angular/core": "4.0.1",
+    "webpack": "2.6.1"
   },
   "devDependencies": {
-    "@angular/common": "2.4.3",
-    "@angular/compiler": "2.4.3",
-    "@angular/compiler-cli": "2.4.3",
-    "@angular/core": "2.4.3",
-    "@angular/forms": "2.4.3",
-    "@angular/http": "2.4.3",
-    "@angular/language-service": "2.4.3",
-    "@angular/platform-browser": "2.4.3",
-    "@angular/platform-browser-dynamic": "2.4.3",
-    "@angular/router": "3.4.3",
-    "@angular/tsc-wrapped": "0.5.1",
-    "@ngtools/webpack": "1.2.3",
+    "@angular/cli": "1.2.0-beta.0",
+    "@angular/common": "4.0.1",
+    "@angular/compiler": "4.0.1",
+    "@angular/compiler-cli": "4.0.1",
+    "@angular/core": "4.0.1",
+    "@angular/forms": "4.0.1",
+    "@angular/http": "4.0.1",
+    "@angular/language-service": "4.0.1",
+    "@angular/platform-browser": "4.0.1",
+    "@angular/platform-browser-dynamic": "4.0.1",
+    "@angular/router": "4.0.1",
+    "@angular/tsc-wrapped": "4.0.1",
+    "@ngtools/webpack": "1.4.0",
     "@types/jasmine": "2.5.40",
     "@types/marked": "0.0.28",
     "@types/node": "7.0.0",
     "@types/webpack": "^2.2.1",
-    "angular-cli": "1.0.0-beta.25.5",
     "bootstrap": "3.3.7",
     "chokidar-cli": "1.2.0",
     "classlist-polyfill": "1.0.3",
@@ -95,9 +96,9 @@
     "lodash": "4.17.4",
     "markdown-loader": "^0.1.7",
     "marked": "0.3.6",
-    "ng2-bootstrap": "1.2.2",
-    "ng2-page-scroll": "4.0.0-beta.2",
-    "ngm-cli": "0.4.3",
+    "ng2-page-scroll": "4.0.0-beta.7",
+    "ngm-cli": "0.5.0",
+    "ngx-bootstrap": "2.0.0-beta.2",
     "npm-run-all": "^4.0.1",
     "pre-commit": "1.2.2",
     "protractor": "5.0.0",
@@ -113,7 +114,8 @@
     "typescript": "2.1.5",
     "wallaby-webpack": "0.0.30",
     "webdriver-manager": "11.1.1",
-    "zone.js": "0.7.5"
+    "webpack": "2.6.1",
+    "zone.js": "0.8.4"
   },
   "contributors": [
     {
diff --git a/scripts/typings.d.ts b/scripts/typings.d.ts
index a93ab74e..49006b7c 100644
--- a/scripts/typings.d.ts
+++ b/scripts/typings.d.ts
@@ -8,7 +8,7 @@ declare const ENV:string;
 // google code-prettify
 declare const PR:any;
 
-declare const global:any;
+declare var global:any;
 
 declare module jasmine {
   interface Matchers {