Skip to content

Commit

Permalink
Merge pull request #101 from shapeshift/gap-audit-revisions
Browse files Browse the repository at this point in the history
  • Loading branch information
pastaghost authored Aug 31, 2023
2 parents 32d2f43 + 696e948 commit cd69461
Show file tree
Hide file tree
Showing 76 changed files with 5,184 additions and 2,034 deletions.
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

119 changes: 82 additions & 37 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,55 +1,100 @@
{
"parser": "@typescript-eslint/parser",
"root": true,
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"airbnb",
"plugin:prettier/recommended",
"react-app",
"react-app/jest",
"plugin:jsx-a11y/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"ignorePatterns": [
"build",
"dist",
"coverage",
"generated",
"node_modules",
"__mocks__"
],
"plugins": [
"@typescript-eslint",
"prettier"
"prettier",
"simple-import-sort"
],
"parserOptions": {
"sourceType": "module"
},
"env": {
"browser": true,
"jest/globals": true
},
"rules": {
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/no-unused-vars": "error",
"default-case": "error",
"import/first": "error",
"import/newline-after-import": "error",
"import/no-default-export": "error",
"import/no-duplicates": "error",
"jsx-a11y/alt-text": "error",
"jsx-a11y/no-autofocus": "off",
"no-console": [
"@typescript-eslint/no-unused-vars": "error",
"prettier/prettier": [
"error",
{
"allow": [
"warn",
"error",
"info",
"group",
"groupEnd"
]
"printWidth": 100,
"endOfLine": "lf",
"tabWidth": 2,
"useTabs": false,
"singleQuote": true,
"semi": false,
"arrowParens": "avoid",
"jsxSingleQuote": true,
"trailingComma": "all"
}
],
"object-shorthand": "error",
"prettier/prettier": [
"default-case": "error",
"import/no-default-export": "error",
"simple-import-sort/imports": [
"error",
{
"arrowParens": "avoid",
"endOfLine": "lf",
"jsxSingleQuote": true,
"printWidth": 100,
"semi": false,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": false
"groups": [
[
"^\\u0000"
],
[
"^@?\\w",
"^assets(/.*|$)",
"^components(/.*|$)",
"^context(/.*|$)",
"^hooks(/.*|$)",
"^jest(/.*|$)",
"^lib(/.*|$)",
"^pages(/.*|$)",
"^services(/.*|$)",
"^state(/.*|$)",
"^theme(/.*|$)",
"^types(/.*|$)"
],
[
"^\\."
]
]
}
],
"simple-import-sort/exports": "error",
"simple-import-sort/imports": "error"
}
}
"object-shorthand": "error",
"eqeqeq": "error",
"react-hooks/exhaustive-deps": "error",
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-type-imports": "error",
"react/jsx-handler-names": "error",
"require-await": "error",
"import/no-duplicates": "error"
},
"overrides": [
{
"files": ["**/*.stories.*"],
"rules": {
"import/no-anonymous-default-export": "off"
}
},
{
"files": ["**/__tests__/mockData/*.ts"],
"rules": {
"import/no-default-export": "off",
"import/no-anonymous-default-export": "off"
}
}
]
}
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# chore(common): run linter (https://github.com/shapeshift/metamask-snaps/pull/101/)
2ff5aea7c696f5c80d1b635eefb7ac5b1554ab61
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ logFilters:

nodeLinker: node-modules

npmRegistryServer: "https://registry.npmjs.org"

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
Expand Down
8 changes: 8 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"packages": [
"packages/*"
],
"version": "1.0.0-alpha.21",
"useWorkspaces": true,
"npmClient": "yarn"
}
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"dev:sandbox": "concurrently --prefix \"{time}-[{name}]\" --names \"ADAPTER,SANDBOX,SNAP,TYPES\" -c \"bgBlue.bold,bgMagenta.bold\" \"cd packages/adapter && yarn dev\" \"cd packages/sandbox && yarn dev\" \"cd packages/snap && yarn dev\" \"cd packages/types && yarn dev\"",
"demo": "concurrently --prefix \"{time}-[{name}]\" --names \"SANDBOX,SNAP\" -c \"bgBlue.bold,bgMagenta.bold\" \"cd packages/sandbox && yarn dev\" \"cd packages/snap && yarn serve\"",
"link-packages": "./scripts/link-packages.sh",
"lint:fix": "yarn workspaces foreach --verbose --parallel run lint:fix",
"lint": "yarn workspaces foreach --verbose --parallel run lint",
"lint:fix": "yarn lint --fix",
"lint": "yarn eslint --cache '*/**/*.{ts,tsx}'",
"release": "yarn workspaces foreach run semantic-release -e semantic-release-monorepo",
"test": "yarn workspaces foreach --verbose --parallel run test",
"unlink-packages": "./scripts/unlink-packages.sh",
Expand Down Expand Up @@ -66,10 +66,11 @@
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-simple-import-sort": "^7.0.0",
"lerna": "^4.0.0",
"mkdirp": "^1.0.4",
"prettier": "^2.7.1",
"prettier-package-json": "^2.6.4",
"prettier-plugin-packagejson": "^2.2.18",
"prettier": "^2.8.8",
"prettier-package-json": "^2.8.0",
"prettier-plugin-packagejson": "^2.4.5",
"rimraf": "^3.0.2",
"semantic-release": "^19.0.5",
"semantic-release-monorepo": "^7.0.5",
Expand All @@ -83,8 +84,7 @@
"node": ">=16.0.0"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
"access": "public"
},
"resolutions": {
"libsodium-wrappers": "patch:libsodium-wrappers@npm:0.7.10#.yarn/patches/libsodium-wrappers-npm-0.7.10-1e41dfad84.patch",
Expand Down Expand Up @@ -113,6 +113,7 @@
},
"dependencies": {
"@shapeshiftoss/caip": "^8.15.0",
"@ungap/url-search-params": "^0.2.2"
"@ungap/url-search-params": "^0.2.2",
"patch-package": "^6.2.2"
}
}
58 changes: 0 additions & 58 deletions packages/adapter/.eslintrc

This file was deleted.

34 changes: 19 additions & 15 deletions packages/adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/metamask-snaps-adapter",
"version": "1.0.0",
"version": "1.0.0-alpha.21",
"description": "",
"author": "pastaghost <pastaghost@2520.io> (http://www.github.com/pastaghost)",
"homepage": "https://github.com/shapeshift/metamask-snaps/tree/main/packages/adapter",
Expand All @@ -25,11 +25,11 @@
"dependencies": {
"@ethersproject/providers": "^5.7.2",
"@metamask/detect-provider": "^2.0.0",
"@metamask/snaps-ui": "0.32.2",
"@shapeshiftoss/hdwallet-core": "^1.29.0",
"@metamask/snaps-ui": "1.0.1",
"@shapeshiftoss/hdwallet-core": "^1.50.4",
"@shapeshiftoss/logger": "^1.1.3",
"@shapeshiftoss/metamask-snaps": "workspace:^",
"@shapeshiftoss/metamask-snaps-types": "workspace:^"
"@shapeshiftoss/metamask-snaps": "^1.0.0-alpha.21",
"@shapeshiftoss/metamask-snaps-types": "^1.0.0-alpha.21"
},
"peerDependencies": {
"@shapeshiftoss/caip": "*",
Expand All @@ -40,23 +40,27 @@
},
"devDependencies": {
"@types/node": "^18.7.8",
"eslint": "^8.22.0",
"eslint": "^8.47.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^26.8.7",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^26.9.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-simple-import-sort": "^7.0.0",
"prettier": "^2.7.1",
"prettier-package-json": "^2.6.4",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-simple-import-sort": "^10.0.0",
"prettier": "^2.8.8",
"prettier-package-json": "^2.8.0",
"rimraf": "^3.0.2",
"ts-node": "^10.9.1",
"tslib": "^2.4.0",
"typescript": "^4.7.4"
},
"publishConfig": {
"access": "public"
},
"gitHead": "54beb75f060ee91836861205eaaf04226f40a326",
"installConfig": {
"hoistingLimits": "dependencies"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/binance/binance.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
BinanceBroadcastTransactionAdapterParams,
BinanceBroadcastTransactionResponse,
BinanceGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/cosmos/cosmos.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
CosmosBroadcastTransactionAdapterParams,
CosmosBroadcastTransactionResponse,
CosmosGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/kava/kava.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
KavaBroadcastTransactionAdapterParams,
KavaBroadcastTransactionResponse,
KavaGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/osmosis/osmosis.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
OsmosisBroadcastTransactionAdapterParams,
OsmosisBroadcastTransactionResponse,
OsmosisGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/secret/secret.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
SecretBroadcastTransactionAdapterParams,
SecretBroadcastTransactionResponse,
SecretGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/terra/terra.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
TerraBroadcastTransactionAdapterParams,
TerraBroadcastTransactionResponse,
TerraGetAddressAdapterParams,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/src/cosmossdk/thorchain/thorchain.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {
import type {
ThorchainBroadcastTransactionAdapterParams,
ThorchainBroadcastTransactionResponse,
ThorchainGetAddressAdapterParams,
Expand Down
Loading

0 comments on commit cd69461

Please sign in to comment.