From 679b18eee9e716d005b2557c33f66af580f7916d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 9 Nov 2023 15:24:12 +1100 Subject: [PATCH] chore: remove dtrace-provider dep from bunyan using our own --- package.json | 2 +- patches/bunyan+1.8.15.patch | 43 ----------------------------------- yarn.lock | 45 ++++++++++++++++--------------------- 3 files changed, 20 insertions(+), 70 deletions(-) delete mode 100644 patches/bunyan+1.8.15.patch diff --git a/package.json b/package.json index f9f112d06..07d794836 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "blob-util": "2.0.2", "blueimp-load-image": "5.14.0", "buffer-crc32": "0.2.13", - "bunyan": "^1.8.15", + "bunyan": "https://github.com/Bilb/node-bunyan", "bytebuffer": "^5.0.1", "classnames": "2.2.5", "config": "1.28.1", diff --git a/patches/bunyan+1.8.15.patch b/patches/bunyan+1.8.15.patch deleted file mode 100644 index eed3bf8d1..000000000 --- a/patches/bunyan+1.8.15.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/node_modules/bunyan/lib/bunyan.js b/node_modules/bunyan/lib/bunyan.js -index f988560..a4cf69a 100644 ---- a/node_modules/bunyan/lib/bunyan.js -+++ b/node_modules/bunyan/lib/bunyan.js -@@ -63,7 +63,7 @@ if (!runtimeEnv) { - } - - --var os, fs, dtrace; -+var os, fs, pathModule, dtrace; - if (runtimeEnv === 'browser') { - os = { - hostname: function () { -@@ -71,12 +71,15 @@ if (runtimeEnv === 'browser') { - } - }; - fs = {}; -+ pathModule = {}; - dtrace = null; - } else { - os = require('os'); - fs = require('fs'); -+ pathModule = require('path'); - try { -- dtrace = require('dtrace-provider' + ''); -+ throw new Error('dtrace-provider is not available') -+ // dtrace = require('dtrace-provider' + ''); - } catch (e) { - dtrace = null; - } -@@ -1512,6 +1515,12 @@ RotatingFileStream.prototype.rotate = function rotate() { - } - - function finish() { -+ if (!fs.existsSync(self.path)) { -+ var dirPath = pathModule.dirname(self.path); -+ if (!fs.existsSync(dirPath)) { -+ fs.mkdirSync(dirPath, { recursive: true }); -+ } -+ } - self._debug(' open %s', self.path); - self.stream = fs.createWriteStream(self.path, - {flags: 'a', encoding: 'utf8'}); diff --git a/yarn.lock b/yarn.lock index 1810ee27e..cf59c1f44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1039,15 +1039,7 @@ "@types/prop-types" "*" "@types/react" "*" -"@types/react@*", "@types/react@17.0.2", "@types/react@^17": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^17.0.2": +"@types/react@*", "@types/react@^17", "@types/react@^17.0.2": version "17.0.65" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== @@ -1056,6 +1048,14 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@17.0.2": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + "@types/redux-logger@3.0.7": version "3.0.7" resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0" @@ -2059,12 +2059,12 @@ builder-util@23.6.0: stat-mode "^1.0.0" temp-file "^3.4.0" -bunyan@^1.8.15: - version "1.8.15" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.15.tgz#8ce34ca908a17d0776576ca1b2f6cbd916e93b46" - integrity sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig== +"bunyan@https://github.com/Bilb/node-bunyan": + version "2.0.5" + resolved "https://github.com/Bilb/node-bunyan#1f69cb340cd25485c508e65197d05ae534b212e2" + dependencies: + exeunt "1.1.0" optionalDependencies: - dtrace-provider "~0.8" moment "^2.19.3" mv "~2" safe-json-stringify "~1" @@ -2862,13 +2862,6 @@ dotenv@^9.0.2: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== -dtrace-provider@~0.8: - version "0.8.8" - resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e" - integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg== - dependencies: - nan "^2.14.0" - eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" @@ -3493,6 +3486,11 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +exeunt@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/exeunt/-/exeunt-1.1.0.tgz#af72db6f94b3cb75e921aee375d513049843d284" + integrity sha512-dd++Yn/0Fp+gtJ04YHov7MeAii+LFivJc6KqnJNfplzLVUkUDrfKoQDTLlCgzcW15vY5hKlHasWeIsQJ8agHsw== + extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -5416,11 +5414,6 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -nan@^2.14.0: - version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" - integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== - nano-css@^5.3.1: version "5.3.5" resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.3.5.tgz#3075ea29ffdeb0c7cb6d25edb21d8f7fa8e8fe8e"