Skip to content

Commit

Permalink
Cherry-pick part of 421b598 to v11.3.0; specifically the .yarn/patch …
Browse files Browse the repository at this point in the history
…changes (#21440)

#21255 was a bump to
a Snaps package. However, it included this in the description:

> As part of bumping the packages we had to update TypeScript as well.
We had a
> long-standing patch to TypeScript that could be easily replaced with a
small patch to
> LavaMoat to enable overrideTaming. This feature is also set to be
enabled in the next
> version of LavaMoat.

This specific change is needed to get the v11.3.0 build passing, as
commit 913d0fb causes `yarn build dist` on Version-v11.3.0 to fail
without it.

## **Manual testing steps**

All CI jobs should pass
  • Loading branch information
danjm authored Oct 18, 2023
1 parent b8b9c3c commit 99615eb
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 271 deletions.
13 changes: 13 additions & 0 deletions .yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
diff --git a/src/kernelTemplate.js b/src/kernelTemplate.js
index de8d73048b7bb7c4e74009b5c85ad919fe197ef0..e5bcb987cff013def8b2e8c767eb75a57ea0bd7a 100644
--- a/src/kernelTemplate.js
+++ b/src/kernelTemplate.js
@@ -60,6 +60,8 @@
errorTaming: 'unsafe',
// shows the full call stack
stackFiltering: 'verbose',
+ // prevents most common override mistake cases from tripping up users
+ overrideTaming: 'severe',
}

lockdown(lockdownOptions)
diff --git a/src/loadPolicy.js b/src/loadPolicy.js
index ef71923f9282d6a5e9f74e6ec6fa0516f28f508b..0118fda7e1b0fa461ec01ceff8d7112d072f3dfb 100644
--- a/src/loadPolicy.js
Expand Down
242 changes: 0 additions & 242 deletions .yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
"ast-types": "^0.14.2",
"x-default-browser": "^0.5.2",
"web3-provider-engine/eth-json-rpc-filters": "^6.0.0",
"typescript@~4.4.0": "patch:typescript@npm:4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch",
"acorn@^7.0.0": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
"acorn@^7.4.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
"acorn@^7.1.1": "patch:acorn@npm:7.4.1#.yarn/patches/acorn-npm-7.4.1-f450b4646c.patch",
Expand Down Expand Up @@ -548,7 +547,7 @@
"through2": "^4.0.2",
"ts-node": "^10.5.0",
"ttest": "^2.1.1",
"typescript": "~4.4.0",
"typescript": "~4.5.0",
"vinyl": "^2.2.1",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
Expand Down
44 changes: 17 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23326,12 +23326,12 @@ __metadata:

"lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch":
version: 14.4.1
resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch::version=14.4.1&hash=5307c6"
resolution: "lavamoat-core@patch:lavamoat-core@npm%3A14.4.1#~/.yarn/patches/lavamoat-core-npm-14.4.1-c4e8bbb016.patch::version=14.4.1&hash=1822ab"
dependencies:
json-stable-stringify: "npm:^1.0.2"
lavamoat-tofu: "npm:^6.2.1"
merge-deep: "npm:^3.0.3"
checksum: 47a7f3863bd7b7ddb59ea6dad15a48859538725b0ed7bc53fd78a1a3f752c86f77b83f554c6b4a27420beb07d088fbfe1fd0847048c4e53174599d526d503fe8
checksum: 53e042240c5bc61aa61f8fc058734e4324243c2e9541c40c3445686238871a287f72ffce19cfc4c04ccf659e75fbec188460a14b8e6c61b36220042038d2eb18
languageName: node
linkType: hard

Expand Down Expand Up @@ -24906,7 +24906,7 @@ __metadata:
through2: "npm:^4.0.2"
ts-node: "npm:^10.5.0"
ttest: "npm:^2.1.1"
typescript: "npm:~4.4.0"
typescript: "npm:~4.5.0"
unicode-confusables: "npm:^0.1.1"
uuid: "npm:^8.3.2"
vinyl: "npm:^2.2.1"
Expand Down Expand Up @@ -33733,16 +33733,6 @@ __metadata:
languageName: node
linkType: hard

"typescript@npm:4.4.4":
version: 4.4.4
resolution: "typescript@npm:4.4.4"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 20663db4fb18d0f6b5778b8103c5a7d5ad784947c7e94259c302aefd6413f4e9ec8075af5e8b5ee972cc7ea167aa74cb8735f31468b57c79c8013f601bd793cf
languageName: node
linkType: hard

"typescript@npm:^3.9.10, typescript@npm:^3.9.7":
version: 3.9.10
resolution: "typescript@npm:3.9.10"
Expand Down Expand Up @@ -33773,6 +33763,16 @@ __metadata:
languageName: node
linkType: hard

"typescript@npm:~4.5.0":
version: 4.5.5
resolution: "typescript@npm:4.5.5"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 6b1a99a272bb6bf701e6f5f7e23455049a85db4958cd19bc4c2d25025b5af5751756962ae7a8bbcc1e339fa5209384f5e15352aa973c2121d7f8f525067106b3
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A^3.9.10#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^3.9.7#optional!builtin<compat/typescript>":
version: 3.9.10
resolution: "typescript@patch:typescript@npm%3A3.9.10#optional!builtin<compat/typescript>::version=3.9.10&hash=3bd3d3"
Expand Down Expand Up @@ -33803,23 +33803,13 @@ __metadata:
languageName: node
linkType: hard

"typescript@patch:typescript@npm:4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch::locator=metamask-crx%40workspace%3A.":
version: 4.4.4
resolution: "typescript@patch:typescript@npm%3A4.4.4#.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch::version=4.4.4&hash=8ca643&locator=metamask-crx%40workspace%3A."
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: cd2f71ab0e2fe5e28b8691d89e61b0e8b3f4f7d8ef3e7e77a9e7f9b369ffc352df010c1e80c140cb6d7ef727f2647b3f4bf51db98e8157b7be18e58f734f7578
languageName: node
linkType: hard

"typescript@patch:typescript@patch%3Atypescript@npm%3A4.4.4%23.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch%3A%3Alocator=metamask-crx%2540workspace%253A.#optional!builtin<compat/typescript>":
version: 4.4.4
resolution: "typescript@patch:typescript@patch%3Atypescript@npm%253A4.4.4%23.yarn/patches/typescript-npm-4.4.4-3fedcc07a3.patch%3A%3Aversion=4.4.4&hash=8ca643&locator=metamask-crx%2540workspace%253A.#optional!builtin<compat/typescript>::version=4.4.4&hash=bbeadb"
"typescript@patch:typescript@npm%3A~4.5.0#optional!builtin<compat/typescript>":
version: 4.5.5
resolution: "typescript@patch:typescript@npm%3A4.5.5#optional!builtin<compat/typescript>::version=4.5.5&hash=bcec9a"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 443daaab2da2c17da6b1c17e9e19575564e8e201f30bc7f2fd7321ae81afb8b5e88bf64a6191f147a037b8eee7b18d0caf0c7ace946d7b91722ff26a0befc132
checksum: 3875b1a307d4e01bcdb7537ba708b4c937dd6c89ef230391e9957983b642b0cd58f3355098fb717b7c97753f56d9cde0d3f817e5367d5b5c20f357be961b3c71
languageName: node
linkType: hard

Expand Down

0 comments on commit 99615eb

Please sign in to comment.