From 86cf918aa41091b632a0a84ab3eb76d69223e4e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Syn=C3=A1=C4=8Dek?=
 <ondrejsynacek@fastmail.com>
Date: Fri, 25 Dec 2020 13:38:30 +0100
Subject: [PATCH] fix: use buffer fallback for webpack 5 instead of polyfill

---
 package-lock.json | 19 +++++++++++++++++++
 package.json      |  1 +
 webpack.common.js |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 514ae1b..e394854 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3943,6 +3943,11 @@
         }
       }
     },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -4067,6 +4072,15 @@
         "node-int64": "^0.4.0"
       }
     },
+    "buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -6907,6 +6921,11 @@
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
     "ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
diff --git a/package.json b/package.json
index 8fcdbdf..362be28 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
   "license": "ISC",
   "dependencies": {
     "body-parser": "^1.19.0",
+    "buffer": "^6.0.3",
     "cheerio": "^1.0.0-rc.3",
     "cors": "^2.8.5",
     "dayjs": "^1.8.16",
diff --git a/webpack.common.js b/webpack.common.js
index 8129445..2856497 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -35,6 +35,7 @@ module.exports = {
       util: require.resolve('util/'),
       stream: require.resolve('stream-browserify'),
       path: require.resolve('path-browserify'),
+      buffer:  require.resolve('buffer/'),
     },
   },
   module: {
@@ -62,7 +63,6 @@ module.exports = {
       template: path.join(__dirname, 'lib', 'static', 'index.html'),
       version: pkg.version,
     }),
-    new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
       'process.env.NODE_DEBUG': JSON.stringify(process.env.NODE_DEBUG),