diff --git a/.gitignore b/.gitignore index 886ff55..ec84ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ demo/platforms node_modules demo/hooks/ publish/package/ +package-lock.json \ No newline at end of file diff --git a/src/.npmignore b/src/.npmignore index 70f024a..c65a1fd 100644 --- a/src/.npmignore +++ b/src/.npmignore @@ -7,3 +7,4 @@ references.d.ts platforms/android/* !platforms/android/include.gradle !platforms/android/*.aar +*.tgz diff --git a/src/fingerprint-auth.android.ts b/src/fingerprint-auth.android.ts index dd90a4c..8defabd 100755 --- a/src/fingerprint-auth.android.ts +++ b/src/fingerprint-auth.android.ts @@ -1,6 +1,4 @@ -import * as app from "tns-core-modules/application"; -import { AndroidActivityResultEventData } from "tns-core-modules/application"; -import { ad as androidUtils } from "tns-core-modules/utils/utils"; +import { Application, AndroidActivityResultEventData, Utils, AndroidApplication } from "@nativescript/core"; import { BiometricIDAvailableResult, ERROR_CODES, FingerprintAuthApi, VerifyFingerprintOptions, VerifyFingerprintWithCustomFallbackOptions } from "./fingerprint-auth.common"; declare const com: any; @@ -14,7 +12,7 @@ export class FingerprintAuth implements FingerprintAuthApi { private fingerPrintManager: any; constructor() { - this.keyguardManager = androidUtils + this.keyguardManager = Utils.android .getApplicationContext() .getSystemService("keyguard"); } @@ -36,7 +34,7 @@ export class FingerprintAuth implements FingerprintAuthApi { return; } - const fingerprintManager = androidUtils + const fingerprintManager = Utils.android .getApplicationContext() .getSystemService( "fingerprint" @@ -108,7 +106,7 @@ export class FingerprintAuth implements FingerprintAuthApi { } else if (options.useCustomAndroidUI && hasSupportFragment) { if (!this.fingerPrintManager) { this.fingerPrintManager = new com.jesusm.kfingerprintmanager.KFingerprintManager( - androidUtils.getApplicationContext(), + Utils.android.getApplicationContext(), KEY_NAME ); } @@ -181,14 +179,14 @@ export class FingerprintAuth implements FingerprintAuthApi { }); } } - app.android.off( - app.AndroidApplication.activityResultEvent, + Application.android.off( + AndroidApplication.activityResultEvent, onActivityResult ); }; - app.android.on( - app.AndroidApplication.activityResultEvent, + Application.android.on( + AndroidApplication.activityResultEvent, onActivityResult ); @@ -355,6 +353,6 @@ export class FingerprintAuth implements FingerprintAuthApi { } private getActivity(): any /* android.app.Activity */ { - return app.android.foregroundActivity || app.android.startActivity; + return Application.android.foregroundActivity || Application.android.startActivity; } } diff --git a/src/fingerprint-auth.ios.ts b/src/fingerprint-auth.ios.ts index afa5bd7..8226b6d 100755 --- a/src/fingerprint-auth.ios.ts +++ b/src/fingerprint-auth.ios.ts @@ -1,4 +1,4 @@ -import { ios as iOSUtils } from "tns-core-modules/utils/utils"; +import { Utils } from "@nativescript/core"; import { BiometricIDAvailableResult, FingerprintAuthApi, @@ -46,7 +46,7 @@ export class FingerprintAuth implements FingerprintAuthApi { } // only supported on iOS9+, so check this.. if not supported just report back as false - if (iOSUtils.MajorVersion < 9) { + if (Utils.ios.MajorVersion < 9) { resolve(false); return; } diff --git a/src/package.json b/src/package.json index 7a56708..07758ec 100755 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { - "name": "nativescript-fingerprint-auth", - "version": "7.0.2", + "name": "@nativescript/fingerprint-auth", + "version": "7.0.0", "description": "A fingerprint authentication plugin for use in NativeScript apps", "main": "fingerprint-auth", "nativescript": { @@ -13,13 +13,13 @@ "android": { "tns-java-classes": { "modules": [ - "nativescript-fingerprint-auth/appcompat-activity" + "@nativescript/fingerprint-auth/appcompat-activity" ] } } }, "scripts": { - "build": "npm i && tsc", + "build": "npm i && ts-patch install && tsc", "demo.ios": "npm run preparedemo && cd ../demo && tns run ios", "demo.android": "npm run preparedemo && cd ../demo && tns platform remove android && tns run android", "test": "npm run tslint && npm run tslint.demo && cd ../demo && tns build ios && tns build android", @@ -65,9 +65,14 @@ "homepage": "https://github.com/eddyverbruggen/nativescript-fingerprint-auth", "readmeFilename": "README.md", "devDependencies": { - "tns-core-modules": "~6.1.1", - "tns-platform-declarations": "~6.1.1", - "typescript": "~3.4.5", - "tslint": "^5.17.0" + "@nativescript/core": "rc", + "@nativescript/types": "rc", + "@nativescript/webpack": "rc", + "typescript": "~3.9.0", + "tslint": "^6.1.3", + "ts-patch": "~1.3.0" + }, + "dependencies": { + "ts-node": "^8.10.2" } } diff --git a/src/references.d.ts b/src/references.d.ts index f4ee42a..009e1a6 100644 --- a/src/references.d.ts +++ b/src/references.d.ts @@ -1,2 +1,2 @@ -/// -/// +/// +/// diff --git a/src/tsconfig.json b/src/tsconfig.json index d4f1110..cde192e 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { - "target": "es5", - "module": "commonjs", + "target": "es2017", + "module": "esnext", + "moduleResolution": "node", "declaration": true, "removeComments": true, "noLib": false, @@ -22,11 +23,9 @@ "noImplicitReturns": true, "noImplicitUseStrict": false, "noFallthroughCasesInSwitch": true, - "typeRoots": [ - "./node_modules/@types", - "./node_modules" - ], - "types": [ + "baseUrl": ".", + "plugins": [ + { "transform": "@nativescript/webpack/transformers/ns-transform-native-classes", "type": "raw" } ] }, "exclude": [