From fa3e1d97b74bcc091d54ca6b9e93965933b518c0 Mon Sep 17 00:00:00 2001
From: Jakub Mikulas <jakub@snyk.io>
Date: Fri, 14 Aug 2020 12:09:25 +0200
Subject: [PATCH 1/2] chore: remove npmignore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

npmignore was causing more trouble, and its role could be better served by “files” field in package.json.

Also updated “files” to include license
---
 .npmignore   | 10 ----------
 package.json |  5 ++---
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 5e99fea7d6f..00000000000
--- a/.npmignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.git*
-/test
-config.*.json
-!config.default.json
-tmp
-.nyc_output
-cert.pem
-key.pem
-/release-scripts
-/dist/docker-mac-signed-bundle.tar.gz
diff --git a/package.json b/package.json
index fad2e6f2bf2..7cc58fb8231 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,8 @@
     "dist",
     "config.default.json",
     "SECURITY.md",
-    "README.md",
-    "Contributor-Agreement.md",
-    ".snyk"
+    "LICENSE",
+    "README.md"
   ],
   "directories": {
     "test": "test"

From 957c64e29c7c5dd12c209c729decd37afdb870c6 Mon Sep 17 00:00:00 2001
From: Jakub Mikulas <jakub@snyk.io>
Date: Fri, 14 Aug 2020 12:14:57 +0200
Subject: [PATCH 2/2] chore(build): downgrade binary to Node v12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- downgrade to NodeJS v12, to keep binary smaller (v14 is almost twice the size)
- move the final macOS package to project root, so it won’t get included in /dist folder (related to npmignore removal in previous commit)
- add sha256 to release artifacts
---
 .releaserc                                | 9 +++++++--
 release-scripts/docker-desktop-release.sh | 8 ++++++--
 release-scripts/snyk-mac.sh               | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.releaserc b/.releaserc
index ad6099b227b..37a725347d3 100644
--- a/.releaserc
+++ b/.releaserc
@@ -9,7 +9,7 @@
     {
       "//": "build the alpine, macos, linux and windows binaries",
       "path": "@semantic-release/exec",
-      "cmd": "pkg . -t node14-alpine-x64,node14-linux-x64,node14-macos-x64,node14-win-x64"
+      "cmd": "pkg . -t node12-alpine-x64,node12-linux-x64,node12-macos-x64,node12-win-x64"
     },
     {
       "//": "build docker package",
@@ -78,9 +78,14 @@
           "label": "snyk-alpine.sha256"
         },
         {
-          "path": "./dist/docker-mac-signed-bundle.tar.gz",
+          "path": "./docker-mac-signed-bundle.tar.gz",
           "name": "docker-mac-signed-bundle.tar.gz",
           "label": "docker-mac-signed-bundle.tar.gz"
+        },
+        {
+          "path": "./docker-mac-signed-bundle.tar.gz.sha256",
+          "name": "docker-mac-signed-bundle.tar.gz.sha256",
+          "label": "docker-mac-signed-bundle.tar.gz.sha256"
         }
       ]
     }
diff --git a/release-scripts/docker-desktop-release.sh b/release-scripts/docker-desktop-release.sh
index 42fc228e6c6..b9641c39463 100755
--- a/release-scripts/docker-desktop-release.sh
+++ b/release-scripts/docker-desktop-release.sh
@@ -16,15 +16,19 @@ cp ./release-scripts/snyk-mac.sh ./dist/docker/
 cd ./dist/docker
 
 npm install --production
+rm -rf package-lock.json
 
 # Download macOS NodeJS binary, using same as pkg
-curl "https://nodejs.org/dist/v14.6.0/node-v14.6.0-darwin-x64.tar.gz" | tar -xz
+curl "https://nodejs.org/dist/v12.18.3/node-v12.18.3-darwin-x64.tar.gz" | tar -xz
 
 cd ..
 
 # Create bundle, resolve symlinks
 tar czfh docker-mac-signed-bundle.tar.gz ./docker
+# final package must be at root, otherwise it gets included in /dist folder
+cd ..
+mv ./dist/docker-mac-signed-bundle.tar.gz .
 
 sha256sum docker-mac-signed-bundle.tar.gz > docker-mac-signed-bundle.tar.gz.sha256
 
-rm -rf ./docker
+rm -rf ./dist/docker
diff --git a/release-scripts/snyk-mac.sh b/release-scripts/snyk-mac.sh
index 5a77b74923a..bbb653a1d50 100755
--- a/release-scripts/snyk-mac.sh
+++ b/release-scripts/snyk-mac.sh
@@ -3,7 +3,7 @@ set -e
 
 DIRNAME=$(dirname "$0")
 
-NODE="$DIRNAME/node-v14.6.0-darwin-x64/bin/node"
+NODE="$DIRNAME/node-v12.18.3-darwin-x64/bin/node"
 SNYK_CLI="$DIRNAME/cli/cli/index.js"
 
 "$NODE" "$SNYK_CLI" "$@"