chore!: Build Snaps execution environments with Webpack

.github/workflows/build-lint-test.yml

@@ -26,7 +26,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache-node-modules: ${{ matrix.node-version == '20.x' }}
       - name: Prepare "@metamask/snaps-execution-environments" build
-        run: yarn workspace @metamask/snaps-execution-environments run build:lavamoat
+        run: yarn workspace @metamask/snaps-execution-environments run build:lavamoat:test
       - name: Save "@metamask/snaps-execution-environments" build
         id: cache-snaps-execution-environments-build
         uses: actions/upload-artifact@v4
@@ -35,7 +35,7 @@ jobs:
           retention-days: 1
           path: |
             .nvmrc
-            packages/snaps-execution-environments/dist/browserify
+            packages/snaps-execution-environments/dist/webpack
       - name: Fetch workspace package names
         id: workspace-package-names
         run: |
@@ -95,12 +95,16 @@ jobs:
   policy:
     name: Generate LavaMoat policy
     runs-on: ubuntu-latest
-    needs: prepare
+    needs: build
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1
         with:
           is-high-risk-environment: false
+      - name: Restore build files
+        uses: actions/download-artifact@v4
+        with:
+          name: build-source-${{ runner.os }}-${{ github.sha }}
       - name: Generate LavaMoat policy
         run: yarn workspace @metamask/snaps-execution-environments build:lavamoat:policy
       - name: Require clean working directory

.github/workflows/publish-environment.yml

@@ -32,5 +32,5 @@ jobs:
           aws-region: ${{ vars.AWS_REGION }}
       - name: Deploy to `${{ inputs.destination_dir }}` directory of remote storage
         run: |
-          aws s3 cp ./packages/snaps-execution-environments/dist/browserify/iframe s3://${{ vars.AWS_BUCKET_NAME }}/iframe/${{ inputs.destination_dir }} --recursive --acl private
-          aws s3 cp ./packages/snaps-execution-environments/dist/browserify/webview s3://${{ vars.AWS_BUCKET_NAME }}/webview/${{ inputs.destination_dir }} --recursive --acl private
+          aws s3 cp ./packages/snaps-execution-environments/dist/webpack/iframe s3://${{ vars.AWS_BUCKET_NAME }}/iframe/${{ inputs.destination_dir }} --recursive --acl private
+          aws s3 cp ./packages/snaps-execution-environments/dist/webpack/webview s3://${{ vars.AWS_BUCKET_NAME }}/webview/${{ inputs.destination_dir }} --recursive --acl private

jest.config.base.js

@@ -96,10 +96,19 @@ module.exports = {
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
   moduleNameMapper: {
+    '^@metamask/snaps-execution-environments/node-thread': [
+      '<rootDir>/../snaps-execution-environments/dist/webpack/node-thread/bundle.js',
+    ],
+    '^@metamask/snaps-execution-environments/node-process': [
+      '<rootDir>/../snaps-execution-environments/dist/webpack/node-process/bundle.js',
+    ],
     '^@metamask/(.+)/production/jsx-runtime': [
       '<rootDir>/../$1/src/jsx/production',
     ],
     '^@metamask/(.+)/test-utils$': ['<rootDir>/../$1/src/test-utils'],
+    '^@metamask/post-message-stream/node$': [
+      '@metamask/post-message-stream/node',
+    ],
     '^@metamask/(.+)/node$': ['<rootDir>/../$1/src/node'],
     '^@metamask/(.+)/jsx': ['<rootDir>/../$1/src/jsx'],
     '^@metamask/(.+)$': [

package.json

@@ -60,7 +60,6 @@
   "resolutions": {
     "@babel/core": "patch:@babel/core@npm%3A7.23.2#./.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch",
     "@esbuild-plugins/node-modules-polyfill@^0.2.2": "patch:@esbuild-plugins/node-modules-polyfill@npm%3A0.2.2#./.yarn/patches/@esbuild-plugins-node-modules-polyfill-npm-0.2.2-f612681798.patch",
-    "@lavamoat/lavapack@^6.1.1": "patch:@lavamoat/lavapack@npm%3A6.1.1#./.yarn/patches/@lavamoat-lavapack-npm-6.1.1-b81af21193.patch",
     "@puppeteer/[email protected]": "patch:@puppeteer/browsers@npm%3A1.7.0#./.yarn/patches/@puppeteer-browsers-npm-1.7.0-203cb4f44b.patch",
     "@puppeteer/browsers@^1.6.0": "patch:@puppeteer/browsers@npm%3A1.7.0#./.yarn/patches/@puppeteer-browsers-npm-1.7.0-203cb4f44b.patch",
     "@types/glob@*": "patch:@types/glob@npm%3A7.1.4#./.yarn/patches/@types-glob-npm-7.1.4-d45247eaa2.patch",
@@ -72,7 +71,6 @@
     "jest-fetch-mock@^3.0.3": "patch:jest-fetch-mock@npm:3.0.3#.yarn/patches/jest-fetch-mock-npm-3.0.3-ac072ca8af.patch",
     "jest-util@^29.5.0": "patch:jest-util@npm%3A29.6.3#./.yarn/patches/jest-util-npm-29.6.3-6ffdea2c1c.patch",
     "jest-util@^29.6.3": "patch:jest-util@npm%3A29.6.3#./.yarn/patches/jest-util-npm-29.6.3-6ffdea2c1c.patch",
-    "lavamoat-browserify@^17.0.5": "patch:lavamoat-browserify@npm%3A17.0.5#./.yarn/patches/lavamoat-browserify-npm-17.0.5-16c00e9ef9.patch",
     "luxon@^3.2.1": "patch:luxon@npm%3A3.3.0#./.yarn/patches/luxon-npm-3.3.0-bdbae9bfd5.patch",
     "tsconfig-paths@^3.11.0": "patch:tsconfig-paths@npm%3A3.14.2#./.yarn/patches/tsconfig-paths-npm-3.14.2-90ce75420d.patch",
     "tsconfig-paths@^3.14.1": "patch:tsconfig-paths@npm%3A3.14.2#./.yarn/patches/tsconfig-paths-npm-3.14.2-90ce75420d.patch",

packages/examples/packages/bip32/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "k2lRqMHzUAsSfYAQvfHaotZ+GjevHXfCYq31N6rLbpI=",
+    "shasum": "S8JJzZaDPhHp16nyJVCPY++KVgOpYSCUrEVp/dmbsRE=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/bip44/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "OKsspaf6yslVwkh3t0EEkgLe2ZXVUeOSuARHBYh5QO8=",
+    "shasum": "S9Rxcf90yagtJcBEV2lPs4eSASBPP+KkiACJjkye7ho=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/get-entropy/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "JuqQZZ60QV9h7WNpCeNCNoomvPVzkoAGMqF+wXMi7vM=",
+    "shasum": "zip0FTlGFS2oV/Hm6lLWzBAhw/UtphSCFG4kecgojAg=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "5WnCGlClRMxrjPXzuSZybJuEBDfo+oIjkfCRhcvFzzw=",
+    "shasum": "KaI5if/V5l02632+bVHOa6UtSbmWO+NR/kr8q8Ck1zs=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/examples/packages/wasm/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "/ZxCTLB2buQSGwrTdtIh6wkzzoPS0QOZCD8uGq5WGEY=",
+    "shasum": "0iz4fr9QPZehD0EQCZ5rkpOKiKCKVhUwKEZ7ZhjUBLk=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/snaps-controllers/package.json

@@ -88,7 +88,7 @@
     "@metamask/object-multiplex": "^2.1.0",
     "@metamask/permission-controller": "^11.0.6",
     "@metamask/phishing-controller": "^12.5.0",
-    "@metamask/post-message-stream": "^9.0.0",
+    "@metamask/post-message-stream": "^10.0.0",
     "@metamask/rpc-errors": "^7.0.2",
     "@metamask/snaps-registry": "^3.2.3",
     "@metamask/snaps-rpc-methods": "workspace:^",

packages/snaps-controllers/src/services/node-js/NodeProcessExecutionService.ts

@@ -1,5 +1,5 @@
 import type { BasePostMessageStream } from '@metamask/post-message-stream';
-import { ProcessParentMessageStream } from '@metamask/post-message-stream';
+import { ProcessParentMessageStream } from '@metamask/post-message-stream/node';
 import type { ChildProcess } from 'child_process';
 import { fork } from 'child_process';
 
@@ -12,9 +12,7 @@ export class NodeProcessExecutionService extends AbstractExecutionService<ChildP
     stream: BasePostMessageStream;
   }> {
     const worker = fork(
-      require.resolve(
-        '@metamask/snaps-execution-environments/dist/browserify/node-process/bundle.js',
-      ),
+      require.resolve('@metamask/snaps-execution-environments/node-process'),
       {
         stdio: 'pipe',
       },

packages/snaps-controllers/src/services/node-js/NodeThreadExecutionService.ts

@@ -1,5 +1,5 @@
 import type { BasePostMessageStream } from '@metamask/post-message-stream';
-import { ThreadParentMessageStream } from '@metamask/post-message-stream';
+import { ThreadParentMessageStream } from '@metamask/post-message-stream/node';
 import { Worker } from 'worker_threads';
 
 import type { TerminateJobArgs } from '..';
@@ -11,9 +11,7 @@ export class NodeThreadExecutionService extends AbstractExecutionService<Worker>
     stream: BasePostMessageStream;
   }> {
     const worker = new Worker(
-      require.resolve(
-        '@metamask/snaps-execution-environments/dist/browserify/node-thread/bundle.js',
-      ),
+      require.resolve('@metamask/snaps-execution-environments/node-thread'),
       {
         stdout: true,
         stderr: true,

packages/snaps-controllers/src/services/webview/WebViewMessageStream.ts

@@ -1,6 +1,8 @@
 import type { PostMessageEvent } from '@metamask/post-message-stream';
-import { BasePostMessageStream } from '@metamask/post-message-stream';
-import { isValidStreamMessage } from '@metamask/post-message-stream/dist/utils';
+import {
+  BasePostMessageStream,
+  isValidStreamMessage,
+} from '@metamask/post-message-stream';
 import { assert } from '@metamask/utils';
 
 export type WebViewInterface = {

packages/snaps-controllers/vitest.config.mts

@@ -6,7 +6,7 @@ import { defineConfig } from 'vitest/config';
 
 const IFRAME_PATH = join(
   import.meta.dirname,
-  '../snaps-execution-environments/dist/browserify/iframe',
+  '../snaps-execution-environments/dist/webpack/iframe',
 );
 
 const IFRAME_TEST_PATH = join(
@@ -16,12 +16,12 @@ const IFRAME_TEST_PATH = join(
 
 const WORKER_EXECUTOR_PATH = join(
   import.meta.dirname,
-  '../snaps-execution-environments/dist/browserify/worker-executor',
+  '../snaps-execution-environments/dist/webpack/worker-executor',
 );
 
 const WORKER_POOL_PATH = join(
   import.meta.dirname,
-  '../snaps-execution-environments/dist/browserify/worker-pool',
+  '../snaps-execution-environments/dist/webpack/worker-pool',
 );
 
 export default defineConfig({
@@ -54,9 +54,9 @@ export default defineConfig({
       strict: true,
       allow: [
         './src/services/iframe/test',
-        '../snaps-execution-environments/dist/browserify/iframe',
-        '../snaps-execution-environments/dist/browserify/worker-executor',
-        '../snaps-execution-environments/dist/browserify/worker-pool',
+        '../snaps-execution-environments/dist/webpack/iframe',
+        '../snaps-execution-environments/dist/webpack/worker-executor',
+        '../snaps-execution-environments/dist/webpack/worker-pool',
       ],
     },
   },

packages/snaps-execution-environments/.browserslistrc

@@ -0,0 +1,3 @@
+# The minimum browser versions supported by MetaMask.
+chrome >= 90
+firefox >= 91

packages/snaps-execution-environments/coverage.json

@@ -2,5 +2,5 @@
   "branches": 90.78,
   "functions": 94.96,
   "lines": 90.84,
-  "statements": 90.26
+  "statements": 90.25
 }