GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yarn -> pnpm

Browse Source
This commit is contained in:
fmtabbara
2024-06-28 11:44:32 +01:00
parent 8ee3ec2f4e
commit ceee2d4466
12 changed files with 29654 additions and 22355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+7 -24
View File
@@ -2221,7 +2221,7 @@ dependencies = [
"atomic 0.6.0",
"pear",
"serde",
"toml 0.8.14",
"toml 0.8.15",
"uncased",
"version_check",
]
@@ -4999,23 +4999,6 @@ dependencies = [
"zeroize",
]
[[package]]
name = "nym-network-statistics"
version = "1.1.34"
dependencies = [
"dirs 4.0.0",
"log",
"nym-bin-common",
"nym-statistics-common",
"nym-task",
"pretty_env_logger",
"rocket",
"serde",
"sqlx",
"thiserror",
"tokio",
]
[[package]]
name = "nym-node"
version = "1.1.4"
@@ -5054,7 +5037,7 @@ dependencies = [
"sysinfo 0.30.12",
"thiserror",
"tokio",
"toml 0.8.14",
"toml 0.8.15",
"tracing",
"url",
"zeroize",
@@ -8643,14 +8626,14 @@ dependencies = [
[[package]]
name = "toml"
version = "0.8.14"
version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.22.14",
"toml_edit 0.22.16",
]
[[package]]
@@ -8677,9 +8660,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.14"
version = "0.22.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
dependencies = [
"indexmap 2.2.6",
"serde",
explorer-nextjs/app/components/WorldMap.tsx
+33 -31
View File
@@ -1,38 +1,40 @@
'use client'
"use client";
import * as React from 'react'
import { scaleLinear } from 'd3-scale'
import * as React from "react";
import { scaleLinear } from "d3-scale";
import {
ComposableMap,
Geographies,
Geography,
Marker,
ZoomableGroup,
} from 'react-simple-maps'
import ReactTooltip from 'react-tooltip'
import { CircularProgress } from '@mui/material'
import { useTheme } from '@mui/material/styles'
import { ApiState, CountryDataResponse } from '../typeDefs/explorer-api'
import MAP_TOPOJSON from '../assets/world-110m.json'
} from "react-simple-maps";
import { Tooltip as ReactTooltip } from "react-tooltip";
import { CircularProgress } from "@mui/material";
import { useTheme } from "@mui/material/styles";
import { ApiState, CountryDataResponse } from "../typeDefs/explorer-api";
import MAP_TOPOJSON from "../assets/world-110m.json";
import "react-tooltip/dist/react-tooltip.css";
type MapProps = {
userLocation?: [number, number]
countryData?: ApiState<CountryDataResponse>
loading: boolean
}
userLocation?: [number, number];
countryData?: ApiState<CountryDataResponse>;
loading: boolean;
};
export const WorldMap: FCWithChildren<MapProps> = ({
countryData,
userLocation,
loading,
}) => {
const { palette } = useTheme()
const { palette } = useTheme();
const colorScale = React.useMemo(() => {
if (countryData?.data) {
const heighestNumberOfNodes = Math.max(
...Object.values(countryData.data).map((country) => country.nodes)
)
);
return scaleLinear<string, string>()
.domain([
0,
@@ -42,17 +44,17 @@ export const WorldMap: FCWithChildren<MapProps> = ({
heighestNumberOfNodes,
])
.range(palette.nym.networkExplorer.map.fills)
.unknown(palette.nym.networkExplorer.map.fills[0])
.unknown(palette.nym.networkExplorer.map.fills[0]);
}
return () => palette.nym.networkExplorer.map.fills[0]
}, [countryData, palette])
return () => palette.nym.networkExplorer.map.fills[0];
}, [countryData, palette]);
const [tooltipContent, setTooltipContent] = React.useState<string | null>(
null
)
);
if (loading) {
return <CircularProgress />
return <CircularProgress />;
}
return (
@@ -61,8 +63,8 @@ export const WorldMap: FCWithChildren<MapProps> = ({
data-tip=""
style={{
backgroundColor: palette.nym.networkExplorer.background.tertiary,
width: '100%',
height: 'auto',
width: "100%",
height: "auto",
}}
viewBox="0, 50, 800, 350"
projection="geoMercator"
@@ -75,7 +77,7 @@ export const WorldMap: FCWithChildren<MapProps> = ({
<Geographies geography={MAP_TOPOJSON}>
{({ geographies }) =>
geographies.map((geo) => {
const d = (countryData?.data || {})[geo.properties.ISO_A3]
const d = (countryData?.data || {})[geo.properties.ISO_A3];
return (
<Geography
key={geo.rsmKey}
@@ -84,25 +86,25 @@ export const WorldMap: FCWithChildren<MapProps> = ({
stroke={palette.nym.networkExplorer.map.stroke}
strokeWidth={0.2}
onMouseEnter={() => {
const { NAME_LONG } = geo.properties
const { NAME_LONG } = geo.properties;
if (!userLocation) {
setTooltipContent(`${NAME_LONG} | ${d?.nodes || 0}`)
setTooltipContent(`${NAME_LONG} | ${d?.nodes || 0}`);
}
}}
onMouseLeave={() => {
setTooltipContent('')
setTooltipContent("");
}}
style={{
hover:
!userLocation && countryData
? {
fill: palette.nym.highlight,
outline: 'white',
outline: "white",
}
: undefined,
}}
/>
)
);
})
}
</Geographies>
@@ -123,7 +125,7 @@ export const WorldMap: FCWithChildren<MapProps> = ({
)}
</ZoomableGroup>
</ComposableMap>
<ReactTooltip>{tooltipContent}</ReactTooltip>
<ReactTooltip id="tooltip">{tooltipContent}</ReactTooltip>
</>
)
}
);
};
explorer-nextjs/app/typings/react-tooltip.d.ts
Vendored
-1
View File
@@ -1 +0,0 @@
declare module 'react-tooltip';
explorer-nextjs/package.json
+18 -4
View File
@@ -9,17 +9,31 @@
"lint": "next lint"
},
"dependencies": {
"@nymproject/react": "^1.0.0",
"@chain-registry/types": "^0.45.9",
"@cosmos-kit/keplr-extension": "^2.12.2",
"@cosmos-kit/react": "^2.17.2",
"@mui/material": "^5.2.2",
"@mui/x-data-grid": "7.1.1",
"@mui/x-date-pickers": "7.1.1",
"@nymproject/contract-clients": "1.2.4-rc.1",
"@nymproject/nym-validator-client": "0.18.0",
"@nymproject/react": "workspace:^1.0.0",
"@types/d3-scale": "^4.0.8",
"@types/react-simple-maps": "^3.0.4",
"big.js": "^6.2.1",
"chain-registry": "^1.63.12",
"d3-scale": "^4.0.2",
"i18n-iso-countries": "^7.11.2",
"material-react-table": "^2.12.1",
"next": "14.1.4",
"react": "^18",
"react-dom": "^18",
"react-error-boundary": "^4.0.13",
"material-react-table": "^2.12.1",
"@mui/x-date-pickers": "7.1.1",
"@mui/x-data-grid": "7.1.1"
"react-simple-maps": "^3.0.0",
"react-tooltip": "^5.27.0"
},
"devDependencies": {
"@types/big.js": "^6.1.6",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
package.json
+16 -15
View File
@@ -23,26 +23,26 @@
"clean": "lerna run clean",
"build": "run-s build:types build:packages",
"build:wasm": "make sdk-wasm-build",
"build:types": "lerna run --scope @nymproject/types build --stream",
"build:types": "pnpm run --filter --stream @nymproject/types build ",
"build:packages": "run-s build:packages:theme build:packages:react",
"build:packages:theme": "lerna run --scope @nymproject/mui-theme build",
"build:packages:react": "lerna run --scope @nymproject/react build",
"build:react-example": "lerna run --scope @nymproject/react-webpack-with-theme-example build --stream",
"build:playground": "lerna run --scope @nymproject/react storybook:build --stream",
"build:ci:storybook": "yarn build && yarn dev:on && run-p build:react-example build:playground && yarn build:ci:storybook:collect-artifacts",
"build:packages:theme": "pnpm run --filter @nymproject/mui-theme build",
"build:packages:react": "pnpm run --filter @nymproject/react build",
"build:react-example": "pnpm run --filter --stream @nymproject/react-webpack-with-theme-example build ",
"build:playground": "pnpm run --filter --stream @nymproject/react storybook:build",
"build:ci:storybook": "pnpm build && pnpm dev:on && run-p build:react-example build:playground && pnpm build:ci:storybook:collect-artifacts",
"build:ci:storybook:collect-artifacts": "mkdir -p ts-packages/dist && mv sdk/typescript/packages/react-components/storybook-static ts-packages/dist/storybook && mv sdk/typescript/examples/react/mui-theme/dist ts-packages/dist/example",
"prebuild:ci": "yarn dev:on && yarn",
"prebuild:ci": "pnpm dev:on && pnpm",
"build:ci": "run-s build:types build:packages build:wasm build:ci:sdk",
"postbuild:ci": "yarn dev:off",
"build:ci:sdk": "lerna run --scope '{@nymproject/sdk,@nymproject/node-tester,@nymproject/contract-clients,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build --stream",
"postbuild:ci": "pnpm dev:off",
"build:ci:sdk": "pnpm run --fitler --stream '{@nymproject/sdk,@nymproject/node-tester,@nymproject/contract-clients,@nymproject/sdk-react,@nymproject/mix-fetch,@nymproject/nodejs-client,@nymproject/mix-fetch-node}' build",
"docs:prod:build": "run-s docs:prod:build:ws",
"docs:prod:build:ws": "lerna run docs:prod:build --stream",
"docs:prod:build:ws": "pnpm run --stream docs:prod:build",
"sdk:build": "./sdk/typescript/scripts/build-prod-sdk.sh",
"sdk:publish": "./sdk/typescript/scripts/publish.sh",
"lint": "lerna run lint --stream",
"lint:fix": "lerna run lint:fix --stream",
"tsc": "lerna run tsc --stream",
"types:lint:fix": "lerna run lint:fix --scope @nymproject/types --scope @nymproject/nym-wallet-app",
"lint": "pnpm run --stream lint",
"lint:fix": "pnpm run --stream lint:fix",
"tsc": "pnpm run --stream tsc",
"types:lint:fix": "pnpm run lint:fix --filter @nymproject/types --filter @nymproject/nym-wallet-app",
"audit:fix": "npm_config_yes=true npx yarn-audit-fix -- --dry-run",
"dev:on": "node sdk/typescript/scripts/dev-mode-add.mjs",
"dev:off": "node sdk/typescript/scripts/dev-mode-remove.mjs"
@@ -53,5 +53,6 @@
"@npmcli/node-gyp": "^3.0.0",
"node-gyp": "^9.3.1",
"tslog": "3.3.3"
}
},
"packageManager": "pnpm@9.4.0+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74"
}
pnpm-lock.yaml
Generated
+29560
View File
File diff suppressed because it is too large Load Diff
pnpm-workspace.yaml
+12
View File
@@ -0,0 +1,12 @@
packages:
- "dist/wasm/**"
- "dist/node/**"
- "dist/ts/**"
- "sdk/typescript/packages/mui-theme"
- "sdk/typescript/packages/react-components"
- "sdk/typescript/packages/validator-client"
- "ts-packages/*"
- "nym-wallet"
- "explorer-nextjs"
- "types"
- "clients/validator"
sdk/typescript/packages/mui-theme/package.json
+1 -1
View File
@@ -11,7 +11,7 @@
"@mui/styles": "^5.2.2"
},
"devDependencies": {
"@nymproject/eslint-config-react-typescript": "^1.0.0",
"@nymproject/eslint-config-react-typescript": "workspace: jnshhbwshsbsjZ hb ^1.0.0",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.13.0",
"eslint": "^8.10.0",
sdk/typescript/packages/react-components/package.json
+5 -4
View File
@@ -29,11 +29,11 @@
"@mui/material": ">= 5",
"@mui/styles": ">= 5",
"@mui/system": ">= 5",
"@nymproject/mui-theme": "1",
"@nymproject/mui-theme": "workspace:1",
"@nymproject/nym-validator-client": "^0.18.0",
"@nymproject/types": "1",
"base58": "4",
"@nymproject/types": "workspace:1",
"bech32": "^1.1.4",
"bs58": "4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"zxcvbn": "^4.4.2"
@@ -45,7 +45,7 @@
},
"devDependencies": {
"@babel/core": "^7.17.5",
"@nymproject/eslint-config-react-typescript": "^1.0.0",
"@nymproject/eslint-config-react-typescript": "workspace:^1.0.0",
"@storybook/addon-actions": "^6.5.8",
"@storybook/addon-essentials": "^6.5.8",
"@storybook/addon-interactions": "^6.5.8",
@@ -58,6 +58,7 @@
"@types/flat": "^5.0.2",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"@types/zxcvbn": "^4.4.1",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.13.0",
"babel-loader": "^8.2.3",
sdk/typescript/packages/validator-client/package.json
+1 -1
View File
@@ -34,7 +34,7 @@
"@cosmjs/stargate": "^0.29.5",
"@cosmjs/tendermint-rpc": "^0.29.5",
"@favware/rollup-type-bundler": "^2.0.0",
"@nymproject/types": "^1.0.0",
"@nymproject/types": "workspace:^1.0.0",
"@rollup/plugin-commonjs": "^24.0.1",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
ts-packages/types/package.json
+1 -1
View File
@@ -10,7 +10,7 @@
"bech32": "^1.1.4"
},
"devDependencies": {
"@nymproject/eslint-config-react-typescript": "^1.0.0",
"@nymproject/eslint-config-react-typescript": "workspace:1.0.0",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.13.0",
"eslint": "^8.10.0",
yarn.lock
-22273
View File
File diff suppressed because it is too large Load Diff