Merge branch 'master' of github.com:nativescript-community/nativescript-collectionview

Author: farfromrefug

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
     extends: ['plugin:prettier/recommended'],
-    plugins: ['prettier', '@typescript-eslint'],
+    plugins: ['@nativescript', 'prettier', '@typescript-eslint'],
     parser: '@typescript-eslint/parser',
     parserOptions: {
         ecmaVersion: 2018,
@@ -10,9 +10,13 @@ module.exports = {
         extraFileExtensions: ['.vue'],
         warnOnUnsupportedTypeScriptVersion: false,
         tsconfigRootDir: __dirname,
+        createDefaultProgram: true
     },
     rules: {
         'prettier/prettier': 'warn',
+        '@nativescript/no-nativescript-angular-imports': 'warn',
+        '@nativescript/no-tns-core-modules-imports': 'warn',
+        '@nativescript/no-duplicate-ns-imports': 'warn',
         '@typescript-eslint/adjacent-overload-signatures': 'error',
         '@typescript-eslint/array-type': 'error',
         '@typescript-eslint/await-thenable': 'error',

demo-ng/.gitignore

@@ -7,7 +7,6 @@ platforms/
 *.js.map
 *.js
 !ngcc.config.js
-!webpack.config.js
 
 # Logs
 logs

demo-ng/package.json

@@ -20,32 +20,32 @@
     "url": "https://github.com/NativeScript/NativeScript/issues"
   },
   "dependencies": {
-    "@angular/animations": "~10.1.0",
-    "@angular/common": "~10.1.0",
-    "@angular/compiler": "~10.1.0",
-    "@angular/core": "~10.1.0",
-    "@angular/forms": "~10.1.0",
-    "@angular/platform-browser": "~10.1.0",
-    "@angular/platform-browser-dynamic": "~10.1.0",
-    "@angular/router": "~10.1.0",
-    "@nativescript/angular": "~10.1.0",
-    "@nativescript/core": "~7.0.0",
+    "@angular/animations": "~11.2.8",
+    "@angular/common": "~11.2.8",
+    "@angular/compiler": "~11.2.8",
+    "@angular/core": "~11.2.8",
+    "@angular/forms": "~11.2.8",
+    "@angular/platform-browser": "~11.2.8",
+    "@angular/platform-browser-dynamic": "~11.2.8",
+    "@angular/router": "~11.2.8",
+    "@nativescript-community/ui-collectionview": "../packages/collectionview",
+    "@nativescript/angular": "~11.8.0",
+    "@nativescript/core": "~8.0.0",
     "@nativescript/detox": "~1.0.0",
     "@nativescript/theme": "~3.0.0",
-    "@nativescript-community/ui-collectionview": "../plugin",
     "reflect-metadata": "~0.1.12",
     "rxjs": "^6.6.0",
-    "zone.js": "~0.11.1"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~10.1.0",
-    "@nativescript/android": "7.0.1",
-    "@nativescript/ios": "7.0.4",
-    "@nativescript/types": "~7.0.0",
-    "@nativescript/webpack": "~3.0.0",
-    "@ngtools/webpack": "~10.1.0",
+    "@angular/compiler-cli": "~11.2.8",
+    "@nativescript/android": "8.0.0",
+    "@nativescript/ios": "8.0.0",
+    "@nativescript/types": "~8.0.0",
+    "@nativescript/webpack": "~4.1.0",
+    "@ngtools/webpack": "~11.2.7",
     "detox": "~17.10.6",
-    "typescript": "~4.0.0"
+    "typescript": ">=4.0.0 <4.2.0"
   },
   "private": "true",
   "readme": "NativeScript Application"