feat: migrate to angular 10

SortableJS · Oct 25, 2020 · 6e65e1c · 6e65e1c
1 parent 7f59f49
commit 6e65e1c
Show file tree

Hide file tree

Showing 6 changed files with 2,133 additions and 1,411 deletions.
diff --git a/package.json b/package.json
@@ -22,27 +22,27 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~8.2.14",
-    "@angular/common": "~8.2.14",
-    "@angular/compiler": "~8.2.14",
-    "@angular/core": "~8.2.14",
-    "@angular/forms": "~8.2.14",
-    "@angular/platform-browser": "~8.2.14",
-    "@angular/platform-browser-dynamic": "~8.2.14",
-    "@angular/router": "~8.2.14",
+    "@angular/animations": "~10.2.0",
+    "@angular/common": "~10.2.0",
+    "@angular/compiler": "~10.2.0",
+    "@angular/core": "~10.2.0",
+    "@angular/forms": "~10.2.0",
+    "@angular/platform-browser": "~10.2.0",
+    "@angular/platform-browser-dynamic": "~10.2.0",
+    "@angular/router": "~10.2.0",
     "bootstrap": "^4.4.1",
     "ngx-bootstrap": "^4.3.0",
     "rxjs": "~6.5.4",
     "sortablejs": "^1.10.2",
-    "tslib": "^1.10.0",
-    "zone.js": "~0.9.1"
+    "tslib": "^2.0.3",
+    "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.23",
-    "@angular-devkit/build-ng-packagr": "~0.803.23",
-    "@angular/cli": "~8.3.23",
-    "@angular/compiler-cli": "~8.2.14",
-    "@angular/language-service": "~8.2.14",
+    "@angular-devkit/build-angular": "~0.1002.0",
+    "@angular-devkit/build-ng-packagr": "~0.1002.0",
+    "@angular/cli": "~10.2.0",
+    "@angular/compiler-cli": "~10.2.0",
+    "@angular/language-service": "~10.2.0",
     "@semantic-release/changelog": "^3.0.6",
     "@semantic-release/git": "^7.0.18",
     "@types/jasmine": "^3.3.16",
@@ -59,13 +59,13 @@
     "karma-coverage-istanbul-reporter": "^2.0.6",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.5.1",
-    "ng-packagr": "^5.7.1",
+    "ng-packagr": "^10.1.2",
     "ngx-spec": "^2.1.4",
     "protractor": "~5.4.0",
     "semantic-release": "^15.14.0",
     "ts-node": "~7.0.0",
-    "tsickle": "^0.35.0",
+    "tsickle": "^0.39.1",
     "tslint": "~5.15.0",
-    "typescript": "~3.5.3"
+    "typescript": "~4.0.3"
   }
 }
diff --git a/projects/ngx-sortablejs/package.json b/projects/ngx-sortablejs/package.json
@@ -18,8 +18,8 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@angular/common": "^8.0.0",
-    "@angular/core": "^8.0.0",
+    "@angular/common": "~10.2.0",
+    "@angular/core": "~10.2.0",
     "sortablejs": ">=1.7.0"
   },
   "main": "src/public-api.ts"

diff --git a/projects/ngx-sortablejs/src/lib/sortablejs.directive.ts b/projects/ngx-sortablejs/src/lib/sortablejs.directive.ts
@@ -17,9 +17,8 @@ import Sortable, {Options} from 'sortablejs';
 import {GLOBALS} from './globals';
 import {SortablejsBindings} from './sortablejs-bindings';
 import {SortablejsService} from './sortablejs.service';
-import {FormArray} from '@angular/forms';
 
-export type SortableData = FormArray | any[];
+export type SortableData = any | any[];
 
 const getIndexesFromEvent = (event: SortableEvent) => {
   if (event.hasOwnProperty('newDraggableIndex') && event.hasOwnProperty('oldDraggableIndex')) {

diff --git a/projects/ngx-sortablejs/src/lib/sortablejs.module.ts b/projects/ngx-sortablejs/src/lib/sortablejs.module.ts
@@ -9,7 +9,7 @@ import {Options} from 'sortablejs';
 })
 export class SortablejsModule {
 
-  public static forRoot(globalOptions: Options): ModuleWithProviders {
+  public static forRoot(globalOptions: Options): ModuleWithProviders<SortablejsModule> {
     return {
       ngModule: SortablejsModule,
       providers: [

diff --git a/projects/ngx-sortablejs/tsconfig.lib.json b/projects/ngx-sortablejs/tsconfig.lib.json
@@ -19,7 +19,9 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "enableIvy": false
+
   },
   "exclude": [
     "src/test.ts",