Merge pull request #288 from EdgeApp/william/typescript

William/typescript

Author: swansontec

.eslintignore

@@ -4,3 +4,4 @@
 /packages/*/dist/
 /packages/*/lib/
 /packages/*/node_modules/
+/packages/edge-login-ui-rn/lib/

.eslintrc.json

@@ -3,9 +3,13 @@
     "standard-kit/prettier",
     "standard-kit/prettier/jsx",
     "standard-kit/prettier/flow",
+    "standard-kit/prettier/typescript",
     "standard-kit/prettier/node",
     "standard-kit/prettier/react"
   ],
+  "parserOptions": {
+    "project": "tsconfig.json"
+  },
   "plugins": [
     "simple-import-sort"
   ],

flow-typed/react-native-material-textfield.js

@@ -7,7 +7,7 @@
     "fix": "npm run lint -- --fix",
     "flow": "flow",
     "lint": "eslint .",
-    "precommit": "node -r sucrase/register localizeLanguage.js && lint-staged && flow",
+    "precommit": "node -r sucrase/register localizeLanguage.js && lint-staged && flow && tsc",
     "prepare": "lerna exec yarn prepare"
   },
   "husky": {
@@ -16,12 +16,14 @@
     }
   },
   "lint-staged": {
-    "*.{js,jsx}": "eslint"
+    "*.{js,jsx,ts,tsx}": "eslint"
   },
   "resolutions": {
     "scrypt.js": "0.3.0"
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^4.8.2",
+    "@typescript-eslint/parser": "^4.8.2",
     "babel-eslint": "^10.1.0",
     "css-module-flow": "^1.0.0",
     "eslint": "^7.14.0",
@@ -39,6 +41,7 @@
     "lerna": "^3.16.4",
     "lint-staged": "^10.5.3",
     "prettier": "^2.2.0",
-    "sucrase": "^3.19.0"
+    "sucrase": "^3.19.0",
+    "typescript": "^4.1.2"
   }
 }

package.json

@@ -0,0 +1,20 @@
+{
+  "extends": [
+    "plugin:react-native/all"
+  ],
+  "rules": {
+    "@typescript-eslint/default-param-last": "off",
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-empty-interface": "off",
+    "@typescript-eslint/no-floating-promises": "off",
+    "@typescript-eslint/no-misused-promises": "off",
+    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/prefer-nullish-coalescing": "off",
+    "@typescript-eslint/prefer-optional-chain": "off",
+    "@typescript-eslint/restrict-plus-operands": "off",
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/strict-boolean-expressions": "off",
+    "react-native/no-inline-styles": "off",
+    "react-native/no-raw-text": ["error", { "skip": ["EdgeText"] }]
+  }
+}

packages/edge-login-ui-rn/.eslintrc.json

@@ -14,17 +14,17 @@
   "homepage": "https://github.com/EdgeApp/edge-login-ui",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Airbitz, Inc.",
-  "main": "src/index.js",
+  "main": "lib/index.js",
   "files": [
-    "android/**",
-    "edge-login-ui-rn.podspec",
-    "ios/**",
-    "LICENSE",
-    "src/**",
-    "README.md"
+    "/android/*",
+    "/edge-login-ui-rn.podspec",
+    "/ios/*",
+    "/lib/*",
+    "/LICENSE",
+    "/README.md"
   ],
   "scripts": {
-    "prepare": "echo nothing to do"
+    "prepare": "rm -r lib && tsc && cp src/index.flow.js lib/index.js.flow && cp -r src/assets lib"
   },
   "resolutions": {
     "scrypt.js": "0.3.0"
@@ -52,6 +52,8 @@
   },
   "devDependencies": {
     "@react-native-community/art": "^1.0.2",
+    "@types/react-native": "^0.64.4",
+    "@types/sprintf-js": "^1.1.2",
     "edge-core-js": "^0.18.2",
     "flow-bin": "^0.84.0"
   },

packages/edge-login-ui-rn/package.json

@@ -1,19 +1,17 @@
-// @flow
-
 import { sprintf } from 'sprintf-js'
 import passwordCheck from 'zxcvbn'
 
-import s from '../common/locales/strings.js'
-import { Airship } from '../components/services/AirshipInstance.js'
-import * as Constants from '../constants/index.js'
-import { enableTouchId, isTouchDisabled } from '../keychain.js'
-import type { Dispatch, GetState, Imports } from '../types/ReduxTypes.js'
-import { logEvent } from '../util/analytics.js'
-import { getPreviousUsers, setMostRecentUsers } from './PreviousUsersActions.js'
+import s from '../common/locales/strings'
+import { Airship } from '../components/services/AirshipInstance'
+import * as Constants from '../constants/index'
+import { enableTouchId, isTouchDisabled } from '../keychain'
+import { Dispatch, GetState, Imports } from '../types/ReduxTypes'
+import { logEvent } from '../util/analytics'
+import { getPreviousUsers, setMostRecentUsers } from './PreviousUsersActions'
 
-export type CreateUserData = {
-  username: string,
-  password: string,
+export interface CreateUserData {
+  username: string
+  password: string
   pin: string
 }
 
@@ -30,8 +28,8 @@ export function validatePin(pin: string) {
   }
 }
 export function checkUsernameForAvailabilty(data: string) {
-  return (dispatch: Dispatch, getState: GetState, imports: Imports) =>
-    imports.context
+  return async (dispatch: Dispatch, getState: GetState, imports: Imports) =>
+    await imports.context
       .usernameAvailable(data)
       .then(async response => {
         if (response) {

packages/edge-login-ui-rn/src/.eslintrc.json

@@ -1,14 +1,12 @@
-// @flow
-
 import * as React from 'react'
 
-import s from '../common/locales/strings.js'
-import { TextInputModal } from '../components/modals/TextInputModal.js'
-import { Airship, showError } from '../components/services/AirshipInstance.js'
-import { getLoginKey } from '../keychain.js'
-import type { Dispatch, GetState, Imports } from '../types/ReduxTypes.js'
-import { type LoginAttempt, attemptLogin } from '../util/loginAttempt.js'
-import { completeLogin } from './LoginCompleteActions.js'
+import s from '../common/locales/strings'
+import { TextInputModal } from '../components/modals/TextInputModal'
+import { Airship, showError } from '../components/services/AirshipInstance'
+import { getLoginKey } from '../keychain'
+import { Dispatch, GetState, Imports } from '../types/ReduxTypes'
+import { attemptLogin, LoginAttempt } from '../util/loginAttempt'
+import { completeLogin } from './LoginCompleteActions'
 
 /**
  * Logs the user in, using password, PIN, or recovery.

…i-rn/src/actions/CreateAccountActions.js …i-rn/src/actions/CreateAccountActions.tspackages/edge-login-ui-rn/src/actions/CreateAccountActions.js renamed to packages/edge-login-ui-rn/src/actions/CreateAccountActions.ts packages/edge-login-ui-rn/src/actions/CreateAccountActions.js renamed to packages/edge-login-ui-rn/src/actions/CreateAccountActions.ts

@@ -1,27 +1,21 @@
-// @flow
-
-import { type EdgeAccount } from 'edge-core-js'
+import { EdgeAccount } from 'edge-core-js'
 import * as React from 'react'
 import { Keyboard } from 'react-native'
 import { sprintf } from 'sprintf-js'
 
-import s from '../common/locales/strings.js'
-import { ButtonsModal } from '../components/modals/ButtonsModal.js'
-import { Airship } from '../components/services/AirshipInstance.js'
-import * as Constants from '../constants/index.js'
+import s from '../common/locales/strings'
+import { ButtonsModal } from '../components/modals/ButtonsModal'
+import { Airship } from '../components/services/AirshipInstance'
+import * as Constants from '../constants/index'
 import {
   enableTouchId,
   isTouchDisabled,
   isTouchEnabled,
   supportsTouchId
-} from '../keychain.js'
-import {
-  type Dispatch,
-  type GetState,
-  type Imports
-} from '../types/ReduxTypes.js'
-import { hasSecurityAlerts } from '../util/hasSecurityAlerts.js'
-import { setMostRecentUsers } from './PreviousUsersActions.js'
+} from '../keychain'
+import { Dispatch, GetState, Imports } from '../types/ReduxTypes'
+import { hasSecurityAlerts } from '../util/hasSecurityAlerts'
+import { setMostRecentUsers } from './PreviousUsersActions'
 
 /**
  * The user has just logged in, so figure out what do to next.
@@ -146,7 +140,7 @@ async function twofaReminder(account: EdgeAccount) {
 
   const enableOtp = async account => {
     await account.enableOtp()
-    return Airship.show(bridge => (
+    return await Airship.show(bridge => (
       <ButtonsModal
         bridge={bridge}
         title={s.strings.otp_authentication_header}
@@ -174,7 +168,7 @@ async function twofaReminder(account: EdgeAccount) {
 
   const createOtpCheckModalDontAsk = async () => {
     Keyboard.dismiss()
-    return Airship.show(bridge => (
+    return await Airship.show(bridge => (
       <ButtonsModal
         bridge={bridge}
         title={s.strings.otp_reset_modal_header}