Bump @metamask/utils to 3.3.0 (#906)

MetaMask · Nov 3, 2022 · 554f3b4 · 554f3b4
1 parent 1d06db0
commit 554f3b4
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 155 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -48,7 +48,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@metamask/snap-utils": "^0.22.3",
     "@metamask/snaps-browserify-plugin": "^0.22.3",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "babelify": "^10.0.0",
     "browserify": "^17.0.0",
     "chokidar": "^3.5.2",

diff --git a/packages/controllers/package.json b/packages/controllers/package.json
@@ -39,7 +39,7 @@
     "@metamask/rpc-methods": "^0.22.3",
     "@metamask/snap-types": "^0.22.3",
     "@metamask/snap-utils": "^0.22.3",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "@xstate/fsm": "^2.0.0",
     "concat-stream": "^2.0.0",
     "cron-parser": "^4.5.0",

diff --git a/packages/examples/examples/insights/package.json b/packages/examples/examples/insights/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@metamask/abi-utils": "^1.0.0",
-    "@metamask/utils": "^3.2.0"
+    "@metamask/utils": "^3.3.0"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^2.0.3",

diff --git a/packages/examples/examples/insights/snap.manifest.json b/packages/examples/examples/insights/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps-monorepo.git"
   },
   "source": {
-    "shasum": "l3QRoIUw1LSiuN1Y3bl88eqWDj3pc6AL5Wwp/j+ClhA=",
+    "shasum": "rWNQVlpSAlUXVByhpVyXxvNRTwEfabK4vS2MU6ANNwc=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/execution-environments/package.json b/packages/execution-environments/package.json
@@ -35,12 +35,12 @@
     "@metamask/providers": "^9.0.0",
     "@metamask/snap-types": "^0.22.3",
     "@metamask/snap-utils": "^0.22.3",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "eth-rpc-errors": "^4.0.3",
     "pump": "^3.0.0",
     "ses": "^0.15.15",
     "stream-browserify": "^3.0.0",
-    "superstruct": "^0.16.5"
+    "superstruct": "^0.16.7"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^2.0.3",

diff --git a/packages/execution-environments/src/common/validation.ts b/packages/execution-environments/src/common/validation.ts
@@ -1,4 +1,4 @@
-import { assertStruct, ChainIdStruct, HandlerType } from '@metamask/snap-utils';
+import { ChainIdStruct, HandlerType } from '@metamask/snap-utils';
 import { SnapKeyring } from '@metamask/snap-types';
 import {
   array,
@@ -17,6 +17,7 @@ import {
   unknown,
 } from 'superstruct';
 import {
+  assertStruct,
   Json,
   JsonRpcIdStruct,
   JsonRpcRequestStruct,

diff --git a/packages/plugin-webpack/package.json b/packages/plugin-webpack/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@metamask/snap-utils": "^0.22.3",
-    "@metamask/utils": "^3.2.0",
+    "@metamask/utils": "^3.3.0",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {

diff --git a/packages/provider/package.json b/packages/provider/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metamask/snap-types": "^0.22.3",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "nanoid": "^3.1.31"
   },
   "devDependencies": {

diff --git a/packages/rpc-methods/package.json b/packages/rpc-methods/package.json
@@ -30,10 +30,10 @@
     "@metamask/key-tree": "^5.0.2",
     "@metamask/snap-utils": "^0.22.3",
     "@metamask/types": "^1.1.0",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "eth-rpc-errors": "^4.0.2",
     "nanoid": "^3.1.31",
-    "superstruct": "^0.16.5"
+    "superstruct": "^0.16.7"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^2.0.3",

diff --git a/packages/utils/jest.config.js b/packages/utils/jest.config.js
@@ -15,10 +15,10 @@ module.exports = {
   coverageReporters: ['clover', 'json', 'lcov', 'text', 'json-summary'],
   coverageThreshold: {
     global: {
-      branches: 88.47,
-      functions: 98.21,
-      lines: 97.8,
-      statements: 97.84,
+      branches: 88.1,
+      functions: 98.18,
+      lines: 97.75,
+      statements: 97.8,
     },
   },
   moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node'],

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -53,7 +53,7 @@
     "@babel/core": "^7.18.6",
     "@babel/types": "^7.18.7",
     "@metamask/snap-types": "^0.22.3",
-    "@metamask/utils": "^3.1.0",
+    "@metamask/utils": "^3.3.0",
     "@noble/hashes": "^1.1.3",
     "@scure/base": "^1.1.1",
     "cron-parser": "^4.5.0",
@@ -62,7 +62,7 @@
     "rfdc": "^1.3.0",
     "semver": "^7.3.7",
     "ses": "^0.15.17",
-    "superstruct": "^0.16.5"
+    "superstruct": "^0.16.7"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^2.0.3",

diff --git a/packages/utils/src/assert.test.ts b/packages/utils/src/assert.test.ts
diff --git a/packages/utils/src/assert.ts b/packages/utils/src/assert.ts
diff --git a/packages/utils/src/index.browser.ts b/packages/utils/src/index.browser.ts
@@ -1,4 +1,3 @@
-export * from './assert';
 export * from './caveats';
 export * from './deep-clone';
 export * from './default-endowments';

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -1,4 +1,3 @@
-export * from './assert';
 export * from './caveats';
 export * from './cronjob';
 export * from './deep-clone';

diff --git a/packages/utils/src/namespace.ts b/packages/utils/src/namespace.ts
@@ -13,8 +13,11 @@ import {
   partial,
   pick,
 } from 'superstruct';
-import { JsonRpcRequestStruct } from '@metamask/utils';
-import { AssertionErrorConstructor, assertStruct } from './assert';
+import {
+  JsonRpcRequestStruct,
+  AssertionErrorConstructor,
+  assertStruct,
+} from '@metamask/utils';
 
 export const CHAIN_ID_REGEX =
   /^(?<namespace>[-a-z0-9]{3,8}):(?<reference>[-a-zA-Z0-9]{1,32})$/u;

diff --git a/packages/utils/src/notification.ts b/packages/utils/src/notification.ts
@@ -1,6 +1,6 @@
 import { Infer, is, literal, object, string, unknown } from 'superstruct';
+import { assertStruct } from '@metamask/utils';
 import { ChainIdStruct } from './namespace';
-import { assertStruct } from './assert';
 
 export const EventStruct = object({
   name: string(),

diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
@@ -2,7 +2,7 @@ import {
   SnapFunctionExports,
   SnapKeyring as Keyring,
 } from '@metamask/snap-types';
-import { Json } from '@metamask/utils';
+import { Json, assertStruct } from '@metamask/utils';
 import {
   any,
   Infer,
@@ -19,7 +19,6 @@ import {
   union,
 } from 'superstruct';
 import { valid as validSemver } from 'semver';
-import { assertStruct } from './assert';
 
 export enum NpmSnapFileNames {
   PackageJson = 'package.json',