fix(lavamoat): append extensions to @metamask/providers subpath imp…

…orts
MetaMask · Jul 15, 2024 · 69abbc0 · 69abbc0
1 parent 9d979c8
commit 69abbc0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 36 deletions.
diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
@@ -42,8 +42,8 @@
         "console": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -52,20 +52,14 @@
         "readable-stream": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/safe-event-emitter": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
@@ -49,8 +49,8 @@
         "console": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -59,20 +59,14 @@
         "readable-stream": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/safe-event-emitter": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
@@ -49,8 +49,8 @@
         "console": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -59,20 +59,14 @@
         "readable-stream": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/safe-event-emitter": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
@@ -42,8 +42,8 @@
         "console": true
       },
       "packages": {
+        "@metamask/json-rpc-engine": true,
         "@metamask/object-multiplex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/json-rpc-middleware-stream": true,
         "@metamask/providers>@metamask/safe-event-emitter": true,
         "@metamask/providers>is-stream": true,
@@ -52,20 +52,14 @@
         "readable-stream": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/safe-event-emitter": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/json-rpc-middleware-stream": {
       "globals": {
         "console.warn": true,
         "setTimeout": true
       },
       "packages": {
         "@metamask/providers>@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
         "readable-stream": true
       }
     },

diff --git a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts
@@ -2,7 +2,7 @@
 /// <reference path="../../../../node_modules/ses/types.d.ts" />
 import { createIdRemapMiddleware } from '@metamask/json-rpc-engine';
 import type { RequestArguments } from '@metamask/providers';
-import { StreamProvider } from '@metamask/providers/dist/StreamProvider';
+import { StreamProvider } from '@metamask/providers/dist/StreamProvider.cjs';
 import { errorCodes, rpcErrors, serializeError } from '@metamask/rpc-errors';
 import type { SnapsProvider } from '@metamask/snaps-sdk';
 import { getErrorData } from '@metamask/snaps-sdk';

diff --git a/packages/snaps-execution-environments/src/common/test-utils/endowments.ts b/packages/snaps-execution-environments/src/common/test-utils/endowments.ts
@@ -3,7 +3,7 @@ import { walk } from '@lavamoat/lavatube';
 import { createIdRemapMiddleware } from '@metamask/json-rpc-engine';
 import ObjectMultiplex from '@metamask/object-multiplex';
 import { StreamProvider } from '@metamask/providers';
-import type { RequestArguments } from '@metamask/providers/dist/BaseProvider';
+import type { RequestArguments } from '@metamask/providers/dist/BaseProvider.d.cts';
 import { SNAP_STREAM_NAMES } from '@metamask/snaps-utils';
 
 import {

diff --git a/packages/snaps-execution-environments/src/common/test-utils/logger.ts b/packages/snaps-execution-environments/src/common/test-utils/logger.ts
@@ -1,4 +1,4 @@
-import type { ConsoleLike } from '@metamask/providers/dist/utils';
+import type { ConsoleLike } from '@metamask/providers/dist/utils.cjs';
 
 export const SILENT_LOGGER: ConsoleLike = {
   log: () => undefined,

diff --git a/packages/test-snaps/src/api.ts b/packages/test-snaps/src/api.ts
@@ -1,5 +1,5 @@
 import type { MetaMaskInpageProvider } from '@metamask/providers';
-import type { RequestArguments } from '@metamask/providers/dist/BaseProvider';
+import type { RequestArguments } from '@metamask/providers/dist/BaseProvider.d.cts';
 import { logError } from '@metamask/snaps-utils';
 import type { JsonRpcError, JsonRpcParams } from '@metamask/utils';
 import type { BaseQueryFn } from '@reduxjs/toolkit/query/react';