Merge remote-tracking branch 'upstream/develop' into feat/moonriver

Author: developerfred

.eslintrc.json

@@ -3,7 +3,6 @@
         "ecmaVersion": 2020,
         "sourceType": "module"
     },
-    "extends": ["plugin:prettier/recommended"],
     "env": {
         "node": true
     },

.github/workflows/linters.yml

@@ -90,7 +90,11 @@ jobs:
           node-version: "16"
           cache: "pnpm"
       - run: pnpm install
-      - run: pnpm run lint:ci
+      - name: Run Eslint
+        run: |
+          # report to stdio and to file, it's cached, the second run should be fast
+          pnpm run lint:ci
+          pnpm run lint:ci-report
       - name: Upload eslint report
         uses: actions/upload-artifact@v2
         with:

.i18n-codegen.json

@@ -38,6 +38,18 @@
                 "sourceMap": "inline"
             }
         },
+        {
+            "input": "./packages/shared-base-ui/src/locales/en-US.json",
+            "output": "./packages/shared-base-ui/src/locales/i18n_generated",
+            "parser": "i18next",
+            "generator": {
+                "type": "i18next/react-hooks",
+                "hooks": "useSharedBaseI18N",
+                "namespace": "shareBase",
+                "trans": "SharedBaseTrans",
+                "sourceMap": "inline"
+            }
+        },
         {
             "input": "./packages/dashboard/src/locales/en-US.json",
             "output": "./packages/dashboard/src/locales/i18n_generated",

cspell.json

@@ -79,6 +79,7 @@
         "elec",
         "encryptedmsg",
         "endregion",
+        "enhanceable",
         "ethersphere",
         "ethersproject",
         "eustatius",
@@ -152,8 +153,8 @@
         "monofont",
         "monospace",
         "mooniswap",
-        "Moonriver",
-        "MOVR",
+        "moonriver",
+        "movr",
         "msgpack",
         "mska",
         "mskb",
@@ -268,6 +269,7 @@
         "xlarge",
         "xlink",
         "zerion",
+        "zora",
         "zubin"
     ],
     "ignoreWords": [

docs/rfc/000-Payload-v37.md

@@ -91,8 +91,7 @@ enum PublicKeyAlgorithmEnum {
 
 This field represents the format version.
 
-The first and the current binary version is `-37`.
-The implementation MUST fail when the version is less than `-37` (e.g. `-38`).
+The first and the current binary version is `0`.
 
 #### `authorNetwork` field
 

package.json

@@ -18,34 +18,36 @@
     "build": "build",
     "build-ios": "build --preset iOS",
     "lint": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache --fix",
-    "lint:ci": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache --format=junit --output-file=reports/junit/eslint-results.xml",
+    "lint:ci": "eslint -c packages/.eslintrc.json packages --ext .ts,.tsx,.js --cache",
+    "lint:ci-report": "pnpm lint:ci -- --format=junit --output-file=reports/junit/eslint-results.xml",
     "postinstall": "patch-package",
     "prepare": "husky install",
     "test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
+    "test:update": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js -u",
     "spellcheck": "cspell lint --no-must-find-files"
   },
   "dependencies": {
     "@dimensiondev/kit": "0.0.0-20220223101101-4e6f3b9",
     "@emotion/cache": "^11.7.1",
-    "@emotion/react": "^11.8.1",
+    "@emotion/react": "^11.8.2",
     "@emotion/serialize": "^1.0.2",
     "@emotion/styled": "^11.8.1",
     "@emotion/utils": "^1.1.0",
-    "@mui/icons-material": "5.4.4",
-    "@mui/lab": "5.0.0-alpha.71",
-    "@mui/material": "5.4.4",
-    "@mui/system": "5.4.4",
+    "@mui/icons-material": "5.5.0",
+    "@mui/lab": "5.0.0-alpha.72",
+    "@mui/material": "5.5.0",
+    "@mui/system": "5.5.0",
     "@types/masknet__global-types": "workspace:*",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "17.0.11",
-    "@types/web": "^0.0.54",
-    "i18next": "^21.6.13",
+    "@types/react": "^17.0.40",
+    "@types/react-dom": "17.0.13",
+    "@types/web": "^0.0.55",
+    "i18next": "^21.6.14",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "lodash-unified": "1.0.2",
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0",
-    "react-i18next": "^11.15.5",
+    "react": "18.0.0-rc.2",
+    "react-dom": "18.0.0-rc.2",
+    "react-i18next": "^11.15.6",
     "ts-results": "3.3.0",
     "web3-core": "1.5.2",
     "web3-core-method": "1.5.2"
@@ -62,28 +64,26 @@
     "@nice-labs/git-rev": "^3.5.0",
     "@swc/core": "^1.2.148",
     "@types/lodash-es": "^4.17.6",
-    "@typescript-eslint/experimental-utils": "^5.13.0",
+    "@typescript-eslint/experimental-utils": "^5.14.0",
     "cspell": "^5.18.5",
     "eslint": "8.10.0",
-    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.3",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-unicorn": "^41.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "gulp": "^4.0.2",
     "husky": "^7.0.4",
     "jest": "^28.0.0-alpha.3",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^12.3.5",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.3",
-    "ts-node": "^10.6.0",
+    "ts-node": "^10.7.0",
     "typescript": "4.6.2"
   },
   "pnpm": {
     "overrides": {
-      "@types/node": "^17.0.17"
+      "@types/node": "^17.0.21"
     },
     "onlyBuiltDependencies": []
   }

packages/.eslintrc.json

@@ -50,7 +50,7 @@
         "react/self-closing-comp": ["warn", { "component": true, "html": true }],
         "react-hooks/exhaustive-deps": "off",
         "react-hooks/rules-of-hooks": "error",
-        "import/no-deprecated": "error",
+        "import/no-deprecated": "off",
         "import/no-duplicates": "error",
         "unicorn/better-regex": "error",
         "unicorn/catch-error-name": ["error", { "ignore": ["^err$"] }],
@@ -65,7 +65,6 @@
         "unicorn/prefer-number-properties": "error",
         "unicorn/relative-url-style": ["error", "always"],
         "unicorn/throw-new-error": "error",
-        "unused-imports/no-unused-imports-ts": "error",
         "@dimensiondev/no-jsx-template-literal": "error",
         "@dimensiondev/no-locale-case": "error",
         "@dimensiondev/no-number-constructor": "off",

packages/dashboard/package.json

@@ -20,16 +20,17 @@
     "@masknet/public-api": "workspace:*",
     "@masknet/shared": "workspace:*",
     "@masknet/shared-base": "workspace:*",
+    "@masknet/shared-base-ui": "workspace:*",
     "@masknet/storybook-shared": "workspace:*",
     "@masknet/theme": "workspace:*",
+    "@masknet/web3-providers": "workspace:*",
     "@masknet/web3-shared-base": "workspace:*",
     "@masknet/web3-shared-evm": "workspace:*",
-    "@masknet/web3-providers": "workspace:*",
     "@msgpack/msgpack": "^2.7.2",
     "@servie/events": "^3.0.0",
     "@types/color": "^3.0.3",
     "@types/react-avatar-editor": "^10.3.6",
-    "async-call-rpc": "^6.0.1",
+    "async-call-rpc": "^6.0.2",
     "bignumber.js": "^9.0.2",
     "classnames": "^2.3.1",
     "color": "^4.2.1",

packages/dashboard/src/components/DashboardFrame/Navigation.tsx

@@ -5,8 +5,6 @@ import {
     ListItemIcon,
     Collapse,
     Theme,
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     useMediaQuery,
     styled,
     listItemClasses,
@@ -122,8 +120,6 @@ export function Navigation({ onClose }: NavigationProps) {
     const isWalletTransferPath = useMatch(DashboardRoutes.WalletsTransfer)
     const isWalletHistoryPath = useMatch(DashboardRoutes.WalletsHistory)
 
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     const isLargeScreen = useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
     const t = useDashboardI18N()
     const mode = useTheme().palette.mode

packages/dashboard/src/components/DashboardFrame/index.tsx

@@ -1,9 +1,7 @@
 import { memo, Suspense, useMemo, useState } from 'react'
-// see https://github.com/import-js/eslint-plugin-import/issues/2288
-// eslint-disable-next-line import/no-deprecated
 import { Grid, styled, Theme, useMediaQuery } from '@mui/material'
 import { MaskColorVar } from '@masknet/theme'
-import { ErrorBoundary } from '@masknet/shared'
+import { ErrorBoundary } from '@masknet/shared-base-ui'
 import { DashboardContext } from './context'
 import { Navigation } from './Navigation'
 import { NavigationVersionFooter } from '../NavigationVersionFooter'
@@ -27,8 +25,6 @@ const LeftContainer = styled(Grid)(({ theme }) => ({
 export interface DashboardFrameProps extends React.PropsWithChildren<{}> {}
 
 export const DashboardFrame = memo((props: DashboardFrameProps) => {
-    // see https://github.com/import-js/eslint-plugin-import/issues/2288
-    // eslint-disable-next-line import/no-deprecated
     const isLargeScreen = useMediaQuery<Theme>((theme) => theme.breakpoints.up('lg'))
     const [navigationExpanded, setNavigationExpanded] = useState(true)
     const [drawerOpen, setDrawerOpen] = useState(false)