From aa60a3db5f074775885609d04cec8053d510071a Mon Sep 17 00:00:00 2001
From: Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>
Date: Thu, 6 May 2021 22:45:04 +0530
Subject: Upgrade to macOS Big Sur in Travis and build native modules (#1359)

---
 .travis.yml         |  6 ++++--
 package-lock.json   | 19 ++++++++++---------
 recipes             |  2 +-
 src/internal-server |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 285320492..923685bdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
     - os: osx
-      osx_image: xcode12.2
+      osx_image: xcode12.4
       env:
         - ELECTRON_CACHE=$HOME/.cache/electron
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -57,9 +57,11 @@ before_install:
       echo "Completed merging from develop branch and upgrading submodules"
     fi
 install:
+  - npm cache clean -f || travis_terminate 1
+  - npm uninstall node-gyp && travis_retry npm install -g node-gyp@8.0.0 || travis_terminate 1
+  - npm uninstall node-sass && travis_retry npm install -g node-sass@5.0.0 || travis_terminate 1
   - cd recipes && npm install && npm run package && cd .. || travis_terminate 1
   - travis_retry npx lerna bootstrap || travis_terminate 1
-  - travis_retry npm install node-sass -g || travis_terminate 1
 before_script:
   - npm run lint && npm run test || travis_terminate 1
 script:
diff --git a/package-lock.json b/package-lock.json
index 552410496..7acfd4ee3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6787,6 +6787,16 @@
         "macos-notification-state": "^1.1.0",
         "windows-notification-state": "^1.3.0",
         "windows-quiet-hours": "^1.2.2"
+      },
+      "dependencies": {
+        "macos-notification-state": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.5.tgz",
+          "integrity": "sha512-uTfue/exD5AtZnJHgjvaHCi0/MQOWigcTjKGmRmRSJz+SGdXZMM2TVAI/js8SnLILUzoA3FW1wveaPZne9x/Tg==",
+          "requires": {
+            "bindings": "^1.5.0"
+          }
+        }
       }
     },
     "@meetfranz/forms": {
@@ -24626,15 +24636,6 @@
         }
       }
     },
-    "macos-notification-state": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz",
-      "integrity": "sha512-Zd4fezXN4WaXw0fJnO3dr8Eg72AKI4C+g0Jnm5KcX8o7WWvIMV9rzsl8mtuOL8FT+QPYv1xiaLpElqhXubf3Yw==",
-      "requires": {
-        "bindings": "^1.4.0",
-        "nan": "^2.13.2"
-      }
-    },
     "macos-release": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
diff --git a/recipes b/recipes
index 6ce9db902..fe702592c 160000
--- a/recipes
+++ b/recipes
@@ -1 +1 @@
-Subproject commit 6ce9db9026c9d30df49e1dffee33cc6a69d271bb
+Subproject commit fe702592c1cb816c78cbb5476d5fe0e1ac77aa58
diff --git a/src/internal-server b/src/internal-server
index ae1edff6d..b8e39c293 160000
--- a/src/internal-server
+++ b/src/internal-server
@@ -1 +1 @@
-Subproject commit ae1edff6d5139e5912a8f99dac8da274add7fd78
+Subproject commit b8e39c293c4d58c42f3cddafbd0125fcba5e933e
-- 
cgit v1.2.3-70-g09d2