From abe9d4efe53303414ef28df37f8a7354381e0668 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Fri, 29 Oct 2021 16:47:44 -0500
Subject: [PATCH] Remove generate-asar.js and chromium-pickle-js

---
 package-lock.json             |  9 ++-----
 package.json                  |  1 -
 src/packager/generate-asar.js | 50 -----------------------------------
 src/packager/packager.js      |  1 -
 4 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 src/packager/generate-asar.js

diff --git a/package-lock.json b/package-lock.json
index 2b6d541..c3f4606 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3596,11 +3596,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "chromium-pickle-js": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
-      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU="
-    },
     "ci-info": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
@@ -9725,7 +9720,7 @@
     },
     "scratch-render": {
       "version": "git://github.com/TurboWarp/scratch-render.git#e5f8b7313a6df8e8dda0d72053938c0bce49d5ce",
-      "from": "git://github.com/TurboWarp/scratch-render.git#e5f8b7313a6df8e8dda0d72053938c0bce49d5ce",
+      "from": "git://github.com/TurboWarp/scratch-render.git#develop",
       "requires": {
         "grapheme-breaker": "0.3.2",
         "hull.js": "0.2.10",
@@ -9820,7 +9815,7 @@
     },
     "scratch-vm": {
       "version": "git://github.com/TurboWarp/scratch-vm.git#29405e79562207ef37622a95b7ab968e019f59cd",
-      "from": "git://github.com/TurboWarp/scratch-vm.git#29405e79562207ef37622a95b7ab968e019f59cd",
+      "from": "git://github.com/TurboWarp/scratch-vm.git#develop",
       "requires": {
         "@vernier/godirect": "1.5.0",
         "arraybuffer-loader": "^1.0.6",
diff --git a/package.json b/package.json
index 21cdcbb..79d8ca4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
   "license": "LGPL-3.0-only",
   "dependencies": {
     "@fiahfy/icns": "0.0.7",
-    "chromium-pickle-js": "^0.2.0",
     "comlink": "^4.3.1",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
     "jszip": "3.1.5",
diff --git a/src/packager/generate-asar.js b/src/packager/generate-asar.js
deleted file mode 100644
index 9a032e5..0000000
--- a/src/packager/generate-asar.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import pickle from 'chromium-pickle-js';
-
-const generateAsar = (files) => {
-  // https://github.com/electron/asar#format
-
-  const header = {
-    files: {}
-  };
-  let offset = 0;
-  for (const {path, data} of files) {
-    const pathParts = path.split('/');
-    const lastPart = pathParts.pop();
-    let node = header.files;
-    for (const part of pathParts) {
-      if (!Object.prototype.hasOwnProperty.call(node, part)) {
-        node[part] = {
-          files: {}
-        };
-      }
-      node = node[part].files;
-    }
-    node[lastPart] = {
-      offset: offset.toString(),
-      size: data.length
-    };
-    offset += data.length;
-  }
-
-  const headerPickle = pickle.createEmpty();
-  headerPickle.writeString(JSON.stringify(header));
-  const headerBuffer = headerPickle.toBuffer();
-  const sizePickle = pickle.createEmpty();
-  sizePickle.writeUInt32(headerBuffer.length);
-  const sizeBuffer = sizePickle.toBuffer();
-
-  const totalSize = headerBuffer.length + sizeBuffer.length + offset;
-  const result = new Uint8Array(totalSize);
-  let i = 0;
-  result.set(sizeBuffer, i);
-  i += sizeBuffer.length;
-  result.set(headerBuffer, i);
-  i += headerBuffer.length;
-  for (const {data} of files) {
-    result.set(data, i);
-    i += data.length;
-  }
-  return result;
-};
-
-export default generateAsar;
diff --git a/src/packager/packager.js b/src/packager/packager.js
index 52e6392..17a348c 100644
--- a/src/packager/packager.js
+++ b/src/packager/packager.js
@@ -8,7 +8,6 @@ import pngToAppleICNS from './icns';
 import assetCache from './cache';
 import {buildId, verifyBuildId} from './build-id';
 import {encode, decode} from './base85';
-import generateAsar from './generate-asar';
 import {parsePlist, generatePlist} from './plist';
 import {APP_NAME, WEBSITE, COPYRIGHT_NOTICE} from './brand';