Revert "fix(lavamoat): append extensions to @metamask/providers subpath imports"

This reverts commit 68cae24.

Author: MajorLift

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,14 +52,20 @@
         "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
       }
     },

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,14 +59,20 @@
         "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
       }
     },

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,14 +59,20 @@
         "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
       }
     },

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,14 +52,20 @@
         "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
       }
     },

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.cjs';
+import { StreamProvider } from '@metamask/providers/dist/StreamProvider';
 import { errorCodes, rpcErrors, serializeError } from '@metamask/rpc-errors';
 import type { SnapsProvider } from '@metamask/snaps-sdk';
 import { getErrorData } from '@metamask/snaps-sdk';

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.d.cts';
+import type { RequestArguments } from '@metamask/providers/dist/BaseProvider';
 import { SNAP_STREAM_NAMES } from '@metamask/snaps-utils';
 
 import {

packages/snaps-execution-environments/src/common/test-utils/logger.ts

@@ -1,4 +1,4 @@
-import type { ConsoleLike } from '@metamask/providers/dist/utils.d.cts';
+import type { ConsoleLike } from '@metamask/providers/dist/utils';
 
 export const SILENT_LOGGER: ConsoleLike = {
   log: () => undefined,

packages/test-snaps/src/api.ts

@@ -1,5 +1,5 @@
 import type { MetaMaskInpageProvider } from '@metamask/providers';
-import type { RequestArguments } from '@metamask/providers/dist/BaseProvider.d.cts';
+import type { RequestArguments } from '@metamask/providers/dist/BaseProvider';
 import { logError } from '@metamask/snaps-utils';
 import type { JsonRpcError, JsonRpcParams } from '@metamask/utils';
 import type { BaseQueryFn } from '@reduxjs/toolkit/query/react';