* Bump deps

* Additional deps

* (some) fixes

* Additional
This commit is contained in:
Jaco 2023-08-19 12:14:57 +03:00 committed by GitHub
parent 8217ed8437
commit f48ac48b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 5074 additions and 3037 deletions

View File

@ -69,15 +69,14 @@
"devDependencies": {
"@crustio/crust-pin": "^1.0.0",
"@pinata/sdk": "^1.2.1",
"@polkadot/dev": "^0.76.16",
"@polkadot/dev": "^0.76.17",
"@types/chart.js": "^2.9.37",
"@types/file-saver": "^2.0.5",
"@types/react-beautiful-dnd": "^13.1.4",
"@types/react-copy-to-clipboard": "^5.0.4",
"@types/react-dom": "^18.2.5",
"@types/react-dom": "^18.2.7",
"@types/react-router-dom": "^5.3.3",
"@types/store": "^2.0.2",
"@types/styled-components": "^5.1.26",
"@types/styled-theming": "^2.2.5",
"concurrently": "^8.2.0",
"devtron": "^1.4.0",
@ -90,8 +89,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"source-map-explorer": "^2.5.3",
"styled-components": "^5.3.11"
"source-map-explorer": "^2.5.3"
},
"resolutions": {
"@polkadot/api": "^10.9.1",
@ -122,7 +120,6 @@
"@polkadot/x-textdecoder": "^12.4.1",
"@polkadot/x-textencoder": "^12.4.1",
"@polkadot/x-ws": "^12.4.1",
"styled-components": "^5.3.1",
"typescript": "^5.1.6"
}
}

View File

@ -16,7 +16,7 @@
"version": "0.132.2-56-x",
"main": "index.js",
"dependencies": {
"@acala-network/type-definitions": "5.1.1",
"@acala-network/type-definitions": "5.1.2",
"@bifrost-finance/type-definitions": "1.8.4",
"@crustio/type-definitions": "1.3.0",
"@darwinia/types": "2.8.10",
@ -26,14 +26,14 @@
"@edgeware/node-types": "3.6.2-wako",
"@equilab/definitions": "1.4.18",
"@fragnova/api-augment": "0.1.0-spec-1.0.4-mainnet",
"@frequency-chain/api-augment": "1.7.0-rc1",
"@interlay/interbtc-types": "1.12.0",
"@frequency-chain/api-augment": "1.7.4",
"@interlay/interbtc-types": "1.13.0",
"@kiltprotocol/type-definitions": "0.33.1",
"@laminar/type-definitions": "0.3.1",
"@logion/node-api": "0.16.0",
"@logion/node-api": "0.19.0-2",
"@mangata-finance/type-definitions": "^1.0.0",
"@metaverse-network-sdk/type-definitions": "0.0.1-16",
"@parallel-finance/type-definitions": "1.7.17",
"@parallel-finance/type-definitions": "2.0.0",
"@peaqnetwork/type-definitions": "0.0.4",
"@phala/typedefs": "0.2.33",
"@polkadot/api": "^10.9.1",
@ -46,19 +46,19 @@
"@polkadot/wasm-util": "^7.2.2",
"@polkadot/x-fetch": "^12.4.1",
"@polkadot/x-ws": "^12.4.1",
"@polymeshassociation/polymesh-types": "5.4.1",
"@polymeshassociation/polymesh-types": "5.5.2",
"@snowfork/snowbridge-types": "0.2.7",
"@sora-substrate/type-definitions": "1.17.16",
"@sora-substrate/type-definitions": "1.20.1",
"@subsocial/definitions": "0.8.13",
"@unique-nft/opal-testnet-types": "942.57.0",
"@unique-nft/quartz-mainnet-types": "942.57.0",
"@unique-nft/sapphire-mainnet-types": "942.57.0",
"@unique-nft/unique-mainnet-types": "941.56.0",
"@unique-nft/unique-mainnet-types": "942.57.0",
"@zeitgeistpm/type-defs": "1.0.0",
"@zeroio/type-definitions": "0.0.14",
"moonbeam-types-bundle": "2.0.10",
"pontem-types-bundle": "1.0.15",
"rxjs": "^7.8.1",
"tslib": "^2.5.3"
"tslib": "^2.6.2"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -22,7 +22,7 @@
"electron-updater": "^5.3.0"
},
"devDependencies": {
"@polkadot/dev": "^0.76.16",
"@polkadot/dev": "^0.76.17",
"@types/tmp": "^0.2.3",
"copy-webpack-plugin": "^11.0.0",
"electron": "25.0.1",

View File

@ -18,7 +18,7 @@
"dependencies": {
"@polkadot/apps-config": "^0.132.2-56-x",
"@polkadot/apps-routing": "^0.132.2-56-x",
"@polkadot/dev": "^0.76.16",
"@polkadot/dev": "^0.76.17",
"@polkadot/react-api": "^0.132.2-56-x",
"@polkadot/react-components": "^0.132.2-56-x",
"@polkadot/react-hooks": "^0.132.2-56-x",
@ -47,7 +47,7 @@
"process": "^0.11.10",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"ts-loader": "^9.4.3"
"ts-loader": "^9.4.4"
},
"peerDependencies": {
"typescript": "*",

View File

@ -21,7 +21,7 @@
},
"devDependencies": {
"@testing-library/react": "^14.0.0",
"testcontainers": "^9.9.1"
"testcontainers": "^10.2.1"
},
"peerDependencies": {
"react": "*",

View File

@ -1,13 +1,10 @@
// Copyright 2017-2023 @polkadot/app-bounties authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { ThemeProps } from '@polkadot/react-components/types';
import React from 'react';
import { Icon, styled } from '@polkadot/react-components';
import { bountySvgColor } from '../theme.js';
import { useTheme } from '@polkadot/react-hooks';
interface Props {
className?: string;
@ -16,8 +13,10 @@ interface Props {
}
function BountyInfo ({ className = '', description, type = 'info' }: Props): React.ReactElement<Props> {
const { themeClassName } = useTheme();
return (
<StyledDiv className={className}>
<StyledDiv className={`${themeClassName} ${className}`}>
{type === 'warning' && (
<div className='info-icon'>
<Icon icon={'exclamation-triangle'} />
@ -30,18 +29,34 @@ function BountyInfo ({ className = '', description, type = 'info' }: Props): Rea
);
}
const StyledDiv = styled.div(({ theme }: ThemeProps) => `
const StyledDiv = styled.div`
display: flex;
align-items: center;
font-size: var(--font-size-small);
line-height: 1.5rem;
&.theme--dark {
.info-icon {
margin-right: 0.2rem;
svg {
color: #8E8E8E;
}
}
}
&.theme--light {
.info-icon {
margin-right: 0.2rem;
svg {
color: #4D4D4D;
}
}
}
.info-icon {
margin-right: 0.2rem;
svg {
color: ${bountySvgColor[theme.theme]};
}
}
.description {
@ -51,6 +66,6 @@ const StyledDiv = styled.div(({ theme }: ThemeProps) => `
color: var(--color-label);
word-wrap: break-word;
}
`);
`;
export default React.memo(BountyInfo);

View File

@ -1,12 +0,0 @@
// Copyright 2017-2023 @polkadot/app-bounties authors & contributors
// SPDX-License-Identifier: Apache-2.0
interface bountyTheme {
dark: string;
light: string;
}
export const bountySvgColor: bountyTheme = {
dark: '#8E8E8E',
light: '#4D4D4D'
};

View File

@ -16,7 +16,7 @@
"type": "module",
"version": "0.132.2-56-x",
"devDependencies": {
"chart.js": "^4.3.0"
"chart.js": "^4.3.3"
},
"peerDependencies": {
"react": "*",

View File

@ -6,7 +6,7 @@ import React from 'react';
import { styled } from '@polkadot/react-components';
interface Props {
color: string;
color?: string;
className?: string;
}
@ -20,7 +20,7 @@ function ChainColorIndicator ({ className, color }: Props): React.ReactElement<P
}
const StyledDiv = styled.div(({ color }: Props): string => `
background-color: ${color} !important;
background-color: ${color || 'white'} !important;
width: 100px;
flex: 1;
border-radius: 4px;

View File

@ -16,8 +16,8 @@
"type": "module",
"version": "0.132.2-56-x",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@polkadot/keyring": "^12.4.1",
"@polkadot/react-api": "^0.132.2-56-x",
@ -28,7 +28,7 @@
"@polkadot/ui-settings": "^3.5.1",
"@polkadot/util": "^12.4.1",
"@polkadot/util-crypto": "^12.4.1",
"chart.js": "^4.3.0",
"chart.js": "^4.3.3",
"chartjs-plugin-annotation": "^3.0.1",
"chartjs-plugin-crosshair": "^1.2.0",
"codeflask": "^1.4.1",
@ -41,21 +41,22 @@
"react-dropzone": "^14.2.3",
"react-i18next": "^12.3.1",
"react-markdown": "^8.0.7",
"react-router": "^6.13.0",
"react-router-dom": "^6.13.0",
"react-router": "^6.15.0",
"react-router-dom": "^6.15.0",
"react-tooltip": "^4.5.1",
"rehype-raw": "^6.1.1",
"semantic-ui-css": "^2.5.0",
"semantic-ui-react": "^0.88.2",
"store": "^2.0.12",
"styled-components": "^6.0.7",
"styled-theming": "^2.2.0"
},
"devDependencies": {
"@types/chartjs-plugin-crosshair": "^1.1.1",
"@types/codeflask": "^1.4.3",
"@types/owasp-password-strength-test": "^1.3.0",
"@types/react": "^18.2.12",
"@types/react-dom": "^18.2.5"
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7"
},
"peerDependencies": {
"react": "*",

View File

@ -4,12 +4,11 @@
import type { LinkOption } from '@polkadot/apps-config/endpoints/types';
import type { IdentityProps } from '@polkadot/react-identicon/types';
import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
import type { ThemeProps } from '../types.js';
import React, { useCallback } from 'react';
import { getSystemIcon } from '@polkadot/apps-config';
import { useApi, useQueue } from '@polkadot/react-hooks';
import { useApi, useQueue, useTheme } from '@polkadot/react-hooks';
import BaseIdentityIcon from '@polkadot/react-identicon';
import { settings } from '@polkadot/ui-settings';
@ -43,6 +42,7 @@ function isCodec (value?: AccountId | AccountIndex | Address | string | Uint8Arr
function IdentityIcon ({ className = '', forceIconType, prefix, size = 24, theme, value }: Props): React.ReactElement<Props> {
const { apiEndpoint, isEthereum, specName, systemName } = useApi();
const { t } = useTranslation();
const { themeClassName } = useTheme();
const { queueAction } = useQueue();
const thisTheme = theme || getIdentityTheme(apiEndpoint, systemName, specName);
@ -63,7 +63,7 @@ function IdentityIcon ({ className = '', forceIconType, prefix, size = 24, theme
return (
<StyledBaseIdentityIcon
Custom={Custom}
className={className}
className={`${themeClassName} ${className}`}
onCopy={onCopy}
prefix={prefix}
size={size}
@ -73,17 +73,22 @@ function IdentityIcon ({ className = '', forceIconType, prefix, size = 24, theme
);
}
const StyledBaseIdentityIcon = styled(BaseIdentityIcon)(({ theme }: ThemeProps) => `
${theme.theme === 'dark'
? `circle:first-child {
fill: #282829;
}`
: ''}
border: 1px solid ${theme.theme === 'dark' ? 'transparent' : '#ddd'};
const StyledBaseIdentityIcon = styled(BaseIdentityIcon)`
border-radius: 50%;
display: inline-block;
overflow: hidden;
`);
&.theme--dark {
circle:first-child {
fill: #282829;
}
border: 1px solid transparent;
}
&.theme--light {
border: 1px solid #ddd;
}
`;
export default React.memo(IdentityIcon);

View File

@ -1,11 +1,10 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { ThemeDef } from './types.js';
import React, { useContext } from 'react';
import React from 'react';
import store from 'store';
import { ThemeContext } from 'styled-components';
import { useTheme } from '@polkadot/react-hooks';
import Dropdown from './Dropdown.js';
import { styled } from './styled.js';
@ -57,7 +56,7 @@ function onAddTag (value: string): void {
}
function InputTags ({ allowAdd = true, className = '', defaultValue, isDisabled, isError, label, onBlur, onChange, onClose, placeholder, searchInput, value, withLabel }: Props): React.ReactElement<Props> {
const { theme } = useContext(ThemeContext as React.Context<ThemeDef>);
const { theme } = useTheme();
return (
<StyledDropdown

View File

@ -1,10 +1,11 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { FlagColor as TagColor, ThemeDef } from './types.js';
import type { FlagColor as TagColor } from './types.js';
import React, { useContext, useState } from 'react';
import { ThemeContext } from 'styled-components';
import React, { useState } from 'react';
import { useTheme } from '@polkadot/react-hooks';
import { styled } from './styled.js';
import Tooltip from './Tooltip.js';
@ -20,7 +21,7 @@ interface Props {
let tagId = 0;
function Tag ({ className = '', color = 'theme', hover, label, size = 'small' }: Props): React.ReactElement<Props> {
const { theme } = useContext(ThemeContext as React.Context<ThemeDef>);
const { theme } = useTheme();
const [trigger] = useState(() => `tag-hover-${Date.now()}-${tagId++}`);
return (

View File

@ -1,16 +1,4 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { StyledInterface } from 'styled-components';
import styledComponents from 'styled-components';
// In styled-components v6, there is a named export which can be used
// directly, i.e. "import { styled } from ..." with no more magic. Until
// such time the cjs vs esm import here is problematic, so we hack around
// the various shapes below
export const styled = (
(styledComponents as unknown as { styled: StyledInterface }).styled ||
(styledComponents as unknown as { default: StyledInterface }).default ||
styledComponents as unknown as StyledInterface
);
export { styled } from 'styled-components';

View File

@ -1,9 +1,7 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { ThemeDef } from '../types.js';
export default (_theme: ThemeDef): string => `
export default `
.ui--output {
background: var(--bg-input);
border-radius: 4px;

View File

@ -1,8 +1,6 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { ThemeProps } from '../types.js';
import { createGlobalStyle } from 'styled-components';
import cssComponents from './components.js';
@ -62,7 +60,7 @@ function hexToRGB (hex: string, alpha?: string) {
: `rgb(${r}, ${g}, ${b})`;
}
export default createGlobalStyle<Props & ThemeProps>(({ theme, uiHighlight }: Props & ThemeProps) => `
export default createGlobalStyle<Props>(({ uiHighlight }: Props) => `
.highlight--all {
background: ${getHighlight(uiHighlight)} !important;
border-color: ${getHighlight(uiHighlight)} !important;
@ -559,9 +557,9 @@ export default createGlobalStyle<Props & ThemeProps>(({ theme, uiHighlight }: Pr
}
/* Add our overrides */
${cssSemantic(theme)}
${cssSemantic}
${cssTheme}
${cssForm}
${cssMedia}
${cssComponents(theme)}
${cssComponents}
`);

View File

@ -1,9 +1,7 @@
// Copyright 2017-2023 @polkadot/react-components authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { ThemeDef } from '../types.js';
export default (_theme: ThemeDef): string => `
export default `
.ui.hidden.divider {
margin: 0.5rem 0;
}

View File

@ -1,7 +1,6 @@
// Copyright 2017-2023 @polkadot/react-hooks authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type React from 'react';
import type { ThemeDef } from '@polkadot/react-components/types';
import { useContext, useMemo } from 'react';
@ -15,14 +14,14 @@ interface Theme {
}
function useThemeImpl (): Theme {
const { theme } = useContext(ThemeContext as React.Context<ThemeDef>);
const ctx = useContext(ThemeContext);
return useMemo(
(): Theme => ({
theme,
themeClassName: `theme--${theme}`
theme: (ctx?.theme || 'light') as 'light',
themeClassName: `theme--${(ctx?.theme || 'light') as 'light'}`
}),
[theme]
[ctx]
);
}

View File

@ -17,7 +17,7 @@
"version": "0.132.2-56-x",
"dependencies": {
"@testing-library/react": "^14.0.0",
"testcontainers": "^9.9.1"
"testcontainers": "^10.2.1"
},
"devDependencies": {
"@polkadot/types-support": "^10.9.1",

2523
yarn.lock

File diff suppressed because it is too large Load Diff