From 8150824b62f10cf069816d33b4b41e3782fb3b4d Mon Sep 17 00:00:00 2001 From: Godefroy Ponsinet Date: Mon, 14 Oct 2019 15:26:55 +0200 Subject: [PATCH] fix(js): build & run berty-app Signed-off-by: Godefroy Ponsinet --- js/.env.development | 1 + js/.gitignore | 2 + js/package.json | 3 +- js/packages/berty-app/.flowconfig | 34 +- js/packages/berty-app/.gitignore | 3 +- js/packages/berty-app/App.tsx | 106 +- js/packages/berty-app/Makefile | 69 +- js/packages/berty-app/android/.project | 17 - .../org.eclipse.buildship.core.prefs | 2 - .../berty-app/android/app/{BUCK => _BUCK} | 4 +- .../berty-app/android/app/build.gradle | 89 +- .../berty-app/android/app/debug.keystore | Bin 0 -> 2257 bytes .../android/app/src/main/AndroidManifest.xml | 2 +- .../src/main/java/com/berty/MainActivity.java | 15 - .../main/java/com/berty/MainApplication.java | 49 - .../java/tech/berty/app/MainActivity.java | 15 + .../java/tech/berty/app/MainApplication.java | 74 + .../app/src/main/res/values/strings.xml | 2 +- js/packages/berty-app/android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ios/Berty.xcodeproj/project.pbxproj | 998 +-- .../xcschemes/Berty-tvOS.xcscheme | 129 - js/packages/berty-app/ios/Berty/AppDelegate.h | 7 + js/packages/berty-app/ios/Berty/AppDelegate.m | 7 + .../AppIcon-Adhoc.appiconset/Contents.json | 68 - .../AppIcon-Adhoc.appiconset/Icon.png | Bin 65554 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_20pt@2x.png | Bin 1490 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_20pt@3x.png | Bin 2266 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_29pt.png | Bin 1340 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_29pt@2x.png | Bin 2180 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_29pt@3x.png | Bin 3239 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_40pt@2x.png | Bin 3005 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_40pt@3x.png | Bin 4435 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_60pt@2x.png | Bin 4435 -> 0 bytes .../AppIcon-Adhoc.appiconset/icon_60pt@3x.png | Bin 6854 -> 0 bytes .../AppIcon-Debug.appiconset/Contents.json | 68 - .../AppIcon-Debug.appiconset/Icon.png | Bin 70028 -> 0 bytes .../AppIcon-Debug.appiconset/icon_20pt@2x.png | Bin 1535 -> 0 bytes .../AppIcon-Debug.appiconset/icon_20pt@3x.png | Bin 2367 -> 0 bytes .../AppIcon-Debug.appiconset/icon_29pt.png | Bin 1366 -> 0 bytes .../AppIcon-Debug.appiconset/icon_29pt@2x.png | Bin 2300 -> 0 bytes .../AppIcon-Debug.appiconset/icon_29pt@3x.png | Bin 3401 -> 0 bytes .../AppIcon-Debug.appiconset/icon_40pt@2x.png | Bin 3121 -> 0 bytes .../AppIcon-Debug.appiconset/icon_40pt@3x.png | Bin 4693 -> 0 bytes .../AppIcon-Debug.appiconset/icon_60pt@2x.png | Bin 4693 -> 0 bytes .../AppIcon-Debug.appiconset/icon_60pt@3x.png | Bin 7357 -> 0 bytes .../AppIcon-House.appiconset/Contents.json | 68 - .../AppIcon-House.appiconset/Icon.png | Bin 66834 -> 0 bytes .../AppIcon-House.appiconset/icon_20pt@2x.png | Bin 1467 -> 0 bytes .../AppIcon-House.appiconset/icon_20pt@3x.png | Bin 2189 -> 0 bytes .../AppIcon-House.appiconset/icon_29pt.png | Bin 1307 -> 0 bytes .../AppIcon-House.appiconset/icon_29pt@2x.png | Bin 2142 -> 0 bytes .../AppIcon-House.appiconset/icon_29pt@3x.png | Bin 3148 -> 0 bytes .../AppIcon-House.appiconset/icon_40pt@2x.png | Bin 2908 -> 0 bytes .../AppIcon-House.appiconset/icon_40pt@3x.png | Bin 4350 -> 0 bytes .../AppIcon-House.appiconset/icon_60pt@2x.png | Bin 4350 -> 0 bytes .../AppIcon-House.appiconset/icon_60pt@3x.png | Bin 6854 -> 0 bytes .../AppIcon-Release.appiconset/Contents.json | 68 - .../AppIcon-Release.appiconset/Icon.png | Bin 36026 -> 0 bytes .../icon_20pt@2x.png | Bin 1432 -> 0 bytes .../icon_20pt@3x.png | Bin 1909 -> 0 bytes .../AppIcon-Release.appiconset/icon_29pt.png | Bin 1067 -> 0 bytes .../icon_29pt@2x.png | Bin 1853 -> 0 bytes .../icon_29pt@3x.png | Bin 2754 -> 0 bytes .../icon_40pt@2x.png | Bin 2524 -> 0 bytes .../icon_40pt@3x.png | Bin 3816 -> 0 bytes .../icon_60pt@2x.png | Bin 3816 -> 0 bytes .../icon_60pt@3x.png | Bin 5631 -> 0 bytes .../AppIcon.appiconset/Contents.json | 15 - .../ios/Berty/Images.xcassets/Contents.json | 2 +- .../SplashIcon.imageset/Contents.json | 23 - .../SplashIcon.imageset/berty_square@1x.png | Bin 8064 -> 0 bytes .../SplashIcon.imageset/berty_square@2x.png | Bin 16814 -> 0 bytes .../SplashIcon.imageset/berty_square@3x.png | Bin 26590 -> 0 bytes js/packages/berty-app/ios/Berty/Info.plist | 4 +- js/packages/berty-app/ios/Berty/main.m | 7 + .../berty-app/ios/BertyTests/BertyTests.m | 15 +- js/packages/berty-app/ios/Config.xcconfig | 4 +- js/packages/berty-app/ios/Podfile | 26 +- js/packages/berty-app/ios/Podfile.lock | 329 +- js/packages/berty-app/metro.config.js | 30 +- js/packages/berty-app/package-lock.json | 6515 +++++++++++++++++ js/packages/berty-app/package.json | 8 +- .../berty-app/patch/react.gradle.patch | 16 + .../react-native-example/android/.classpath | 6 + .../react-native-example/android/.project | 8 +- .../org.eclipse.buildship.core.prefs | 2 +- .../react-native-example/android/build.gradle | 5 +- .../berty/example/BertyExamplePackage.java | 1 - js/yarn.lock | 49 +- 90 files changed, 7584 insertions(+), 1387 deletions(-) create mode 100644 js/.env.development delete mode 100644 js/packages/berty-app/android/.project delete mode 100644 js/packages/berty-app/android/.settings/org.eclipse.buildship.core.prefs rename js/packages/berty-app/android/app/{BUCK => _BUCK} (95%) create mode 100644 js/packages/berty-app/android/app/debug.keystore delete mode 100644 js/packages/berty-app/android/app/src/main/java/com/berty/MainActivity.java delete mode 100644 js/packages/berty-app/android/app/src/main/java/com/berty/MainApplication.java create mode 100644 js/packages/berty-app/android/app/src/main/java/tech/berty/app/MainActivity.java create mode 100644 js/packages/berty-app/android/app/src/main/java/tech/berty/app/MainApplication.java delete mode 100644 js/packages/berty-app/ios/Berty.xcodeproj/xcshareddata/xcschemes/Berty-tvOS.xcscheme delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/Contents.json delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/Icon.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_20pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_20pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_29pt.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_29pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_29pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_40pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_40pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_60pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Adhoc.appiconset/icon_60pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/Contents.json delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/Icon.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_20pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_20pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_29pt.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_29pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_29pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_40pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_40pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_60pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Debug.appiconset/icon_60pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/Contents.json delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/Icon.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_20pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_20pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_29pt.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_29pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_29pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_40pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_40pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_60pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-House.appiconset/icon_60pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/Contents.json delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/Icon.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_20pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_20pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_29pt.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_29pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_29pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_40pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_40pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_60pt@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/AppIcon-Release.appiconset/icon_60pt@3x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/SplashIcon.imageset/Contents.json delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/SplashIcon.imageset/berty_square@1x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/SplashIcon.imageset/berty_square@2x.png delete mode 100644 js/packages/berty-app/ios/Berty/Images.xcassets/SplashIcon.imageset/berty_square@3x.png create mode 100644 js/packages/berty-app/package-lock.json create mode 100644 js/packages/berty-app/patch/react.gradle.patch create mode 100644 js/packages/react-native-example/android/.classpath diff --git a/js/.env.development b/js/.env.development new file mode 100644 index 0000000000..c0d6652113 --- /dev/null +++ b/js/.env.development @@ -0,0 +1 @@ +NODE_ENV=development diff --git a/js/.gitignore b/js/.gitignore index 513c38c273..f821b46a66 100644 --- a/js/.gitignore +++ b/js/.gitignore @@ -67,6 +67,7 @@ lerna-debug.log buck-out/ \.buckd/ *.keystore +!debug.keystore # Firebase google-services.json @@ -130,6 +131,7 @@ jsconfig.json # Environment .env.* +!.env.development # Fix code factor __generated__ exclude patterns __generated__/ diff --git a/js/package.json b/js/package.json index 55379453f3..9200377126 100644 --- a/js/package.json +++ b/js/package.json @@ -29,7 +29,8 @@ "nohoist": [ "**/react-native", "**/react-native-*", - "**/@react-native-community/*" + "**/@react-native-community/*", + "**/hermes-engine" ] }, "dependencies": { diff --git a/js/packages/berty-app/.flowconfig b/js/packages/berty-app/.flowconfig index 1319ea1278..4afc766a29 100644 --- a/js/packages/berty-app/.flowconfig +++ b/js/packages/berty-app/.flowconfig @@ -5,14 +5,6 @@ ; Ignore "BUCK" generated dirs /\.buckd/ -; Ignore unexpected extra "@providesModule" -.*/node_modules/.*/node_modules/fbjs/.* - -; Ignore duplicate module providers -; For RN Apps installed via npm, "Libraries" folder is inside -; "node_modules/react-native" but in the source repo it is in the root -node_modules/react-native/Libraries/react-native/React.js - ; Ignore polyfills node_modules/react-native/Libraries/polyfills/.* @@ -21,7 +13,7 @@ node_modules/react-native/Libraries/polyfills/.* node_modules/warning/.* ; Flow doesn't support platforms -.*/Libraries/Utilities/HMRLoadingView.js +.*/Libraries/Utilities/LoadingView.js [untyped] .*/node_modules/@react-native-community/cli/.*/.* @@ -42,27 +34,11 @@ module.file_ext=.js module.file_ext=.json module.file_ext=.ios.js -module.system=haste -module.system.haste.use_name_reducers=true -# get basename -module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1' -# strip .js or .js.flow suffix -module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1' -# strip .ios suffix -module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1' -module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1' -module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1' -module.system.haste.paths.blacklist=.*/__tests__/.* -module.system.haste.paths.blacklist=.*/__mocks__/.* -module.system.haste.paths.whitelist=/node_modules/react-native/Libraries/.* -module.system.haste.paths.whitelist=/node_modules/react-native/RNTester/.* -module.system.haste.paths.whitelist=/node_modules/react-native/IntegrationTests/.* -module.system.haste.paths.blacklist=/node_modules/react-native/Libraries/react-native/react-native-implementation.js -module.system.haste.paths.blacklist=/node_modules/react-native/Libraries/Animated/src/polyfills/.* - munge_underscores=true -module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub' +module.name_mapper='^react-native$' -> '/node_modules/react-native/Libraries/react-native/react-native-implementation' +module.name_mapper='^react-native/\(.*\)$' -> '/node_modules/react-native/\1' +module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/node_modules/react-native/Libraries/Image/RelativeImageStub' suppress_type=$FlowIssue suppress_type=$FlowFixMe @@ -96,4 +72,4 @@ untyped-import untyped-type-import [version] -^0.98.0 +^0.105.0 diff --git a/js/packages/berty-app/.gitignore b/js/packages/berty-app/.gitignore index f4ea7d61df..d71aa9d9f8 100644 --- a/js/packages/berty-app/.gitignore +++ b/js/packages/berty-app/.gitignore @@ -20,7 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate -project.xcworkspace +xcshareddata # Android/IntelliJ # @@ -40,6 +40,7 @@ yarn-error.log buck-out/ \.buckd/ *.keystore +!debug.keystore # fastlane # diff --git a/js/packages/berty-app/App.tsx b/js/packages/berty-app/App.tsx index bf496637e1..d338bb145f 100644 --- a/js/packages/berty-app/App.tsx +++ b/js/packages/berty-app/App.tsx @@ -25,22 +25,22 @@ import { ReloadInstructions, } from 'react-native/Libraries/NewAppScreen' -import BertyCore from '@berty-tech/react-native-core' +// import BertyCore from '@berty-tech/react-native-core' +// +// const startDaemon = (): void => { +// console.log('BertyCore:', BertyCore) +// if (BertyCore.invoke) { +// const promise = BertyCore.invoke('/berty.daemon.Daemon/Start', '') +// console.log('BertyCore.invoke("/berty.daemon.Daemon/Start", "")', promise) +// if (promise && promise.then) { +// promise.then((result: any) => console.log('.then():', result)) +// } +// } +// } -const startDaemon = (): void => { - console.log('BertyCore:', BertyCore) - if (BertyCore.invoke) { - const promise = BertyCore.invoke('/berty.daemon.Daemon/Start', '') - console.log('BertyCore.invoke("/berty.daemon.Daemon/Start", "")', promise) - if (promise && promise.then) { - promise.then((result: any) => console.log('.then():', result)) - } - } -} - -const DebugStartDaemonButton = () => ( -