fix: publish grpc-bridge package

Signed-off-by: Norman Meier <norman@berty.tech>

go/cmd/publish-npm-package/main.go

@@ -28,6 +28,8 @@ type packageJSONVars struct {
 func errMain() error {
 	pathFlag := flag.String("path", "", "path to the package to be published")
 	versionFlag := flag.String("version", "", "version to publish")
+	var manual bool
+	flag.BoolVar(&manual, "manual", false, "don't install deps and don't publish if set")
 	flag.Parse()
 
 	path := *pathFlag
@@ -101,6 +103,11 @@ func errMain() error {
 	}
 	logger.Info("Wrote package.json")
 
+	if manual {
+		logger.Info("Manual mode!")
+		return nil
+	}
+
 	cmd := exec.Command("npm", "i")
 	cmd.Dir = buildDir
 	cmd.Stderr = os.Stderr

js/babel.config.js

@@ -10,7 +10,7 @@ module.exports = {
 			'module-resolver',
 			{
 				alias: {
-					'@berty-tech': './packages/',
+					'@berty': './packages/',
 				},
 			},
 		],

js/electron-app/craco.config.js

@@ -21,7 +21,7 @@ module.exports = {
 			return webpackConfig;
 		},
 		alias: {
-			'@berty-tech': path.join(path.resolve(__dirname, '../packages/')),
+			'@berty': path.join(path.resolve(__dirname, '../packages/')),
 		},
 	}
 }

js/packages/berty-i18n/README.md

@@ -1,11 +1,11 @@
-# `@berty-tech/berty-i18n`
+# `@berty/berty-i18n`
 
 > TODO: description
 
 ## Usage
 
 ```
-const bertyI18N = require('@berty-tech/berty-i18n');
+const bertyI18N = require('@berty/berty-i18n');
 
 // TODO: DEMONSTRATE API
 ```

js/packages/components/AttachmentImage.tsx

@@ -1,12 +1,12 @@
 import React, { useState, useEffect } from 'react'
 import { Image, ImageProps, ActivityIndicator, View, TouchableOpacity } from 'react-native'
 
-import { useNavigation } from '@berty-tech/navigation'
-import { useMedia } from '@berty-tech/react-redux'
+import { useNavigation } from '@berty/navigation'
+import { useMedia } from '@berty/react-redux'
 
 import { getSource } from './utils'
 import { useSelector } from 'react-redux'
-import { selectProtocolClient } from '@berty-tech/redux/reducers/ui.reducer'
+import { selectProtocolClient } from '@berty/redux/reducers/ui.reducer'
 
 const AttachmentImage: React.FC<{ cid: string; pressable?: boolean } & Omit<ImageProps, 'source'>> =
 	React.memo(props => {

js/packages/components/InfosChat.tsx

@@ -3,15 +3,10 @@ import { Text as TextNative, View } from 'react-native'
 import { useTranslation } from 'react-i18next'
 import { Icon, Text } from '@ui-kitten/components'
 
-import beapi from '@berty-tech/api'
-import { useStyles } from '@berty-tech/styles'
-import {
-	pbDateToNum,
-	useMessengerClient,
-	useThemeColor,
-	useMessengerContext,
-} from '@berty-tech/store'
-import { useOneToOneContact } from '@berty-tech/react-redux'
+import beapi from '@berty/api'
+import { useStyles } from '@berty/styles'
+import { pbDateToNum, useMessengerClient, useThemeColor, useMessengerContext } from '@berty/store'
+import { useOneToOneContact } from '@berty/react-redux'
 
 import { timeFormat } from './helpers'
 import { ContactAvatar } from './avatars'

js/packages/components/NotificationBody.tsx

@@ -3,15 +3,15 @@ import { Vibration } from 'react-native'
 import GestureRecognizer from 'react-native-swipe-gestures'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
-import beapi from '@berty-tech/api'
-import { useStyles } from '@berty-tech/styles'
+import beapi from '@berty/api'
+import { useStyles } from '@berty/styles'
 import {
 	usePersistentOptions,
 	useMessengerContext,
 	useThemeColor,
 	NotificationsInhibitor,
 	SoundKey,
-} from '@berty-tech/store'
+} from '@berty/store'
 
 import { usePrevious } from './hooks'
 import notifications, { DefaultNotification } from './notifications'

js/packages/components/avatars.tsx

@@ -4,15 +4,15 @@ import palette from 'google-palette'
 import { SHA3 } from 'sha3'
 import { withBadge } from 'react-native-elements'
 
-import { useStyles } from '@berty-tech/styles'
-import { Maybe, useMessengerContext, useThemeColor } from '@berty-tech/store'
-import { navigate } from '@berty-tech/navigation'
-import beapi from '@berty-tech/api'
-import PinkBotAvatar from '@berty-tech/assets/berty_bot_pink_bg.png'
-import GreenDevAvatar from '@berty-tech/assets/berty_dev_green_bg.png'
-import OrangeBotAvatar from '@berty-tech/assets/berty_bot_orange_bg.png'
-import BlueDevAvatar from '@berty-tech/assets/berty_dev_blue_bg.png'
-import { useAccount, useContact, useConversation, useMember } from '@berty-tech/react-redux'
+import { useStyles } from '@berty/styles'
+import { Maybe, useMessengerContext, useThemeColor } from '@berty/store'
+import { navigate } from '@berty/navigation'
+import beapi from '@berty/api'
+import PinkBotAvatar from '@berty/assets/berty_bot_pink_bg.png'
+import GreenDevAvatar from '@berty/assets/berty_dev_green_bg.png'
+import OrangeBotAvatar from '@berty/assets/berty_bot_orange_bg.png'
+import BlueDevAvatar from '@berty/assets/berty_dev_blue_bg.png'
+import { useAccount, useContact, useConversation, useMember } from '@berty/react-redux'
 
 import AttachmentImage from './AttachmentImage'
 import GroupAvatar from './main/Avatar_Group_Copy_19.png'

js/packages/components/chat/ChatSettingsMemberDetail.tsx

@@ -3,14 +3,14 @@ import { View, ScrollView, StatusBar } from 'react-native'
 import { Layout } from '@ui-kitten/components'
 import { useTranslation } from 'react-i18next'
 
-import { useStyles } from '@berty-tech/styles'
-import { ScreenFC } from '@berty-tech/navigation'
-import { Maybe, useThemeColor } from '@berty-tech/store'
-import { useMember } from '@berty-tech/react-redux'
+import { useStyles } from '@berty/styles'
+import { ScreenFC } from '@berty/navigation'
+import { Maybe, useThemeColor } from '@berty/store'
+import { useMember } from '@berty/react-redux'
 
 import { FactionButtonSetting } from '../shared-components/SettingsButtons'
 import { MemberAvatar } from '../avatars'
-import UserDevicesList from '@berty-tech/components/chat/DeviceList'
+import UserDevicesList from '@berty/components/chat/DeviceList'
 
 const ChatSettingsMemberDetailHeader: React.FC<{
 	convId: Maybe<string>

js/packages/components/chat/ContactSettings.tsx

@@ -2,15 +2,15 @@ import React, { useState } from 'react'
 import { View, ScrollView, ActivityIndicator, StatusBar, Text } from 'react-native'
 import { useTranslation } from 'react-i18next'
 
-import { useStyles } from '@berty-tech/styles'
-import { useThemeColor } from '@berty-tech/store'
-import { ScreenFC } from '@berty-tech/navigation'
-import { useContact, useConversation } from '@berty-tech/react-redux'
+import { useStyles } from '@berty/styles'
+import { useThemeColor } from '@berty/store'
+import { ScreenFC } from '@berty/navigation'
+import { useContact, useConversation } from '@berty/react-redux'
 
 import { FingerprintContent } from '../shared-components/FingerprintContent'
 import { TabBar } from '../shared-components/TabBar'
 import { ContactAvatar } from '../avatars'
-import UserDevicesList from '@berty-tech/components/chat/DeviceList'
+import UserDevicesList from '@berty/components/chat/DeviceList'
 
 const ContactSettingsHeaderContent: React.FC = ({ children }) => {
 	const [{ margin }] = useStyles()

js/packages/components/chat/DeviceList.tsx

@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react'
 import { View } from 'react-native'
 import { useTranslation } from 'react-i18next'
-import { ButtonDropDown } from '@berty-tech/components/shared-components'
-import { berty } from '@berty-tech/api/root.pb'
-import { useStyles } from '@berty-tech/styles'
+import { ButtonDropDown } from '@berty/components/shared-components'
+import { berty } from '@berty/api/root.pb'
+import { useStyles } from '@berty/styles'
 import {
 	getDevicesForConversationAndMember,
 	getSharedPushTokensForConversation,
-} from '@berty-tech/store'
+} from '@berty/store'
 import { useSelector } from 'react-redux'
-import { selectClient } from '@berty-tech/redux/reducers/ui.reducer'
+import { selectClient } from '@berty/redux/reducers/ui.reducer'
 
 const UserDevicesList: React.FC<{ memberPk: string; conversationPk: string }> = ({
 	memberPk,

js/packages/components/chat/EnableNotificationsButton.tsx

@@ -4,22 +4,22 @@ import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
 import { RESULTS, PermissionStatus, checkNotifications } from 'react-native-permissions'
 
-import { ButtonSetting } from '@berty-tech/components/shared-components'
+import { ButtonSetting } from '@berty/components/shared-components'
 import {
 	getSharedPushTokensForConversation,
 	requestAndPersistPushToken,
 	servicesAuthViaDefault,
 	serviceTypes,
 	useAccountServices,
-} from '@berty-tech/store'
-import rnutil from '@berty-tech/rnutil'
-import { useNavigation } from '@berty-tech/navigation'
-import { useStyles } from '@berty-tech/styles'
-import beapi from '@berty-tech/api'
-import { GRPCError } from '@berty-tech/grpc-bridge'
-import { selectClient, selectProtocolClient } from '@berty-tech/redux/reducers/ui.reducer'
-import { berty } from '@berty-tech/api/root.pb'
-import { useConversation } from '@berty-tech/react-redux'
+} from '@berty/store'
+import rnutil from '@berty/rnutil'
+import { useNavigation } from '@berty/navigation'
+import { useStyles } from '@berty/styles'
+import beapi from '@berty/api'
+import { GRPCError } from '@berty/grpc-bridge'
+import { selectClient, selectProtocolClient } from '@berty/redux/reducers/ui.reducer'
+import { berty } from '@berty/api/root.pb'
+import { useConversation } from '@berty/react-redux'
 
 const EnableNotificationsButton: React.FC<{
 	conversationPk: string

js/packages/components/chat/ImageCounter.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 import { View } from 'react-native'
 import { Text, Icon } from '@ui-kitten/components'
 
-import { useStyles } from '@berty-tech/styles'
-import { useThemeColor } from '@berty-tech/store/hooks'
+import { useStyles } from '@berty/styles'
+import { useThemeColor } from '@berty/store/hooks'
 
 export const ImageCounter: React.FC<{ count: number }> = ({ count }) => {
 	const [{ border, padding }] = useStyles()

js/packages/components/chat/InfosMultiMember.tsx

@@ -2,11 +2,11 @@ import React from 'react'
 import { View } from 'react-native'
 import { Text } from '@ui-kitten/components'
 
-import { MessageSystemWrapper } from '@berty-tech/components/chat/message/MessageSystemWrapper'
-import { ChatDate } from '@berty-tech/components/chat/common'
-import { useStyles } from '@berty-tech/styles'
-import beapi from '@berty-tech/api'
-import { useThemeColor } from '@berty-tech/store/hooks'
+import { MessageSystemWrapper } from '@berty/components/chat/message/MessageSystemWrapper'
+import { ChatDate } from '@berty/components/chat/common'
+import { useStyles } from '@berty/styles'
+import beapi from '@berty/api'
+import { useThemeColor } from '@berty/store/hooks'
 
 export const InfosMultiMember: React.FC<beapi.messenger.IConversation> = ({
 	createdDate: createdDateStr,

js/packages/components/chat/MessageList.tsx

@@ -8,20 +8,20 @@ import {
 } from 'react-native'
 import moment from 'moment'
 
-import { useStyles } from '@berty-tech/styles'
+import { useStyles } from '@berty/styles'
 import {
 	fetchMore,
 	pbDateToNum,
 	ParsedInteraction,
 	useMessengerClient,
 	useThemeColor,
-} from '@berty-tech/store'
-import beapi from '@berty-tech/api'
+} from '@berty/store'
+import beapi from '@berty/api'
 import {
 	useConversationInteractions,
 	useConversationMembersDict,
 	useConversation,
-} from '@berty-tech/react-redux'
+} from '@berty/react-redux'
 
 import { InfosChat } from '../InfosChat'
 import { Message } from './message'

js/packages/components/chat/MultiMember.tsx

@@ -6,18 +6,18 @@ import { useTranslation } from 'react-i18next'
 import AndroidKeyboardAdjust from 'react-native-android-keyboard-adjust'
 import { useHeaderHeight } from '@react-navigation/elements'
 
-import { useStyles } from '@berty-tech/styles'
-import { ScreenFC } from '@berty-tech/navigation'
+import { useStyles } from '@berty/styles'
+import { ScreenFC } from '@berty/navigation'
 import {
 	useReadEffect,
 	useNotificationsInhibitor,
 	useThemeColor,
 	pbDateToNum,
 	useMessengerClient,
-} from '@berty-tech/store'
-import beapi from '@berty-tech/api'
-import { IOSOnlyKeyboardAvoidingView } from '@berty-tech/rnutil/keyboardAvoiding'
-import { useConversation, useLastConvInteraction } from '@berty-tech/react-redux'
+} from '@berty/store'
+import beapi from '@berty/api'
+import { IOSOnlyKeyboardAvoidingView } from '@berty/rnutil/keyboardAvoiding'
+import { useConversation, useLastConvInteraction } from '@berty/react-redux'
 
 import { ChatDate } from './common'
 import { MultiMemberAvatar } from '../avatars'

js/packages/components/chat/MultiMemberQR.tsx

@@ -3,11 +3,11 @@ import QRCode from 'react-native-qrcode-svg'
 import { Share, TouchableOpacity, View, Text, StatusBar } from 'react-native'
 import { Icon, Layout } from '@ui-kitten/components'
 
-import beapi from '@berty-tech/api'
-import { ScreenFC } from '@berty-tech/navigation'
-import { useStylesBertyId, useThemeColor } from '@berty-tech/store'
-import { useStyles } from '@berty-tech/styles'
-import { useAccount, useConversation } from '@berty-tech/react-redux'
+import beapi from '@berty/api'
+import { ScreenFC } from '@berty/navigation'
+import { useStylesBertyId, useThemeColor } from '@berty/store'
+import { useStyles } from '@berty/styles'
+import { useAccount, useConversation } from '@berty/react-redux'
 
 import { MultiMemberAvatar } from '../avatars'
 import logo from '../main/1_berty_picto.png'

js/packages/components/chat/MultiMemberSettings.tsx

@@ -5,16 +5,16 @@ import { useTranslation } from 'react-i18next'
 import ImagePicker, { ImageOrVideo } from 'react-native-image-crop-picker'
 import QRCode from 'react-native-qrcode-svg'
 
-import beapi from '@berty-tech/api'
-import { useStyles } from '@berty-tech/styles'
-import { ScreenFC, useNavigation } from '@berty-tech/navigation'
-import { Maybe, useMessengerClient, useThemeColor } from '@berty-tech/store'
-import { useConversationMembersDict, useConversation } from '@berty-tech/react-redux'
+import beapi from '@berty/api'
+import { useStyles } from '@berty/styles'
+import { ScreenFC, useNavigation } from '@berty/navigation'
+import { Maybe, useMessengerClient, useThemeColor } from '@berty/store'
+import { useConversationMembersDict, useConversation } from '@berty/react-redux'
 
 import { ButtonSetting, FactionButtonSetting } from '../shared-components/SettingsButtons'
 import logo from '../main/1_berty_picto.png'
 import { MemberAvatar, MultiMemberAvatar } from '../avatars'
-import EnableNotificationsButton from '@berty-tech/components/chat/EnableNotificationsButton'
+import EnableNotificationsButton from '@berty/components/chat/EnableNotificationsButton'
 
 const GroupChatSettingsHeader: React.FC<{ publicKey: Maybe<string> }> = ({ publicKey }) => {
 	const conv = useConversation(publicKey)

js/packages/components/chat/MultiMembersSettingsAddMembers.tsx

@@ -5,17 +5,12 @@ import { Icon, Layout } from '@ui-kitten/components'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Long from 'long'
 
-import beapi from '@berty-tech/api'
-import { ScreenFC } from '@berty-tech/navigation'
-import { useStyles } from '@berty-tech/styles'
-import { useMessengerClient, useThemeColor } from '@berty-tech/store'
-import { selectInvitationListMembers } from '@berty-tech/redux/reducers/groupCreationForm.reducer'
-import {
-	useAllContacts,
-	useAppDispatch,
-	useAppSelector,
-	useConversation,
-} from '@berty-tech/react-redux'
+import beapi from '@berty/api'
+import { ScreenFC } from '@berty/navigation'
+import { useStyles } from '@berty/styles'
+import { useMessengerClient, useThemeColor } from '@berty/store'
+import { selectInvitationListMembers } from '@berty/redux/reducers/groupCreationForm.reducer'
+import { useAllContacts, useAppDispatch, useAppSelector, useConversation } from '@berty/react-redux'
 
 import { FooterCreateGroup } from '../main/CreateGroupFooter'
 import { Header, MemberList } from '../main/CreateGroupAddMembers'