{NS}7+ compatibility

.gitignore

@@ -1,3 +1,4 @@
+.idea
 .DS_Store
 *.js
 *.js.map

demo/package.json

@@ -10,15 +10,15 @@
 	},
 	"dependencies": {
 		"nativescript-fonticon": "file:../src",
-		"tns-core-modules": "^4.2.0"
-	},
+    "@nativescript/core": "~7.0.0"
+  },
 	"devDependencies": {
 		"babel-traverse": "6.7.6",
 		"babel-types": "6.7.7",
 		"babylon": "6.7.0",
 		"filewalker": "0.1.2",
 		"lazy": "1.0.11",
 		"nativescript-dev-typescript": "^0.7.3",
-		"typescript": "^2.9.0"
+    "typescript": "~3.9.0"
 	}
-}
+}

demo/tsconfig.json

@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "es5",
+      "target": "ES2017",
+      "module": "esnext",
+      "moduleResolution": "node",
         "experimentalDecorators": true,
         "noEmitHelpers": true,
         "lib": [
@@ -17,10 +18,16 @@
                 "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
             ]
+        },
+      "plugins": [
+        {
+          "transform": "@nativescript/webpack/transformers/ns-transform-native-classes",
+          "type": "raw"
         }
+      ]
     },
     "exclude": [
         "node_modules",
         "platforms"
     ]
-}
+}

src/nativescript-fonticon.ts

@@ -42,10 +42,12 @@ export class TNSFontIcon {
           loadFile(TNSFontIcon.paths[currentName]).then(() => {
             cnt++;
             return loadFiles().then(() => {
+              // @ts-ignore
               resolve();
             });
           });
         } else {
+          // @ts-ignore
           resolve();
         }
       });

src/package.json

@@ -15,7 +15,7 @@
 		"demo.ios": "npm run preparedemo && cd ../demo && tns run ios --emulator",
 		"demo.android": "npm run preparedemo && cd ../demo && tns run android --emulator",
 		"preparedemo": "npm run build && cd ../demo && tns plugin remove nativescript-fonticon && tns plugin add ../src && tns install && npx rimraf -- package-lock.json",
-		"setup": "cd ../demo && npm install && cd ../src && npm run build && cd ../demo && tns plugin add ../src && cd ../src",
+		"setup": "cd ../demo && npm install && cd ../src && npm run build && cd ../demo && tns plugin add ../src && cd ../src && npm i && ts-patch install",
 		"test": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha --require ts-node/register --watch-extensions ts \"test/**/*spec.ts\"",
 		"lint": "tslint --project ./ --format stylish"
 	},
@@ -54,13 +54,16 @@
 	"readmeFilename": "README.md",
 	"devDependencies": {
 		"@fortawesome/fontawesome-free": "~5.13.0",
+		"@nativescript/core": "~7.0.0",
+		"@nativescript/types": "~7.0.0",
+		"@nativescript/webpack": "~3.0.0",
 		"@types/mocha": "^7.0.2",
 		"@types/node": "~12.0.0",
 		"cross-env": "^7.0.2",
 		"mocha": "~8.0.1",
-		"@nativescript/core": "~6.5.0",
 		"ts-node": "~8.10.2",
+		"ts-patch": "^1.3.1",
 		"tslint": "~6.1.2",
-		"typescript": "^3.8.3"
+		"typescript": "~3.9.0"
 	}
 }

src/tsconfig.json

@@ -1,30 +1,37 @@
 {
-    "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
-        "declaration": true,
-        "removeComments": true,
-        "noLib": false,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "skipLibCheck": true,
-        "lib": [
-          "es2017",
-          "dom"
-        ],
-        "sourceMap": true,
-        "pretty": true,
-        "allowUnreachableCode": false,
-        "allowUnusedLabels": false,
-        "noEmitHelpers": true,
-        "noEmitOnError": false,
-        "noImplicitAny": false,
-        "noImplicitReturns": true,
-        "noImplicitUseStrict": false,
-        "noFallthroughCasesInSwitch": true
-    },
-    "files": [
-      "nativescript-fonticon.ts"
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "declaration": true,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "lib": [
+      "es2017",
+      "dom"
     ],
-    "compileOnSave": false
-}
+    "sourceMap": true,
+    "pretty": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noEmitHelpers": true,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noImplicitUseStrict": false,
+    "noFallthroughCasesInSwitch": true,
+    "plugins": [
+      {
+        "transform": "@nativescript/webpack/transformers/ns-transform-native-classes",
+        "type": "raw"
+      }
+    ]
+  },
+  "files": [
+    "nativescript-fonticon.ts"
+  ],
+  "compileOnSave": false
+}