build(deps): update dependencies

- cavy patch no longer needed, upstream integrated change via PR from here - note that typedoc is *not* updated past v19, it requires a forward-port - de-lint all the files Note that a forced resolution of newer versions of the eslint/typescript integration were necessary, see: facebook/react-native#31490
invertase · Jun 14, 2021 · 0b1e3af · 0b1e3af
1 parent 035e455
commit 0b1e3af
Show file tree

Hide file tree

Showing 12 changed files with 4,001 additions and 3,555 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,7 +4,6 @@ module.exports = {
     '@react-native-community',
     'plugin:react/recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
-    'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
     'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
   ],
   parserOptions: {

diff --git a/package.json b/package.json
@@ -11,12 +11,12 @@
     "build:all:clean": "rimraf android/build && rimraf android/.gradle && rimraf ios/build && lerna run build:clean",
     "build:rn": "cd packages/react-native && yarn build",
     "build:rn:watch": "cd packages/react-native && yarn build:watch",
-    "format:all":  "yarn format:core && yarn format:rn",
-    "format:rn":  "yarn format:rn:android && yarn format:rn:ios",
-    "format:rn:android":  "cd packages/react-native/android && yarn format:android",
-    "format:rn:ios":  "cd packages/react-native/ios && yarn format:ios",
+    "format:all": "yarn format:core && yarn format:rn",
+    "format:rn": "yarn format:rn:android && yarn format:rn:ios",
+    "format:rn:android": "cd packages/react-native/android && yarn format:android",
+    "format:rn:ios": "cd packages/react-native/ios && yarn format:ios",
     "format:core": "yarn build:core:android && yarn build:core:ios",
-    "format:core:android":  "cd android && yarn format:android",
+    "format:core:android": "cd android && yarn format:android",
     "format:core:ios": "cd ios && yarn format:ios",
     "format:android": "google-java-format --replace -i $(find . -type f -name \"*.java\")",
     "format:ios": "npx clang-format -i --glob=\"*/**/*.{h,cpp,m,mm}\" --style=Google",
@@ -42,19 +42,23 @@
   },
   "devDependencies": {
     "@react-native-community/eslint-config": "^2.0.0",
-    "@types/node": "^14.14.18",
-    "@typescript-eslint/eslint-plugin": "^4.11.1",
-    "@typescript-eslint/parser": "^4.11.1",
-    "eslint": "^7.16.0",
-    "eslint-config-prettier": "^7.1.0",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.22.0",
-    "lerna": "^3.22.1",
-    "prettier": "^2.2.1",
+    "@types/node": "^15.12.2",
+    "@typescript-eslint/eslint-plugin": "^4.26.1",
+    "@typescript-eslint/parser": "^4.26.1",
+    "clang-format": "^1.5.0",
+    "eslint": "^7.28.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-react": "^7.24.0",
+    "lerna": "^4.0.0",
+    "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
-    "typedoc": "^0.19.2",
-    "typescript": "^4.1.3",
-    "clang-format": "^1.5.0"
+    "typedoc": "^0.19",
+    "typescript": "^4.3.2"
+  },
+  "resolutions": {
+    "@typescript-eslint/eslint-plugin": "^4.26.1",
+    "@typescript-eslint/parser": "^4.26.1"
   },
   "lint-staged": {
     "packages/**/*.js": [

diff --git a/tests_react_native/__tests__/NotifeeApiModule.test.ts b/tests_react_native/__tests__/NotifeeApiModule.test.ts
@@ -26,7 +26,7 @@ describe('Notifee Api Module', () => {
     expect(NotifeeApiModule).toBeDefined();
   });
   test('Constructor', () => {
-    expect(apiModule).not.toBeNull;
+    expect(apiModule).not.toBeNull();
   });
 
   test('getTriggerNotificationIds', async () => {

diff --git a/tests_react_native/__tests__/testSetup.ts b/tests_react_native/__tests__/testSetup.ts
@@ -1,6 +1,6 @@
 import * as utils from '@notifee/react-native/src/utils';
 
-export const setPlatform = (platform: string) => {
+export const setPlatform = (platform: string): void => {
   Object.defineProperty(utils, 'isIOS', { value: platform === 'ios' });
   Object.defineProperty(utils, 'isAndroid', { value: platform === 'android' });
 };
diff --git a/tests_react_native/example/videoApp.tsx b/tests_react_native/example/videoApp.tsx
@@ -97,8 +97,7 @@ function Root(): any {
                   attachments: [
                     {
                       id: 'image',
-                      url:
-                        'https://github.githubassets.com/images/modules/open_graph/github-mark.png',
+                      url: 'https://github.githubassets.com/images/modules/open_graph/github-mark.png',
                       thumbnailHidden: false,
                       thumbnailClippingRect: {
                         x: 0.1,

diff --git a/tests_react_native/example/videos.ts b/tests_react_native/example/videos.ts
@@ -59,8 +59,7 @@ export default {
   'android-text-styling': {
     title: '<p style="color: #4caf50;"><b>Styled HTMLTitle</span></p></b></p> &#128576;',
     subtitle: '&#129395;',
-    body:
-      'The <p style="text-decoration: line-through">body can</p> also be <p style="color: #ffffff; background-color: #9c27b0"><i>styled too</i></p> &#127881;!',
+    body: 'The <p style="text-decoration: line-through">body can</p> also be <p style="color: #ffffff; background-color: #9c27b0"><i>styled too</i></p> &#127881;!',
     android: {
       channelId: 'default',
       color: '#4caf50',

diff --git a/tests_react_native/ios/Podfile.lock b/tests_react_native/ios/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - boost-for-react-native (1.63.0)
-  - CavyNativeReporter (0.1.1):
+  - CavyNativeReporter (0.1.3):
     - React-Core
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
@@ -11,37 +11,32 @@ PODS:
     - React-Core (= 0.63.4)
     - React-jsi (= 0.63.4)
     - ReactCommon/turbomodule/core (= 0.63.4)
-  - Firebase/CoreOnly (7.3.0):
-    - FirebaseCore (= 7.3.0)
-  - Firebase/Messaging (7.3.0):
+  - Firebase/CoreOnly (8.1.1):
+    - FirebaseCore (= 8.1.0)
+  - Firebase/Messaging (8.1.1):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 7.3.0)
-  - FirebaseCore (7.3.0):
-    - FirebaseCoreDiagnostics (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.3.0):
-    - GoogleDataTransport (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-    - nanopb (~> 2.30906.0)
-  - FirebaseInstallations (7.3.0):
-    - FirebaseCore (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
+    - FirebaseMessaging (~> 8.1.0)
+  - FirebaseCore (8.1.0):
+    - FirebaseCoreDiagnostics (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/Logger (~> 7.4)
+  - FirebaseCoreDiagnostics (8.1.0):
+    - GoogleDataTransport (~> 9.0)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/Logger (~> 7.4)
+    - nanopb (~> 2.30908.0)
+  - FirebaseInstallations (8.1.0):
+    - FirebaseCore (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/UserDefaults (~> 7.4)
     - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (7.3.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstallations (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
-  - FirebaseMessaging (7.3.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstanceID (~> 7.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Reachability (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
+  - FirebaseMessaging (8.1.0):
+    - FirebaseCore (~> 8.0)
+    - FirebaseInstallations (~> 8.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.4)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/Reachability (~> 7.4)
+    - GoogleUtilities/UserDefaults (~> 7.4)
   - Folly (2020.01.13.00):
     - boost-for-react-native
     - DoubleConversion
@@ -52,30 +47,32 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - GoogleDataTransport (8.1.0):
-    - nanopb (~> 2.30906.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.1.1):
+  - GoogleDataTransport (9.0.1):
+    - GoogleUtilities/Environment (~> 7.2)
+    - nanopb (~> 2.30908.0)
+    - PromisesObjC (~> 1.2)
+  - GoogleUtilities/AppDelegateSwizzler (7.4.1):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.1.1):
+  - GoogleUtilities/Environment (7.4.1):
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.1.1):
+  - GoogleUtilities/Logger (7.4.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.1.1):
+  - GoogleUtilities/Network (7.4.1):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.1.1)"
-  - GoogleUtilities/Reachability (7.1.1):
+  - "GoogleUtilities/NSData+zlib (7.4.1)"
+  - GoogleUtilities/Reachability (7.4.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.1.1):
+  - GoogleUtilities/UserDefaults (7.4.1):
     - GoogleUtilities/Logger
-  - nanopb (2.30906.0):
-    - nanopb/decode (= 2.30906.0)
-    - nanopb/encode (= 2.30906.0)
-  - nanopb/decode (2.30906.0)
-  - nanopb/encode (2.30906.0)
+  - nanopb (2.30908.0):
+    - nanopb/decode (= 2.30908.0)
+    - nanopb/encode (= 2.30908.0)
+  - nanopb/decode (2.30908.0)
+  - nanopb/encode (2.30908.0)
   - NotifeeCore (1.0.0)
   - PromisesObjC (1.2.12)
   - RCTRequired (0.63.4)
@@ -304,14 +301,14 @@ PODS:
     - React-Core (= 0.63.4)
     - React-cxxreact (= 0.63.4)
     - React-jsi (= 0.63.4)
-  - RNFBApp (10.4.0):
-    - Firebase/CoreOnly (~> 7.3.0)
+  - RNFBApp (12.1.0):
+    - Firebase/CoreOnly (= 8.1.1)
     - React-Core
-  - RNFBMessaging (10.4.1):
-    - Firebase/Messaging (~> 7.3.0)
+  - RNFBMessaging (12.1.0):
+    - Firebase/Messaging (= 8.1.1)
     - React-Core
     - RNFBApp
-  - RNNotifee (1.6.0):
+  - RNNotifee (1.8.1):
     - NotifeeCore
     - React-Core
   - Yoga (1.14.0)
@@ -358,7 +355,6 @@ SPEC REPOS:
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseInstallations
-    - FirebaseInstanceID
     - FirebaseMessaging
     - GoogleDataTransport
     - GoogleUtilities
@@ -431,21 +427,20 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  CavyNativeReporter: c42aaf35b46187315bba8d12780431566b097aed
+  CavyNativeReporter: b0aff4d3057c10cb6d57218634b66385364fe4fd
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
-  Firebase: 26223c695fe322633274198cb19dca8cb7e54416
-  FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
-  FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
-  FirebaseInstallations: 971df89b48ae5ee4cc2bf6935f3857a525d28550
-  FirebaseInstanceID: 5ccdee6a84e6b4bb5316de0a8cd88bc749ba490d
-  FirebaseMessaging: 68d1bcb14880189558a8ae57167abe0b7e417232
+  Firebase: 4bb49ae87756034cef870fa3c4006235eb46f475
+  FirebaseCore: 389c4ce9a7cce4a7e25eb22326b4bee0050557b2
+  FirebaseCoreDiagnostics: 3e249cee3de5c5f9cfd6cc2a19997231286fec11
+  FirebaseInstallations: 7f31798a8198c354eadcb87176d2090b62edc187
+  FirebaseMessaging: c8871b0907dcf4e76de81241eb6a62be6d657d2f
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
-  GoogleUtilities: 3dc4ff0d5e4840e2fa8eef0889620e8c33d4218c
-  nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
+  GoogleDataTransport: 04c3e9a480bbcaa2ec3f5d27f1cdeb6a92f20c8d
+  GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
+  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   NotifeeCore: 09a3968ccc16d2ef774f65a5bc1d8e4ea42e828a
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
   RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
@@ -468,9 +463,9 @@ SPEC CHECKSUMS:
   React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
-  RNFBApp: a9af8372c9c2b2135ffa78817fd2d8baf3ee632e
-  RNFBMessaging: 643ec4102ee0d780f928718c2632bb1e90487f04
-  RNNotifee: f939208de8e170ad8d22353a7b56ffe34a1120e5
+  RNFBApp: 406bc9586c70ccf20504b4d3b54ac4341c98993f
+  RNFBMessaging: 154dc7815e2b6c55941793630ffb3a55f03d77e6
+  RNNotifee: 80cb5a32b51fca97889be6e421a0eeb30b50d6d0
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
 
 PODFILE CHECKSUM: e440fa2f7a994f0a1b1d284f1e2111c72fdb73cb