Fix some issues

Author: Mrtenz

packages/snaps-controllers/vitest.config.mts

@@ -28,9 +28,6 @@ export default defineConfig({
   plugins: [tsconfigPaths(), nodePolyfills()],
 
   server: {
-    port: 63315,
-    strictPort: true,
-
     proxy: {
       '/iframe/executor': {
         target: `http://localhost:63315/@fs${IFRAME_PATH}`,

packages/snaps-execution-environments/src/proxy/ProxySnapExecutor.test.browser.ts

@@ -4,7 +4,7 @@ import { describe, expect, it } from 'vitest';
 import { ProxySnapExecutor } from './ProxySnapExecutor';
 
 const MOCK_JOB_ID = 'job-id';
-const IFRAME_URL = 'http://localhost:63315/iframe/executor/index.html';
+const IFRAME_URL = 'http://localhost:63316/iframe/executor/index.html';
 
 /**
  * Write a message to the stream, wrapped with the job ID and frame URL.

packages/snaps-execution-environments/src/webworker/pool/WebWorkerPool.test.browser.ts

@@ -5,7 +5,7 @@ import { describe, expect, it } from 'vitest';
 import { WebWorkerPool } from './WebWorkerPool';
 
 const MOCK_JOB_ID = 'job-id';
-const WORKER_URL = 'http://localhost:63315/worker/executor/bundle.js';
+const WORKER_URL = 'http://localhost:63316/worker/executor/bundle.js';
 
 /**
  * Write a message to the stream, wrapped with the job ID.

packages/snaps-execution-environments/vitest.config.mts

@@ -37,22 +37,19 @@ export default defineConfig({
   },
 
   server: {
-    port: 63315,
-    strictPort: true,
-
     proxy: {
       '/iframe/executor': {
-        target: `http://localhost:63315/@fs${IFRAME_PATH}`,
+        target: `http://localhost:63316/@fs${IFRAME_PATH}`,
         rewrite: (path) => path.replace(/^\/iframe\/executor/u, ''),
       },
 
       '/worker/executor': {
-        target: `http://localhost:63315/@fs${WORKER_EXECUTOR_PATH}`,
+        target: `http://localhost:63316/@fs${WORKER_EXECUTOR_PATH}`,
         rewrite: (path) => path.replace(/^\/worker\/executor/u, ''),
       },
 
       '/worker/pool': {
-        target: `http://localhost:63315/@fs${WORKER_POOL_PATH}`,
+        target: `http://localhost:63316/@fs${WORKER_POOL_PATH}`,
         rewrite: (path) => path.replace(/^\/worker\/pool/u, ''),
       },
     },
@@ -72,6 +69,13 @@ export default defineConfig({
     // explicitly enabled with `yarn test:watch`.
     watch: false,
 
+    api: {
+      // The port to use for the test server. This is used by the browser
+      // provider to connect to the test server.
+      port: 63316,
+      strictPort: true,
+    },
+
     // The files to include in the test run.
     include: ['src/**/*.test.browser.ts'],
 

packages/snaps-utils/src/iframe.test.browser.ts

@@ -2,7 +2,7 @@ import { describe, expect, it, afterEach } from 'vitest';
 
 import { createWindow } from './iframe';
 
-const IFRAME_URL = `http://localhost:4569`;
+const IFRAME_URL = 'http://localhost:63317/iframe/executor/index.html';
 
 const MOCK_JOB_ID = 'job-id';
 

packages/snaps-utils/tsconfig.json

@@ -3,6 +3,12 @@
   "compilerOptions": {
     "baseUrl": "./"
   },
-  "include": ["./src", "scripts", "package.json", "vitest.config.mts", "vitest.config.firefox.mts"],
+  "include": [
+    "./src",
+    "scripts",
+    "package.json",
+    "vitest.config.mts",
+    "vitest.config.firefox.mts"
+  ],
   "references": [{ "path": "../snaps-sdk" }]
 }

packages/snaps-utils/vitest.config.mts

@@ -1,15 +1,48 @@
+// eslint-disable-next-line import-x/no-nodejs-modules
+import { join } from 'path';
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { defineConfig } from 'vitest/config';
 
+const IFRAME_PATH = join(import.meta.dirname, './dist/browserify/iframe');
+
 export default defineConfig({
   plugins: [tsconfigPaths(), nodePolyfills()],
 
+  optimizeDeps: {
+    include: [
+      'vite-plugin-node-polyfills/shims/buffer',
+      'vite-plugin-node-polyfills/shims/global',
+      'vite-plugin-node-polyfills/shims/process',
+    ],
+  },
+
+  server: {
+    proxy: {
+      '/iframe/executor': {
+        target: `http://localhost:63317/@fs${IFRAME_PATH}`,
+        rewrite: (path) => path.replace(/^\/iframe\/executor/u, ''),
+      },
+    },
+
+    fs: {
+      strict: true,
+      allow: ['../snaps-execution-environments/dist/browserify/iframe'],
+    },
+  },
+
   test: {
     // Vitest enables watch mode by default. We disable it here, so it can be
     // explicitly enabled with `yarn test:watch`.
     watch: false,
 
+    api: {
+      // The port to use for the test server. This is used by the browser
+      // provider to connect to the test server.
+      port: 63317,
+      strictPort: true,
+    },
+
     // The files to include in the test run.
     include: ['src/**/*.test.browser.ts'],