Merge pull request #44 from Gillardo/angular10

Angular10
Gillardo · Aug 21, 2020 · 2321432 · 2321432
2 parents 5a8a89c + 4d580ae
commit 2321432
Show file tree

Hide file tree

Showing 14 changed files with 985 additions and 739 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-bootstrap-datetime-popup",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "author": {
     "name": "Darren Gillard",
     "email": "[email protected]"
@@ -21,49 +21,49 @@
     "ng": "ng",
     "update": "ng update @angular/cli",
     "start": "ng serve",
-    "build": "ng build ngx-bootstrap-datetime-popup --prod",
+    "build": "ng build ngx-bootstrap-datetime-popup",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "watch": "ng serve demo --port 4300",
     "gh-pages": "ng deploy demo --no-silent"
   },
   "dependencies": {
-    "@angular/animations": "^9.0.0",
-    "@angular/common": "^9.0.0",
-    "@angular/compiler": "^9.0.0",
-    "@angular/core": "^9.0.0",
-    "@angular/forms": "^9.0.0",
-    "@angular/platform-browser": "^9.0.0",
-    "@angular/platform-browser-dynamic": "^9.0.0",
-    "@angular/router": "^9.0.0",
+    "@angular/animations": "^10.0.9",
+    "@angular/common": "^10.0.9",
+    "@angular/compiler": "^10.0.9",
+    "@angular/core": "^10.0.9",
+    "@angular/forms": "^10.0.9",
+    "@angular/platform-browser": "^10.0.9",
+    "@angular/platform-browser-dynamic": "^10.0.9",
+    "@angular/router": "^10.0.9",
+    "ngx-bootstrap": "^6.0.0",
     "rxjs": "^6.5.4",
-    "tslib": "^1.10.0",
-    "zone.js": "^0.10.2",
-    "ngx-bootstrap": "^5.0.0"
+    "tslib": "^2.0.0",
+    "zone.js": "^0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.900.0",
-    "@angular-devkit/build-ng-packagr": "^0.900.0",
-    "@angular/cli": "^9.0.0",
-    "@angular/compiler-cli": "^9.0.0",
-    "@angular/language-service": "^9.0.0",
+    "@angular-devkit/build-angular": "^0.1000.5",
+    "@angular-devkit/build-ng-packagr": "^0.1000.5",
+    "@angular/cli": "^10.0.5",
+    "@angular/compiler-cli": "^10.0.9",
+    "@angular/language-service": "^10.0.9",
     "@types/jasmine": "^3.5.0",
     "@types/jasminewd2": "^2.0.3",
     "@types/node": "^12.11.1",
     "angular-cli-ghpages": "^0.6.2",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "^3.5.0",
-    "jasmine-spec-reporter": "^4.2.1",
-    "karma": "^4.4.1",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage-istanbul-reporter": "^2.1.0",
-    "karma-jasmine": "^3.0.1",
-    "karma-jasmine-html-reporter": "^1.4.2",
-    "ng-packagr": "^9.0.0",
-    "protractor": "^5.4.3",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.5.0",
+    "jasmine-spec-reporter": "~5.0.0",
+    "karma": "~5.0.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-jasmine": "~3.3.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "ng-packagr": "^10.0.0",
+    "protractor": "~7.0.0",
     "ts-node": "^8.3.0",
-    "tslint": "^6.1.0",
-    "typescript": "^3.8.3"
+    "tslint": "~6.1.0",
+    "typescript": "^3.9.7"
   }
 }
diff --git a/projects/demo/browserslist → projects/demo/.browserslistrc b/projects/demo/browserslist → projects/demo/.browserslistrc
diff --git a/projects/demo/e2e/tsconfig.json b/projects/demo/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/demo/src/app/app.module.ts b/projects/demo/src/app/app.module.ts
@@ -22,7 +22,7 @@ import { DateComponent } from './date.component';
     DatepickerModule.forRoot(),
     TimepickerModule.forRoot(),
     BsDropdownModule.forRoot(),
-    DatetimePopupModule.forRoot()
+    DatetimePopupModule
   ],
   providers: [
 

diff --git a/projects/demo/tsconfig.app.json b/projects/demo/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

diff --git a/projects/demo/tsconfig.spec.json b/projects/demo/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

diff --git a/projects/ngx-bootstrap-datetime-popup/package.json b/projects/ngx-bootstrap-datetime-popup/package.json
@@ -3,7 +3,7 @@
   "description": "Datetime popup component using ngx-bootstrap datePicker, timePicker and bsDropdown",
   "keywords": [
     "angular",
-    "angular8",
+    "angular10",
     "aot",
     "aot-compatible",
     "aot-compilation",
@@ -19,9 +19,9 @@
     "@angular/common": "^9.0.0",
     "@angular/core": "^9.0.0",
     "@angular/forms": "^9.0.0",
-    "ngx-bootstrap": "^5.6.0"
+    "ngx-bootstrap": "^6.0.0"
   },
   "dependencies": {
-    "tslib": "^1.10.0"
+    "tslib": "^2.0.0"
   }
 }
diff --git a/projects/ngx-bootstrap-datetime-popup/src/lib/ngx-bootstrap-datetime-popup.module.ts b/projects/ngx-bootstrap-datetime-popup/src/lib/ngx-bootstrap-datetime-popup.module.ts
@@ -5,7 +5,6 @@ import { DatepickerModule } from 'ngx-bootstrap/datepicker';
 import { TimepickerModule } from 'ngx-bootstrap/timepicker';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { DatetimePopupComponent } from './ngx-bootstrap-datetime-popup.component';
-import { DatetimePopupService } from './ngx-bootstrap-datetime-popup.service';
 import { OffClickDirective } from './offclick.directive';
 
 @NgModule({
@@ -29,12 +28,5 @@ import { OffClickDirective } from './offclick.directive';
 })
 
 export class DatetimePopupModule {
-  public static forRoot(): ModuleWithProviders<DatetimePopupModule> {
-    return {
-      ngModule: DatetimePopupModule,
-      providers: [
-        DatetimePopupService
-      ]
-    };
-  }
+
 }
diff --git a/projects/ngx-bootstrap-datetime-popup/tsconfig.lib.json b/projects/ngx-bootstrap-datetime-popup/tsconfig.lib.json
@@ -1,14 +1,16 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "ES2017",
+    "module": "es2015",
+    "moduleResolution": "node",
     "declaration": true,
     "inlineSources": true,
     "types": [],
     "lib": [
       "dom",
-      "es2018"
+      "es6"
     ]
   },
   "angularCompilerOptions": {

diff --git a/projects/ngx-bootstrap-datetime-popup/tsconfig.lib.prod.json b/projects/ngx-bootstrap-datetime-popup/tsconfig.lib.prod.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.lib.json",
   "angularCompilerOptions": {
-    "enableIvy": false
+    "enableIvy": true
   }
 }
diff --git a/projects/ngx-bootstrap-datetime-popup/tsconfig.spec.json b/projects/ngx-bootstrap-datetime-popup/tsconfig.spec.json
@@ -1,7 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
+    "module": "commonjs",
+    "target": "ES2017",
     "types": [
       "jasmine",
       "node"

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -0,0 +1,29 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "es2020",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "lib": [
+      "es2018",
+      "dom"
+    ],
+    "paths": {
+      "ngx-bootstrap-datetime-popup": [
+        "dist/ngx-bootstrap-datetime-popup/ngx-bootstrap-datetime-popup",
+        "dist/ngx-bootstrap-datetime-popup"
+      ]
+    }
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,29 +1,23 @@
+/*
+  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
+  It is not intended to be used to perform a compilation.
+
+  To learn more about this file see: https://angular.io/config/solution-tsconfig.
+*/
 {
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "lib": [
-      "es2018",
-      "dom"
-    ],
-    "paths": {
-      "ngx-bootstrap-datetime-popup": [
-        "dist/ngx-bootstrap-datetime-popup/ngx-bootstrap-datetime-popup",
-        "dist/ngx-bootstrap-datetime-popup"
-      ]
+  "files": [],
+  "references": [
+    {
+      "path": "./projects/ngx-bootstrap-datetime-popup/tsconfig.lib.json"
+    },
+    {
+      "path": "./projects/ngx-bootstrap-datetime-popup/tsconfig.spec.json"
+    },
+    {
+      "path": "./projects/demo/tsconfig.app.json"
+    },
+    {
+      "path": "./projects/demo/tsconfig.spec.json"
     }
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}
+  ]
+}