mobile: fix build errors

apps/mobile/app/screens/editor/tiptap/use-editor-events.tsx

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable @typescript-eslint/no-var-requires */
 import { ItemReference } from "@notesnook/core";
 import type { Attachment } from "@notesnook/editor";
-import { getDefaultPresets } from "@notesnook/editor/dist/esm/toolbar/tool-definitions";
+import { getDefaultPresets } from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
 import Clipboard from "@react-native-clipboard/clipboard";
 import React, { useCallback, useEffect, useRef } from "react";
 import {

apps/mobile/app/screens/settings/editor/toolbar-definition.ts

@@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Icons } from "@notesnook/editor/dist/esm/toolbar/icons";
+import { Icons } from "@notesnook/editor/dist/cjs/toolbar/icons";
 import { ToolbarGroupDefinition } from "@notesnook/editor";
 import {
   getAllTools,
   getDefaultPresets
-} from "@notesnook/editor/dist/esm/toolbar/tool-definitions";
+} from "@notesnook/editor/dist/cjs/toolbar/tool-definitions";
 import { ToolId } from "@notesnook/editor";
 
 export const tools = getAllTools() as any;

apps/mobile/app/screens/settings/picker/pickers.jsx

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { DATE_FORMATS, TIME_FORMATS } from "@notesnook/core";
-import { getFontById, getFonts } from "@notesnook/editor/dist/esm/utils/font";
+import { getFontById, getFonts } from "@notesnook/editor/dist/cjs/utils/font";
 import dayjs from "dayjs";
 import { createSettingsPicker } from ".";
 import { db } from "../../../common/database";

apps/mobile/native/android/app/build.gradle

@@ -164,10 +164,7 @@ android {
     }
 
      packagingOptions {
-      pickFirst 'lib/x86/libc++_shared.so'
+      pickFirst '**/libc++_shared.so'
-      pickFirst 'lib/x86_64/libc++_shared.so'
-      pickFirst 'lib/armeabi-v7a/libc++_shared.so'
-      pickFirst 'lib/arm64-v8a/libc++_shared.so'
       jniLibs {
             useLegacyPackaging isBuildingAAB == false
     }

apps/mobile/native/android/gradle.properties

@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-org.gradle.configuration-cache=true
+# org.gradle.configuration-cache=true
 
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK

apps/mobile/native/ios/BetterTrigram.xcframework/Info.plist

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>better-trigram.dylib</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>better-trigram.dylib</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

apps/mobile/native/ios/Notesnook.xcodeproj/project.pbxproj

@@ -26,8 +26,6 @@
 		656992802C5754F10041CD41 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BE2B6838EB0079FF37 /* OpenSans-Regular.ttf */; };
 		656992812C5754F10041CD41 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6517B7BF2B6838EB0079FF37 /* OpenSans-SemiBold.ttf */; };
 		6593E4A3281C345400492C50 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593E4A2281C345400492C50 /* AppDelegate.mm */; };
-		6594DDF32CD8BFE8007F5EC2 /* BetterTrigram.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6594DDF22CD8BFE8007F5EC2 /* BetterTrigram.xcframework */; };
-		6594DDF42CD8BFE9007F5EC2 /* BetterTrigram.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6594DDF22CD8BFE8007F5EC2 /* BetterTrigram.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		659BE46725E11A5100E05671 /* notesnook-text.png in Resources */ = {isa = PBXBuildFile; fileRef = 659BE46625E11A5100E05671 /* notesnook-text.png */; };
 		65AA857925E6DDEC00772A01 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857825E6DDEC00772A01 /* WidgetKit.framework */; };
 		65AA857B25E6DDEC00772A01 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AA857A25E6DDEC00772A01 /* SwiftUI.framework */; };
@@ -81,17 +79,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		6594DDF52CD8BFE9007F5EC2 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				6594DDF42CD8BFE9007F5EC2 /* BetterTrigram.xcframework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		65A7F34B255687E600699170 /* Embed App Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -190,7 +177,6 @@
 			files = (
 				2B3F87EC6B2264CD8ABA5DA8 /* libPods-Notesnook.a in Frameworks */,
 				6515C42F2580AA3000E83E39 /* StoreKit.framework in Frameworks */,
-				6594DDF32CD8BFE8007F5EC2 /* BetterTrigram.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -414,7 +400,6 @@
 				240525450DF9ABA0F332B52E /* [CP] Copy Pods Resources */,
 				65A7F34B255687E600699170 /* Embed App Extensions */,
 				48C834D962D612F18A0388B3 /* [CP] Embed Pods Frameworks */,
-				6594DDF52CD8BFE9007F5EC2 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

apps/mobile/native/ios/Podfile

@@ -113,7 +113,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     if target.name == "react-native-quick-sqlite" then
       target.build_configurations.each do |config|
-        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = 'SQLITE_ENABLE_FTS5=1 SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT=1 HAVE_CIPHER_AES_128_CBC=0 HAVE_CIPHER_AES_256_CBC=0 HAVE_CIPHER_SQLCIPHER=0 HAVE_CIPHER_RC4=0 HAVE_CIPHER_CHACHA20=1 SQLITE_OMIT_PROGRESS_CALLBACK=1 SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_DEPRECATED=1 SQLITE_LIKE_DOESNT_MATCH_BLOBS=1 SQLITE_DQS=0 SQLITE_DEFAULT_MEMSTATUS=0 SQLITE_USE_ALLOCA=1'
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = 'SQLITE_CORE=1 SQLITE_ENABLE_FTS5=1 SQLITE3MC_OMIT_AES_HARDWARE_SUPPORT=1 HAVE_CIPHER_AES_128_CBC=0 HAVE_CIPHER_AES_256_CBC=0 HAVE_CIPHER_SQLCIPHER=0 HAVE_CIPHER_RC4=0 HAVE_CIPHER_CHACHA20=1 SQLITE_OMIT_PROGRESS_CALLBACK=1 SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_DEPRECATED=1 SQLITE_LIKE_DOESNT_MATCH_BLOBS=1 SQLITE_DQS=0 SQLITE_DEFAULT_MEMSTATUS=0 SQLITE_USE_ALLOCA=1'
       end
     end
   end

apps/mobile/native/ios/Podfile.lock

@@ -970,8 +970,6 @@ PODS:
     - React
   - react-native-background-actions (2.6.7):
     - React-Core
-  - react-native-begin-background-task (0.1.0):
-    - React
   - react-native-blob-util (0.18.3):
     - React-Core
   - react-native-config (1.5.1):
@@ -983,7 +981,7 @@ PODS:
   - react-native-document-picker (7.1.3):
     - React-Core
   - react-native-fingerprint-scanner (5.0.0):
-    - React-Core
+    - React
   - react-native-get-random-values (1.9.0):
     - React-Core
   - react-native-gzip (1.1.0):
@@ -1019,9 +1017,9 @@ PODS:
   - react-native-screenguard (1.0.0):
     - React-Core
     - SDWebImage (~> 5.11.1)
-  - react-native-share-extension (3.0.0):
+  - react-native-share-extension (2.6.0):
     - React
-  - react-native-sodium (1.5.4):
+  - react-native-sodium (1.5.6):
     - React
   - react-native-theme-switch-animation (0.6.0):
     - DoubleConversion
@@ -1305,7 +1303,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.2.9):
     - React-Core
-  - RNDateTimePicker (6.6.0):
+  - RNDateTimePicker (8.2.0):
     - React-Core
   - RNDeviceInfo (8.7.1):
     - React-Core
@@ -1488,7 +1486,6 @@ DEPENDENCIES:
   - React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`)
   - react-native-actions-shortcuts (from `../../node_modules/react-native-actions-shortcuts`)
   - react-native-background-actions (from `../../node_modules/react-native-background-actions`)
-  - react-native-begin-background-task (from `../../node_modules/react-native-begin-background-task`)
   - react-native-blob-util (from `../../node_modules/react-native-blob-util`)
   - react-native-config (from `../../node_modules/react-native-config`)
   - react-native-date-picker (from `../../node_modules/react-native-date-picker`)
@@ -1645,8 +1642,6 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/react-native-actions-shortcuts"
   react-native-background-actions:
     :path: "../../node_modules/react-native-background-actions"
-  react-native-begin-background-task:
-    :path: "../../node_modules/react-native-begin-background-task"
   react-native-blob-util:
     :path: "../../node_modules/react-native-blob-util"
   react-native-config:
@@ -1838,12 +1833,11 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 6c1cacdbf40b531f549eba249e531a7d0bfd8e7f
   react-native-actions-shortcuts: 5d9cf0c9c308333dfcc1e05c3f9afa8c428e2533
   react-native-background-actions: 2c251c986f23347f9c1722f05fd296938f60edb1
-  react-native-begin-background-task: 3b889e07458afc5822a7277cf9cbc7cd077e39ee
   react-native-blob-util: 2d36383bb52c15c5451be81cb7ddf22bc34a12a6
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-date-picker: 93e43b3084cea595b4d68b1405d6d99849663bd6
   react-native-document-picker: ec07866a30707f23660c0f3ae591d669d3e89096
-  react-native-fingerprint-scanner: be63e626b31fb951780a5fac5328b065a61a3d6e
+  react-native-fingerprint-scanner: 3e8c46641b5751a31f45e66789d4b6f342be5e6d
   react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
   react-native-gzip: c5e87ee9e359f02350e3a2ee52eb35eddc398868
   react-native-html-to-pdf-lite: 21bfb169bf4cbcd7bec9f736975ee1b3f5292d4a
@@ -1855,11 +1849,11 @@ SPEC CHECKSUMS:
   react-native-notification-sounds: da78c828fe1bcbb92d8b505d5261890ed315ff39
   react-native-orientation: f1caf84d65f1a4fd4511a18f2b924e634ad7a628
   react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
-  react-native-quick-sqlite: e0e23b749382a85e4b57146f753de737a6c3a9e1
+  react-native-quick-sqlite: 18e1367c34faac90e37f6eb3e78c196e9b674b5d
   react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
   react-native-screenguard: 8b36a3df84c76cd2b82c477f71c26fa1c8cc14a0
-  react-native-share-extension: faed334b1ddf165f1e576fcabd3dc1c9e748bfa9
+  react-native-share-extension: 25437eb1039f7409be6e80a7edf8d02b42e1dc99
-  react-native-sodium: 955bb0dc3ea05f8ea06d5e96cb89d1be7b5d7681
+  react-native-sodium: 605c1523ec8ff5fbff5e9e7769bbacceb571a3c6
   react-native-theme-switch-animation: d3eb50365a3829ce5572628888fa514752703f61
   react-native-webview: 553abd09f58e340fdc7746c9e2ae096839e99911
   React-nativeconfig: ba9a2e54e2f0882cf7882698825052793ed4c851
@@ -1890,7 +1884,7 @@ SPEC CHECKSUMS:
   RNCCheckbox: 43bcc6493611468af0e19f19f029dab3da8561c4
   RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
   RNCMaskedView: 949696f25ec596bfc697fc88e6f95cf0c79669b6
-  RNDateTimePicker: 818672afa85519722533d017b832ed09539d9ddb
+  RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14
   RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
   RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3
   RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
@@ -1907,7 +1901,7 @@ SPEC CHECKSUMS:
   RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c
   RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105
   RNTooltips: 5424d4bf0b3d441104127943b1115cc7f0616b1f
-  RNZipArchive: 68a0c6db4b1c103f846f1559622050df254a3ade
+  RNZipArchive: 9d90367b1573903b5561a8c0b911e5cc12626e74
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SexyTooltip: 5c9b4dec52bfb317938cb0488efd9da3717bb6fd
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
@@ -1917,6 +1911,6 @@ SPEC CHECKSUMS:
   toolbar-android: 2a73856e98b750d7e71ce4644d3f41cc98211719
   Yoga: 2246eea72aaf1b816a68a35e6e4b74563653ae09
 
-PODFILE CHECKSUM: 98f600b3236e314680588e77819982573fb4d9f7
+PODFILE CHECKSUM: aa07aca16c1d92394d8ce12f2c5fcaa8a3ae4997
 
 COCOAPODS: 1.15.2

apps/mobile/native/package.json

@@ -14,7 +14,6 @@
     "@callstack/repack": "^4.1.1",
     "@react-native-clipboard/clipboard": "^1.9.0",
     "@react-native-community/checkbox": "^0.5.8",
-    "@react-native-community/datetimepicker": "6.6.0",
     "@react-native-community/netinfo": "^9.3.7",
     "@react-native-community/toolbar-android": "^0.2.1",
     "@react-native-masked-view/masked-view": "^0.2.6",
@@ -50,7 +49,6 @@
     "react-native-iap": "12.15.1",
     "react-native-in-app-review": "4.3.3",
     "react-native-keychain": "4.0.5",
-    "react-native-mmkv-storage": "^0.10.2",
     "react-native-modal-datetime-picker": "14.0.0",
     "react-native-navigation-bar-color": "2.0.2",
     "react-native-notification-sounds": "0.5.5",
@@ -74,7 +72,9 @@
     "@formatjs/intl-pluralrules": "5.2.14",
     "detox": "^20.27.6",
     "@ammarahmed/react-native-share-extension": "^2.6.0",
-    "@ammarahmed/react-native-sodium": "1.5.6"
+    "@ammarahmed/react-native-sodium": "1.5.6",
+    "react-native-mmkv-storage": "^0.10.2",
+    "@react-native-community/datetimepicker": "^8.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

apps/mobile/native/polyfills/console-time.js

@@ -2,7 +2,7 @@ const PerformanceNow =
   (global.performance && global.performance.now) ||
   global.performanceNow ||
   global.nativePerformanceNow || (() => { try {
-    var now = require('fbjs/lib/performanceNow')
+    var now = __DEV__ ? require('fbjs/lib/performanceNow') : () => Date.now()
   } finally { return now }})();
 
 const DEFAULT_LABEL = 'default';

apps/mobile/native/webpack.config.js

@@ -217,6 +217,7 @@ module.exports = (env) => {
             /node_modules(.*[/\\])+@tanstack[/\\]react-query/,
             /node_modules(.*[/\\])+@trpc[/\\]react-query/,
             /node_modules(.*[/\\])+katex/,
+            /node_modules(.*[/\\])+mime/,
             /node_modules(.*[/\\])+@notesnook[/\\]core/,
             /node_modules(.*[/\\])+whatwg-url-without-unicode/,
             /node_modules(.*[/\\])+whatwg-url/,

apps/mobile/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@notesnook/mobile",
-  "version": "3.0.18",
+  "version": "3.0.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@notesnook/mobile",
-      "version": "3.0.18",
+      "version": "3.0.21",
       "hasInstallScript": true,
       "license": "GPL-3.0-or-later",
       "workspaces": [
@@ -22,6 +22,7 @@
         "@notesnook/logger": "file:../../packages/logger",
         "@notesnook/theme": "file:../../packages/theme",
         "@notesnook/themes-server": "file:../../servers/themes",
+        "@react-native-community/datetimepicker": "^8.2.0",
         "diffblazer": "^1.0.1",
         "react": "18.2.0",
         "react-native": "0.74.5",
@@ -29010,7 +29011,6 @@
         "@formatjs/intl-pluralrules": "5.2.14",
         "@react-native-clipboard/clipboard": "^1.9.0",
         "@react-native-community/checkbox": "^0.5.8",
-        "@react-native-community/datetimepicker": "6.6.0",
         "@react-native-community/netinfo": "^9.3.7",
         "@react-native-community/toolbar-android": "^0.2.1",
         "@react-native-masked-view/masked-view": "^0.2.6",
@@ -33296,10 +33296,25 @@
       }
     },
     "node_modules/@react-native-community/datetimepicker": {
-      "version": "6.6.0",
+      "version": "8.2.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@react-native-community/datetimepicker/-/datetimepicker-8.2.0.tgz",
+      "integrity": "sha512-qrUPhiBvKGuG9Y+vOqsc56RPFcHa1SU2qbAMT0hfGkoFIj3FodE0VuPVrEa8fgy7kcD5NQmkZIKgHOBLV0+hWg==",
       "dependencies": {
         "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "expo": ">=50.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-windows": "*"
+      },
+      "peerDependenciesMeta": {
+        "expo": {
+          "optional": true
+        },
+        "react-native-windows": {
+          "optional": true
+        }
       }
     },
     "node_modules/@react-native-community/netinfo": {
@@ -40217,11 +40232,6 @@
         "regenerator-runtime": "^0.13.3"
       }
     },
-    "node_modules/jimp/node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
     "node_modules/joi": {
       "version": "17.9.2",
       "license": "BSD-3-Clause",

apps/mobile/package.json

@@ -46,7 +46,6 @@
     "diffblazer": "^1.0.1",
     "react": "18.2.0",
     "react-native": "0.74.5",
-    "react-native-actions-sheet": "^0.9.7",
+    "react-native-actions-sheet": "^0.9.7"
-    "react-native-mmkv-storage": "^0.10.2"
   }
 }

apps/mobile/patches/react-native-zip-archive+6.0.9.patch

@@ -0,0 +1,18 @@
+diff --git a/node_modules/react-native-zip-archive/RNZipArchive.podspec b/node_modules/react-native-zip-archive/RNZipArchive.podspec
+index 8eebcdc..81c0ed5 100644
+--- a/node_modules/react-native-zip-archive/RNZipArchive.podspec
++++ b/node_modules/react-native-zip-archive/RNZipArchive.podspec
+@@ -10,12 +10,11 @@ Pod::Spec.new do |s|
+   s.license        = package['license']
+   s.homepage       = 'https://github.com/mockingbot/react-native-zip-archive'
+   s.source         = { :git => 'https://github.com/mockingbot/react-native-zip-archive.git', :tag => "#{s.version}"}
+-  s.platform       = :ios, '9.0'
++  s.platform       = :ios, '10.0'
+   s.preserve_paths = '*.js'
+ 
+   s.dependency 'React-Core'
+   s.dependency 'SSZipArchive', '~>2.2'
+-  s.compiler_flags = '-GCC_PREPROCESSOR_DEFINITIONS="HAVE_INTTYPES_H HAVE_PKCRYPT HAVE_STDINT_H HAVE_WZAES HAVE_ZLIB MZ_ZIP_NO_SIGNING $(inherited)"'
+ 
+   s.subspec 'Core' do |ss|
+     ss.source_files = 'ios/*.{h,m}'