From 4e083017d684dddc75b2e4d1a32acb16ca66968f Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Tue, 1 Aug 2023 16:10:52 -0500 Subject: [PATCH] fix weird lockfile irregularities (#20333) Co-authored-by: Mark Stacey --- lavamoat/browserify/desktop/policy.json | 4 +- lavamoat/browserify/flask/policy.json | 4 +- lavamoat/build-system/policy.json | 38 +++------------ yarn.lock | 62 +++++++------------------ 4 files changed, 29 insertions(+), 79 deletions(-) diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 4f3e3f3f4..f1db3fc9f 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -2266,7 +2266,9 @@ "packages": { "@metamask/snaps-controllers-flask>concat-stream>readable-stream": true, "browserify>buffer": true, - "pumpify>inherits": true + "browserify>concat-stream>typedarray": true, + "pumpify>inherits": true, + "terser>source-map-support>buffer-from": true } }, "@metamask/snaps-controllers-flask>concat-stream>readable-stream": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 4f3e3f3f4..f1db3fc9f 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -2266,7 +2266,9 @@ "packages": { "@metamask/snaps-controllers-flask>concat-stream>readable-stream": true, "browserify>buffer": true, - "pumpify>inherits": true + "browserify>concat-stream>typedarray": true, + "pumpify>inherits": true, + "terser>source-map-support>buffer-from": true } }, "@metamask/snaps-controllers-flask>concat-stream>readable-stream": { diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 521216647..4db67787c 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -1757,20 +1757,7 @@ "process.platform": true }, "packages": { - "browserify>browser-resolve>resolve": true - } - }, - "browserify>browser-resolve>resolve": { - "builtin": { - "fs.readFile": true, - "fs.readFileSync": true, - "fs.stat": true, - "fs.statSync": true, - "path": true - }, - "globals": { - "process.nextTick": true, - "process.platform": true + "brfs>resolve": true } }, "browserify>cached-path-relative": { @@ -1879,6 +1866,7 @@ }, "packages": { "brfs>resolve": true, + "browserify>browser-resolve": true, "browserify>cached-path-relative": true, "browserify>concat-stream": true, "browserify>duplexer2": true, @@ -1886,7 +1874,6 @@ "browserify>module-deps>stream-combiner2": true, "browserify>module-deps>through2": true, "browserify>parents": true, - "lavamoat-browserify>browser-resolve": true, "loose-envify": true, "pumpify>inherits": true, "readable-stream": true, @@ -6224,8 +6211,8 @@ }, "packages": { "@lavamoat/lavapack": true, + "browserify>browser-resolve": true, "duplexify": true, - "lavamoat-browserify>browser-resolve": true, "lavamoat-browserify>concat-stream": true, "lavamoat-browserify>readable-stream": true, "lavamoat-browserify>through2": true, @@ -6234,29 +6221,16 @@ "lavamoat>lavamoat-core": true } }, - "lavamoat-browserify>browser-resolve": { - "builtin": { - "fs.readFile": true, - "fs.readFileSync": true, - "path": true - }, - "globals": { - "__dirname": true, - "process.platform": true - }, - "packages": { - "brfs>resolve": true - } - }, "lavamoat-browserify>concat-stream": { "globals": { "Buffer.concat": true, - "Buffer.from": true, "Buffer.isBuffer": true }, "packages": { + "browserify>concat-stream>typedarray": true, "lavamoat-browserify>readable-stream": true, - "pumpify>inherits": true + "pumpify>inherits": true, + "terser>source-map-support>buffer-from": true } }, "lavamoat-browserify>readable-stream": { diff --git a/yarn.lock b/yarn.lock index 4a6f2c55a..df1cd0cd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11172,15 +11172,6 @@ __metadata: languageName: node linkType: hard -"browser-resolve@npm:^1.11.0": - version: 1.11.3 - resolution: "browser-resolve@npm:1.11.3" - dependencies: - resolve: 1.1.7 - checksum: 431bfc1a17406362a3010a2c35503eb7d1253dbcb8081c1ce236ddb0b954a33d52dcaf0b07f64c0f20394d6eeec1be4f6551da3734ce9ed5dcc38e876c96d5d5 - languageName: node - linkType: hard - "browser-resolve@npm:^2.0.0": version: 2.0.0 resolution: "browser-resolve@npm:2.0.0" @@ -11284,13 +11275,13 @@ __metadata: linkType: hard "browserify@npm:^16.5.1": - version: 16.5.1 - resolution: "browserify@npm:16.5.1" + version: 16.5.2 + resolution: "browserify@npm:16.5.2" dependencies: JSONStream: ^1.0.3 assert: ^1.4.0 browser-pack: ^6.0.1 - browser-resolve: ^1.11.0 + browser-resolve: ^2.0.0 browserify-zlib: ~0.2.0 buffer: ~5.2.1 cached-path-relative: ^1.0.0 @@ -11311,7 +11302,7 @@ __metadata: insert-module-globals: ^7.0.0 labeled-stream-splicer: ^2.0.0 mkdirp-classic: ^0.5.2 - module-deps: ^6.0.0 + module-deps: ^6.2.3 os-browserify: ~0.3.0 parents: ^1.0.1 path-browserify: ~0.0.0 @@ -11337,7 +11328,7 @@ __metadata: xtend: ^4.0.0 bin: browserify: bin/cmd.js - checksum: 71c02959ffbcedc6364fb77db75dbf9ac7d945747414774287202327b7be9ae390257acfbf788455a90a088daa18c5134ec7b46315b747ff51ccddb73ad2e3ea + checksum: 75dacf5c82355146b49a2febb3bf9f7898893931973cf901849791827e44782afcb562be7bc3a893d9022ae528fd6fccdf24fc8812cb5aa1b081bb7ce34c46b5 languageName: node linkType: hard @@ -12841,11 +12832,13 @@ __metadata: "concat-stream@npm:^2.0.0": version: 2.0.0 - resolution: "concat-stream@https://github.com/hugomrdias/concat-stream.git#commit=057bc7b5d6d8df26c8cf00a3f151b6721a0a8034" + resolution: "concat-stream@npm:2.0.0" dependencies: + buffer-from: ^1.0.0 inherits: ^2.0.3 readable-stream: ^3.0.2 - checksum: 1cef636e7061f310088706b34fe774e3960dff60a5039158b5e5c84795f6dd8a3411659324280405b8c5f1d7e8e3d4f68fa48e55963ed14953a44fef66423329 + typedarray: ^0.0.6 + checksum: d7f75d48f0ecd356c1545d87e22f57b488172811b1181d96021c7c4b14ab8855f5313280263dca44bb06e5222f274d047da3e290a38841ef87b59719bde967c7 languageName: node linkType: hard @@ -14744,11 +14737,11 @@ __metadata: linkType: hard "dot-prop@npm:^4.1.0": - version: 5.2.0 - resolution: "dot-prop@npm:5.2.0" + version: 4.2.1 + resolution: "dot-prop@npm:4.2.1" dependencies: - is-obj: ^2.0.0 - checksum: 709a8208bff4fc4d5a11e357957a9e59ed625d7db909d14ea1e0dbeb30d26c25325a6e64ea27ed96fb17978cc13c7e38cf30bac17bb81eb9b5a740a4fe909a87 + is-obj: ^1.0.0 + checksum: 5f4f19aa440bc548670d87f2adcbd105fa6842cd1fba3165a8a2b1380568ae82862acf8ebafcc6093fa062505d7d08d7155c7ba9a88da212f7348e95ef2bdce6 languageName: node linkType: hard @@ -16165,11 +16158,11 @@ __metadata: "ethereumjs-abi@npm:0.6.8, ethereumjs-abi@npm:^0.6.4, ethereumjs-abi@npm:^0.6.8": version: 0.6.8 - resolution: "ethereumjs-abi@https://github.com/ethereumjs/ethereumjs-abi.git#commit=ee3994657fa7a427238e6ba92a84d0b529bbcde0" + resolution: "ethereumjs-abi@npm:0.6.8" dependencies: bn.js: ^4.11.8 ethereumjs-util: ^6.0.0 - checksum: ae074be0bb012857ab5d3ae644d1163b908a48dd724b7d2567cfde309dc72222d460438f2411936a70dc949dc604ce1ef7118f7273bd525815579143c907e336 + checksum: cede2a8ae7c7e04eeaec079c2f925601a25b2ef75cf9230e7c5da63b4ea27883b35447365a47e35c1e831af520973a2252af89022c292c18a09a4607821a366b languageName: node linkType: hard @@ -20475,20 +20468,13 @@ __metadata: languageName: node linkType: hard -"is-obj@npm:^1.0.1": +"is-obj@npm:^1.0.0, is-obj@npm:^1.0.1": version: 1.0.1 resolution: "is-obj@npm:1.0.1" checksum: 3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c languageName: node linkType: hard -"is-obj@npm:^2.0.0": - version: 2.0.0 - resolution: "is-obj@npm:2.0.0" - checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08 - languageName: node - linkType: hard - "is-object@npm:~1.0.1": version: 1.0.1 resolution: "is-object@npm:1.0.1" @@ -25440,7 +25426,7 @@ __metadata: languageName: node linkType: hard -"module-deps@npm:^6.0.0, module-deps@npm:^6.2.3": +"module-deps@npm:^6.2.3": version: 6.2.3 resolution: "module-deps@npm:6.2.3" dependencies: @@ -30091,13 +30077,6 @@ __metadata: languageName: node linkType: hard -"resolve@npm:1.1.7": - version: 1.1.7 - resolution: "resolve@npm:1.1.7" - checksum: afd20873fbde7641c9125efe3f940c2a99f6b1f90f1b7b743e744bdaac1cb105b2e4e0317bcc052ed7e31d57afa86b394a4dc9a1b33a297977be134fdf0250ab - languageName: node - linkType: hard - "resolve@npm:^1.1.4, resolve@npm:^1.1.5, resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.15.1, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.21.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.3, resolve@npm:^1.4.0": version: 1.22.3 resolution: "resolve@npm:1.22.3" @@ -30124,13 +30103,6 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@1.1.7#~builtin": - version: 1.1.7 - resolution: "resolve@patch:resolve@npm%3A1.1.7#~builtin::version=1.1.7&hash=07638b" - checksum: e9dbca78600ae56835c43a09f1276876c883e4b4bbd43e2683fa140671519d2bdebeb1c1576ca87c8c508ae2987b3ec481645ac5d3054b0f23254cfc1ce49942 - languageName: node - linkType: hard - "resolve@patch:resolve@^1.1.4#~builtin, resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.10.1#~builtin, resolve@patch:resolve@^1.11.1#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.15.1#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.18.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.21.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.22.3#~builtin, resolve@patch:resolve@^1.4.0#~builtin": version: 1.22.3 resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=07638b"