From 0d0a7842bb8b4d4ad78a995169a7c1577732345e Mon Sep 17 00:00:00 2001 From: Artur Yorsh <10753921+artyorsh@users.noreply.github.com> Date: Fri, 21 Jun 2019 16:17:06 +0300 Subject: [PATCH] build: fix typescript build errors --- package-lock.json | 10 ++++ package.json | 1 + src/framework/ui/support/typings/type.ts | 22 ++++----- src/playground/package-lock.json | 60 ++++-------------------- src/playground/package.json | 3 -- 5 files changed, 31 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index a415c3831..6be0f354e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2135,6 +2135,16 @@ "@types/react": "*" } }, + "@types/react-navigation": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@types/react-navigation/-/react-navigation-3.0.7.tgz", + "integrity": "sha512-JFsNeCAQEQGTpObiD1QczDyCyQkFBaQA/F85Fo2W8QML1b6UNYHlUDtEYJA6jcfXqPoL15dVPBVj9NBJlHToqA==", + "dev": true, + "requires": { + "@types/react": "*", + "@types/react-native": "*" + } + }, "@types/react-test-renderer": { "version": "16.8.1", "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-16.8.1.tgz", diff --git a/package.json b/package.json index b7f80abc6..24aec9439 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@types/lodash.merge": "^4.6.6", "@types/react": "^16.8.19", "@types/react-native": "^0.57.60", + "@types/react-navigation": "^3.0.7", "@types/react-test-renderer": "^16.8.1", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^23.6.0", diff --git a/src/framework/ui/support/typings/type.ts b/src/framework/ui/support/typings/type.ts index 699ee2ffd..6fffed2fc 100644 --- a/src/framework/ui/support/typings/type.ts +++ b/src/framework/ui/support/typings/type.ts @@ -1,22 +1,22 @@ import { - NativeSyntheticEvent, + GestureResponderEvent, NativeScrollEvent, - TextInputFocusEventData, + NativeSyntheticEvent, TextInputEndEditingEventData, + TextInputFocusEventData, TouchableOpacityProps, - GestureResponderEvent, } from 'react-native'; -export type ScrollEvent = NativeSyntheticEvent; -export type InputFocusEvent = NativeSyntheticEvent; -export type InputEndEditEvent = NativeSyntheticEvent; - -export type Omit = Pick>; +export type Omit = Pick>; +export type Override = Omit & U; -// @ts-ignore: props override -export interface TouchableIndexedProps extends TouchableOpacityProps { +export type TouchableIndexedProps = Override void; onPressIn?: (index: number, event: GestureResponderEvent) => void; onPressOut?: (index: number, event: GestureResponderEvent) => void; onLongPress?: (index: number, event: GestureResponderEvent) => void; -} +}>; + +export type ScrollEvent = NativeSyntheticEvent; +export type InputFocusEvent = NativeSyntheticEvent; +export type InputEndEditEvent = NativeSyntheticEvent; diff --git a/src/playground/package-lock.json b/src/playground/package-lock.json index 3b78eccbd..03bde1a05 100644 --- a/src/playground/package-lock.json +++ b/src/playground/package-lock.json @@ -1100,47 +1100,11 @@ "@types/lodash": "*" } }, - "@types/prop-types": { - "version": "15.7.1", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz", - "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==", - "dev": true - }, "@types/qs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.5.3.tgz", "integrity": "sha512-Jugo5V/1bS0fRhy2z8+cUAHEyWOATaz4rbyLVvcFs7+dXp5HfwpEwzF1Q11bB10ApUqHf+yTauxI0UXQDwGrbA==" }, - "@types/react": { - "version": "16.8.21", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.21.tgz", - "integrity": "sha512-+jAtgtJ3htE+VEP/bMzBBOANGkaTbMOGYWVrmhCVtp2WE//lNG6Irw9kBEaLR7lQGjjkt/BlSSHPgArFNOKhkg==", - "dev": true, - "requires": { - "@types/prop-types": "*", - "csstype": "^2.2.0" - } - }, - "@types/react-native": { - "version": "0.57.63", - "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.57.63.tgz", - "integrity": "sha512-viAtvjgb/6cn4gu7eEUhTxhlYZ8oOG+1OdHznWac1BgbiPEGcDmamnW/+KZR9gRjsXY9qZY+nfyzVjcwhYmlkw==", - "dev": true, - "requires": { - "@types/prop-types": "*", - "@types/react": "*" - } - }, - "@types/react-navigation": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@types/react-navigation/-/react-navigation-3.0.7.tgz", - "integrity": "sha512-JFsNeCAQEQGTpObiD1QczDyCyQkFBaQA/F85Fo2W8QML1b6UNYHlUDtEYJA6jcfXqPoL15dVPBVj9NBJlHToqA==", - "dev": true, - "requires": { - "@types/react": "*", - "@types/react-native": "*" - } - }, "@types/uuid-js": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/@types/uuid-js/-/uuid-js-0.7.2.tgz", @@ -1934,9 +1898,9 @@ "integrity": "sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=" }, "caniuse-lite": { - "version": "1.0.30000975", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz", - "integrity": "sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==" + "version": "1.0.30000976", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz", + "integrity": "sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==" }, "capture-exit": { "version": "1.2.0", @@ -2244,12 +2208,6 @@ "which": "^1.2.9" } }, - "csstype": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.5.tgz", - "integrity": "sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA==", - "dev": true - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -2472,9 +2430,9 @@ } }, "expo": { - "version": "33.0.6", - "resolved": "https://registry.npmjs.org/expo/-/expo-33.0.6.tgz", - "integrity": "sha512-BhPaEIdB+tEb5Wlp7ux+RDy7/mMPUSR6aCAVH2HlgrIpndFqgaWbm7pjRigE1Aqco0Iwcw/1G5k2spSu180GNA==", + "version": "33.0.7", + "resolved": "https://registry.npmjs.org/expo/-/expo-33.0.7.tgz", + "integrity": "sha512-+mDBQ/KeJnDWg8bUoiuP/OpMXwUYaypgHMDPgH7+AXw8OJuedMhJlH+7UEX2OB+UePnWPcQER411sC7m819pag==", "requires": { "@babel/runtime": "^7.1.2", "@expo/vector-icons": "^10.0.1", @@ -5464,9 +5422,9 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.7.0.tgz", - "integrity": "sha512-oQ01H1jrgDRbPq5SjtJF470S418GOrKkds+fpvAt6DQatHXl7bmkaJulHbTIM+QNGtoPpa8f5k9W3Zk50zXRPQ==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.0.tgz", + "integrity": "sha512-CVpZPN0xDUfmoT7qlDbbx/2jNjk43LW3Ayjy7E2BjOQNlL8L/hqhihUpv/XPu/w3H/LBjlZ7OXP8x/QEnuxTtA==", "requires": { "decode-uri-component": "^0.2.0", "split-on-first": "^1.0.0", diff --git a/src/playground/package.json b/src/playground/package.json index 57630236f..15363cd9e 100644 --- a/src/playground/package.json +++ b/src/playground/package.json @@ -11,8 +11,5 @@ "react": "^16.8.3", "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz", "react-navigation": "^3.11.0" - }, - "devDependencies": { - "@types/react-navigation": "^3.0.7" } }