From e46b75478104a02205a5b1a1821f68ed030000a5 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Mon, 2 Sep 2024 11:48:17 +0200 Subject: [PATCH] Fix more issues --- packages/create-snap/package.json | 1 + packages/examples/package.json | 1 + packages/snaps-browserify-plugin/package.json | 1 + packages/snaps-cli/package.json | 1 + packages/snaps-controllers/package.json | 1 + packages/snaps-execution-environments/package.json | 1 + packages/snaps-jest/package.json | 1 + packages/snaps-rollup-plugin/package.json | 1 + packages/snaps-rpc-methods/package.json | 1 + packages/snaps-sdk/package.json | 1 + packages/snaps-simulator/package.json | 1 + packages/snaps-utils/package.json | 1 + packages/snaps-utils/src/eval.ts | 2 +- packages/snaps-webpack-plugin/package.json | 1 + yarn.lock | 13 +++++++++++++ 15 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/create-snap/package.json b/packages/create-snap/package.json index aeede1fc47..29587cc737 100644 --- a/packages/create-snap/package.json +++ b/packages/create-snap/package.json @@ -62,6 +62,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@types/node": "18.14.2", "@types/yargs": "^17.0.24", diff --git a/packages/examples/package.json b/packages/examples/package.json index 325ed30b29..ec63a314a4 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -33,6 +33,7 @@ "@metamask/eslint-config-jest": "^12.1.0", "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", + "@ts-bridge/cli": "^0.4.3", "@typescript-eslint/eslint-plugin": "^5.42.1", "@typescript-eslint/parser": "^5.42.1", "depcheck": "^1.4.7", diff --git a/packages/snaps-browserify-plugin/package.json b/packages/snaps-browserify-plugin/package.json index f87962e859..b5244da352 100644 --- a/packages/snaps-browserify-plugin/package.json +++ b/packages/snaps-browserify-plugin/package.json @@ -57,6 +57,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/browserify": "^12.0.37", "@types/convert-source-map": "^1.5.2", "@types/jest": "^27.5.1", diff --git a/packages/snaps-cli/package.json b/packages/snaps-cli/package.json index 6effe2087b..fa950975ac 100644 --- a/packages/snaps-cli/package.json +++ b/packages/snaps-cli/package.json @@ -110,6 +110,7 @@ "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/browserify": "^12.0.37", "@types/jest": "^27.5.1", "@types/node": "18.14.2", diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json index 3b66a35e7b..40fa77b8e8 100644 --- a/packages/snaps-controllers/package.json +++ b/packages/snaps-controllers/package.json @@ -104,6 +104,7 @@ "@metamask/template-snap": "^0.7.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/chrome": "^0.0.237", "@types/concat-stream": "^2.0.0", "@types/gunzip-maybe": "^1.4.0", diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json index 4ee7015a2f..308da2a78b 100644 --- a/packages/snaps-execution-environments/package.json +++ b/packages/snaps-execution-environments/package.json @@ -83,6 +83,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/express": "^4.17.17", "@types/jest": "^27.5.1", "@types/node": "18.14.2", diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json index d0a42274ae..0b55fe68a2 100644 --- a/packages/snaps-jest/package.json +++ b/packages/snaps-jest/package.json @@ -75,6 +75,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@types/mime": "^3.0.0", "@types/semver": "^7.5.0", diff --git a/packages/snaps-rollup-plugin/package.json b/packages/snaps-rollup-plugin/package.json index ac2a5f7722..1cb2d983b7 100644 --- a/packages/snaps-rollup-plugin/package.json +++ b/packages/snaps-rollup-plugin/package.json @@ -57,6 +57,7 @@ "@rollup/plugin-virtual": "^2.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@typescript-eslint/eslint-plugin": "^5.42.1", "@typescript-eslint/parser": "^5.42.1", diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json index 2fc3711c81..6e36b0f725 100644 --- a/packages/snaps-rpc-methods/package.json +++ b/packages/snaps-rpc-methods/package.json @@ -61,6 +61,7 @@ "@metamask/json-rpc-engine": "^9.0.2", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/node": "18.14.2", "@typescript-eslint/eslint-plugin": "^5.42.1", "@typescript-eslint/parser": "^5.42.1", diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json index 85c1e7daae..fee376d65d 100644 --- a/packages/snaps-sdk/package.json +++ b/packages/snaps-sdk/package.json @@ -90,6 +90,7 @@ "@metamask/eslint-config-jest": "^12.1.0", "@metamask/eslint-config-nodejs": "^12.1.0", "@metamask/eslint-config-typescript": "^12.1.0", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@typescript-eslint/eslint-plugin": "^5.42.1", "@typescript-eslint/parser": "^5.42.1", diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json index 5e1ff69bc6..2f6558b09a 100644 --- a/packages/snaps-simulator/package.json +++ b/packages/snaps-simulator/package.json @@ -75,6 +75,7 @@ "@redux-saga/symbols": "^1.1.3", "@swc/core": "1.3.78", "@testing-library/react": "^14.0.0", + "@ts-bridge/cli": "^0.4.3", "@types/express": "^4.17.17", "@types/he": "^1.2.3", "@types/jest": "^27.5.1", diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json index 4badec8b0a..b74a4e67f8 100644 --- a/packages/snaps-utils/package.json +++ b/packages/snaps-utils/package.json @@ -99,6 +99,7 @@ "@metamask/post-message-stream": "^8.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@types/mocha": "^10.0.1", "@types/node": "18.14.2", diff --git a/packages/snaps-utils/src/eval.ts b/packages/snaps-utils/src/eval.ts index 5bd19605fe..a583091dca 100644 --- a/packages/snaps-utils/src/eval.ts +++ b/packages/snaps-utils/src/eval.ts @@ -31,7 +31,7 @@ export async function evalBundle(bundlePath: string): Promise { await validateFilePath(bundlePath); return new Promise((resolve, reject) => { - const worker = fork(join(__dirname, 'eval-worker.js'), [bundlePath], { + const worker = fork(join(__dirname, 'eval-worker.cjs'), [bundlePath], { // To avoid printing the output of the worker to the console, we set // `stdio` to `pipe` and handle the output ourselves. stdio: 'pipe', diff --git a/packages/snaps-webpack-plugin/package.json b/packages/snaps-webpack-plugin/package.json index 82f9883d88..68a963bb6b 100644 --- a/packages/snaps-webpack-plugin/package.json +++ b/packages/snaps-webpack-plugin/package.json @@ -59,6 +59,7 @@ "@metamask/eslint-config-typescript": "^12.1.0", "@swc/core": "1.3.78", "@swc/jest": "^0.2.26", + "@ts-bridge/cli": "^0.4.3", "@types/jest": "^27.5.1", "@types/webpack-sources": "^3.2.0", "@typescript-eslint/eslint-plugin": "^5.42.1", diff --git a/yarn.lock b/yarn.lock index a0c734d7da..735109df6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4046,6 +4046,7 @@ __metadata: "@metamask/snaps-utils": "workspace:^" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@types/node": "npm:18.14.2" "@types/yargs": "npm:^17.0.24" @@ -4411,6 +4412,7 @@ __metadata: "@metamask/eslint-config-jest": "npm:^12.1.0" "@metamask/eslint-config-nodejs": "npm:^12.1.0" "@metamask/eslint-config-typescript": "npm:^12.1.0" + "@ts-bridge/cli": "npm:^0.4.3" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" "@typescript-eslint/parser": "npm:^5.42.1" depcheck: "npm:^1.4.7" @@ -5256,6 +5258,7 @@ __metadata: "@metamask/snaps-utils": "workspace:^" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/browserify": "npm:^12.0.37" "@types/convert-source-map": "npm:^1.5.2" "@types/jest": "npm:^27.5.1" @@ -5309,6 +5312,7 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/browserify": "npm:^12.0.37" "@types/jest": "npm:^27.5.1" "@types/node": "npm:18.14.2" @@ -5406,6 +5410,7 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/chrome": "npm:^0.0.237" "@types/concat-stream": "npm:^2.0.0" "@types/gunzip-maybe": "npm:^1.4.0" @@ -5496,6 +5501,7 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/express": "npm:^4.17.17" "@types/jest": "npm:^27.5.1" "@types/node": "npm:18.14.2" @@ -5579,6 +5585,7 @@ __metadata: "@reduxjs/toolkit": "npm:^1.9.5" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@types/mime": "npm:^3.0.0" "@types/semver": "npm:^7.5.0" @@ -5635,6 +5642,7 @@ __metadata: "@rollup/plugin-virtual": "npm:^2.1.0" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" "@typescript-eslint/parser": "npm:^5.42.1" @@ -5679,6 +5687,7 @@ __metadata: "@noble/hashes": "npm:^1.3.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/node": "npm:18.14.2" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" "@typescript-eslint/parser": "npm:^5.42.1" @@ -5715,6 +5724,7 @@ __metadata: "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.2.1" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@typescript-eslint/eslint-plugin": "npm:^5.42.1" "@typescript-eslint/parser": "npm:^5.42.1" @@ -5775,6 +5785,7 @@ __metadata: "@reduxjs/toolkit": "npm:^1.9.5" "@swc/core": "npm:1.3.78" "@testing-library/react": "npm:^14.0.0" + "@ts-bridge/cli": "npm:^0.4.3" "@types/express": "npm:^4.17.17" "@types/he": "npm:^1.2.3" "@types/jest": "npm:^27.5.1" @@ -5876,6 +5887,7 @@ __metadata: "@scure/base": "npm:^1.1.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@types/mocha": "npm:^10.0.1" "@types/node": "npm:18.14.2" @@ -5945,6 +5957,7 @@ __metadata: "@metamask/utils": "npm:^9.2.1" "@swc/core": "npm:1.3.78" "@swc/jest": "npm:^0.2.26" + "@ts-bridge/cli": "npm:^0.4.3" "@types/jest": "npm:^27.5.1" "@types/webpack-sources": "npm:^3.2.0" "@typescript-eslint/eslint-plugin": "npm:^5.42.1"