From 8e9d41ad4d9bd1667e1a5b93a6932cad4d3fabc4 Mon Sep 17 00:00:00 2001
From: Vijay A <avijayr@protonmail.com>
Date: Fri, 10 Sep 2021 15:41:18 +0530
Subject: fix: pnpm install of 'node-mac-permissions' on win

(remove recursive pnpm module installation since that is handled separately)
---
 .devcontainer/devcontainer.json          | 5 +++++
 .github/workflows/dependency-updates.yml | 3 +--
 .github/workflows/ferdi-builds.yml       | 9 +++------
 .npmrc                                   | 2 ++
 recipes                                  | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b015c114b..85a9c5a3b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,18 +9,23 @@
       "VARIANT": "14"
     }
   },
+
   // Set *default* container specific settings.json values on container create.
   "settings": {
     "terminal.integrated.defaultProfile.linux": "/bin/bash"
   },
+
   // Add the IDs of extensions you want installed when the container is created.
   "extensions": [
     "dbaeumer.vscode-eslint"
   ],
+
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
+
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "npm install",
+
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "node"
 }
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index aa3fe6d39..d41ded354 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -41,7 +41,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -56,7 +56,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index 820725a1d..e3e504731 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -117,7 +117,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -150,7 +150,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -228,7 +227,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -257,7 +256,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
@@ -356,7 +354,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-14.17-build-${{ env.cache-name }}-
             ${{ runner.os }}-14.17-build-
-      - name: Cache .pnpm-store
+      - name: Cache pnpm modules
         uses: actions/cache@v2
         env:
           cache-name: cache-pnpm-store
@@ -385,7 +383,6 @@ jobs:
         uses: pnpm/action-setup@v2.0.1
         with:
           version: 6.14.7
-          run_install: true
       - name: Uninstall locally and reinstall global npm modules
         run: |
           npm uninstall node-gyp
diff --git a/.npmrc b/.npmrc
index aafab1669..3f8ef9e64 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1,4 @@
 save-exact = true
 engine-strict = true
+unsafe-perm = true
+frozen-lockfile = false
diff --git a/recipes b/recipes
index b7a391072..fcd4e2de9 160000
--- a/recipes
+++ b/recipes
@@ -1 +1 @@
-Subproject commit b7a391072dae88bbb426f56fe817615225e09929
+Subproject commit fcd4e2de9c61bef33b1ed458cdda51b4651e5af2
-- 
cgit v1.2.3-54-g00ecf