From c25fefa16fd675f7293e8035671ceb916a1b4e40 Mon Sep 17 00:00:00 2001 From: Jaco Date: Mon, 20 Feb 2023 10:45:38 +0200 Subject: [PATCH] 2.12.1 (#718) --- CHANGELOG.md | 7 ++++ package.json | 4 +-- packages/example-react/package.json | 2 +- packages/example-vue/package.json | 2 +- packages/react-identicon/package.json | 6 ++-- packages/react-identicon/src/Identicon.tsx | 12 ++++++- .../react-identicon/src/icons/Ethereum.tsx | 12 ++++++- packages/react-qr/package.json | 4 +-- packages/react-qr/src/Display.tsx | 16 +++++++-- packages/react-qr/src/Scan.tsx | 12 ++++++- packages/reactnative-identicon/package.json | 4 +-- packages/ui-assets/package.json | 2 +- packages/ui-keyring/package.json | 4 +-- packages/ui-settings/package.json | 2 +- packages/ui-shared/package.json | 2 +- packages/vue-identicon/package.json | 4 +-- yarn.lock | 36 +++++++++---------- 17 files changed, 89 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f37453c..dc9bbe4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## 2.12.1 Feb 20, 2023 + +Changes: + +- Adjust `styled-components` usage to cater for server-based environments + + ## 2.11.3 Feb 19, 2023 Changes: diff --git a/package.json b/package.json index 549b133f..e6cf65f9 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "sideEffects": false, "type": "module", - "version": "2.11.3", + "version": "2.12.0", "versions": { "git": "2.11.3", "npm": "2.11.3" @@ -34,7 +34,7 @@ "devDependencies": { "@babel/core": "^7.20.12", "@babel/runtime": "^7.20.13", - "@polkadot/dev": "^0.68.38", + "@polkadot/dev": "^0.68.40", "@polkadot/x-bundle": "^10.4.2", "@types/jest": "^29.4.0", "babel-loader": "^8.3.0", diff --git a/packages/example-react/package.json b/packages/example-react/package.json index a1128f3d..d19b4182 100644 --- a/packages/example-react/package.json +++ b/packages/example-react/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/polkadot-js/ui.git" }, "sideEffects": false, - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13" diff --git a/packages/example-vue/package.json b/packages/example-vue/package.json index cb2746e7..f15a7dbd 100644 --- a/packages/example-vue/package.json +++ b/packages/example-vue/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/polkadot-js/ui.git" }, "sideEffects": false, - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13" diff --git a/packages/react-identicon/package.json b/packages/react-identicon/package.json index 78210a52..571433e4 100644 --- a/packages/react-identicon/package.json +++ b/packages/react-identicon/package.json @@ -17,13 +17,13 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", "@polkadot/keyring": "^10.4.2", - "@polkadot/ui-settings": "2.11.3", - "@polkadot/ui-shared": "2.11.3", + "@polkadot/ui-settings": "2.12.0", + "@polkadot/ui-shared": "2.12.0", "@polkadot/util": "^10.4.2", "@polkadot/util-crypto": "^10.4.2", "color": "^3.2.1", diff --git a/packages/react-identicon/src/Identicon.tsx b/packages/react-identicon/src/Identicon.tsx index 996d60f7..df791c38 100644 --- a/packages/react-identicon/src/Identicon.tsx +++ b/packages/react-identicon/src/Identicon.tsx @@ -6,7 +6,7 @@ import type { IdentityProps as Props, Props as ComponentProps } from './types'; import React from 'react'; import CopyToClipboard from 'react-copy-to-clipboard'; -import styled from 'styled-components'; +import styledComponents from 'styled-components'; import { ICON_DEFAULT_HOST, settings } from '@polkadot/ui-settings'; import { isHex, isU8a, u8aToHex } from '@polkadot/util'; @@ -14,6 +14,16 @@ import { decodeAddress, encodeAddress, ethereumEncode } from '@polkadot/util-cry import { Beachball, Empty, Ethereum, Jdenticon, Polkadot } from './icons'; +// 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 +const styled = ( + (styledComponents as unknown as { styled: typeof styledComponents }).styled || + (styledComponents as unknown as { default: typeof styledComponents }).default || + styledComponents +); + const Fallback = Beachball; interface State { diff --git a/packages/react-identicon/src/icons/Ethereum.tsx b/packages/react-identicon/src/icons/Ethereum.tsx index 25668414..be0f4f8a 100644 --- a/packages/react-identicon/src/icons/Ethereum.tsx +++ b/packages/react-identicon/src/icons/Ethereum.tsx @@ -5,7 +5,17 @@ import type { Props } from '../types'; import makeBlockie from 'ethereum-blockies-base64'; import React, { useMemo } from 'react'; -import styled 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 +const styled = ( + (styledComponents as unknown as { styled: typeof styledComponents }).styled || + (styledComponents as unknown as { default: typeof styledComponents }).default || + styledComponents +); interface ImgProps { size: number; diff --git a/packages/react-qr/package.json b/packages/react-qr/package.json index 4199825f..f59f952b 100644 --- a/packages/react-qr/package.json +++ b/packages/react-qr/package.json @@ -17,11 +17,11 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", - "@polkadot/ui-settings": "2.11.3", + "@polkadot/ui-settings": "2.12.0", "@polkadot/util": "^10.4.2", "@polkadot/util-crypto": "^10.4.2", "qrcode-generator": "^1.4.4", diff --git a/packages/react-qr/src/Display.tsx b/packages/react-qr/src/Display.tsx index 69a8d953..32db1912 100644 --- a/packages/react-qr/src/Display.tsx +++ b/packages/react-qr/src/Display.tsx @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import React, { useEffect, useMemo, useRef, useState } from 'react'; -import styled from 'styled-components'; +import styledComponents from 'styled-components'; import { objectSpread } from '@polkadot/util'; import { xxhashAsHex } from '@polkadot/util-crypto'; @@ -10,6 +10,16 @@ import { xxhashAsHex } from '@polkadot/util-crypto'; import { qrcode } from './qrcode'; import { createFrames, createImgSize } from './util'; +// 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 +const styled = ( + (styledComponents as unknown as { styled: typeof styledComponents }).styled || + (styledComponents as unknown as { default: typeof styledComponents }).default || + styledComponents +); + interface Props { className?: string; size?: string | number; @@ -28,7 +38,7 @@ interface FrameState { interface TimerState { timerDelay: number; - timerId: number | null; + timerId: ReturnType | null; } const DEFAULT_FRAME_DELAY = 2750; @@ -84,7 +94,7 @@ function Display ({ className, size, skipEncoding, style, timerDelay = DEFAULT_F return newState; }); - timerRef.current.timerId = window.setTimeout(nextFrame, timerRef.current.timerDelay); + timerRef.current.timerId = setTimeout(nextFrame, timerRef.current.timerDelay); return (): void => { // eslint-disable-next-line react-hooks/exhaustive-deps diff --git a/packages/react-qr/src/Scan.tsx b/packages/react-qr/src/Scan.tsx index f2d202cc..610e8fe1 100644 --- a/packages/react-qr/src/Scan.tsx +++ b/packages/react-qr/src/Scan.tsx @@ -3,10 +3,20 @@ import React, { useCallback, useMemo } from 'react'; import Reader from 'react-qr-reader'; -import styled from 'styled-components'; +import styledComponents from 'styled-components'; import { createImgSize } from './util'; +// 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 +const styled = ( + (styledComponents as unknown as { styled: typeof styledComponents }).styled || + (styledComponents as unknown as { default: typeof styledComponents }).default || + styledComponents +); + interface Props { className?: string; delay?: number; diff --git a/packages/reactnative-identicon/package.json b/packages/reactnative-identicon/package.json index 8873e210..5f3846c4 100644 --- a/packages/reactnative-identicon/package.json +++ b/packages/reactnative-identicon/package.json @@ -17,11 +17,11 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", - "@polkadot/ui-shared": "2.11.3", + "@polkadot/ui-shared": "2.12.0", "@polkadot/util": "^10.4.2", "@polkadot/util-crypto": "^10.4.2", "react-native-svg": "^12.5.1" diff --git a/packages/ui-assets/package.json b/packages/ui-assets/package.json index 8ee37b74..ae186f30 100644 --- a/packages/ui-assets/package.json +++ b/packages/ui-assets/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/polkadot-js/ui.git" }, "sideEffects": false, - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index 81e119fa..b65f6a37 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -16,12 +16,12 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", "@polkadot/keyring": "^10.4.2", - "@polkadot/ui-settings": "2.11.3", + "@polkadot/ui-settings": "2.12.0", "@polkadot/util": "^10.4.2", "@polkadot/util-crypto": "^10.4.2", "mkdirp": "^2.1.3", diff --git a/packages/ui-settings/package.json b/packages/ui-settings/package.json index 70fe558b..3da13d00 100644 --- a/packages/ui-settings/package.json +++ b/packages/ui-settings/package.json @@ -17,7 +17,7 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json index 41b80a10..d9f5ad4e 100644 --- a/packages/ui-shared/package.json +++ b/packages/ui-shared/package.json @@ -17,7 +17,7 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", diff --git a/packages/vue-identicon/package.json b/packages/vue-identicon/package.json index 1921439f..75433adb 100644 --- a/packages/vue-identicon/package.json +++ b/packages/vue-identicon/package.json @@ -17,11 +17,11 @@ "./detectPackage.cjs" ], "type": "module", - "version": "2.11.3", + "version": "2.12.0", "main": "index.js", "dependencies": { "@babel/runtime": "^7.20.13", - "@polkadot/ui-shared": "2.11.3", + "@polkadot/ui-shared": "2.12.0", "@polkadot/util": "^10.4.2", "@polkadot/util-crypto": "^10.4.2", "jdenticon": "3.2.0" diff --git a/yarn.lock b/yarn.lock index 62a0895e..a9e1c471 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2182,9 +2182,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.68.38": - version: 0.68.38 - resolution: "@polkadot/dev@npm:0.68.38" +"@polkadot/dev@npm:^0.68.40": + version: 0.68.40 + resolution: "@polkadot/dev@npm:0.68.40" dependencies: "@babel/cli": ^7.20.7 "@babel/core": ^7.20.12 @@ -2248,7 +2248,7 @@ __metadata: jsdom: ^21.1.0 madge: ^6.0.0 prettier: ^2.8.4 - rollup: ^3.17.1 + rollup: ^3.17.2 rollup-plugin-cleanup: ^3.2.1 typescript: ^4.9.5 webpack: ^5.75.0 @@ -2286,7 +2286,7 @@ __metadata: polkadot-exec-swc: scripts/polkadot-exec-swc.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 7fa2e683784b02b97fb08c34f1f84d6504e28d2a3d1ae0513b392390a800f4801f281bf789b0c7f0a19e221bfc6de5a2c89a237eb3674ce9ad131188392d7e08 + checksum: efa0673933e2fec834b2d0a29c454c3d95e54c4608ea6eea8b4dc3730344234219afb61840d475771b873d6d34a67ae537e8451f73b0dd43eb82e440a1733966 languageName: node linkType: hard @@ -2337,8 +2337,8 @@ __metadata: dependencies: "@babel/runtime": ^7.20.13 "@polkadot/keyring": ^10.4.2 - "@polkadot/ui-settings": 2.11.3 - "@polkadot/ui-shared": 2.11.3 + "@polkadot/ui-settings": 2.12.0 + "@polkadot/ui-shared": 2.12.0 "@polkadot/util": ^10.4.2 "@polkadot/util-crypto": ^10.4.2 "@types/react-copy-to-clipboard": ^5.0.4 @@ -2366,7 +2366,7 @@ __metadata: resolution: "@polkadot/react-qr@workspace:packages/react-qr" dependencies: "@babel/runtime": ^7.20.13 - "@polkadot/ui-settings": 2.11.3 + "@polkadot/ui-settings": 2.12.0 "@polkadot/util": ^10.4.2 "@polkadot/util-crypto": ^10.4.2 "@types/react-qr-reader": ^2.1.4 @@ -2388,7 +2388,7 @@ __metadata: resolution: "@polkadot/reactnative-identicon@workspace:packages/reactnative-identicon" dependencies: "@babel/runtime": ^7.20.13 - "@polkadot/ui-shared": 2.11.3 + "@polkadot/ui-shared": 2.12.0 "@polkadot/util": ^10.4.2 "@polkadot/util-crypto": ^10.4.2 "@types/react-native": ^0.71.3 @@ -2416,7 +2416,7 @@ __metadata: dependencies: "@babel/runtime": ^7.20.13 "@polkadot/keyring": ^10.4.2 - "@polkadot/ui-settings": 2.11.3 + "@polkadot/ui-settings": 2.12.0 "@polkadot/util": ^10.4.2 "@polkadot/util-crypto": ^10.4.2 "@types/mkdirp": ^1.0.2 @@ -2431,7 +2431,7 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ui-settings@2.11.3, @polkadot/ui-settings@workspace:packages/ui-settings": +"@polkadot/ui-settings@2.12.0, @polkadot/ui-settings@workspace:packages/ui-settings": version: 0.0.0-use.local resolution: "@polkadot/ui-settings@workspace:packages/ui-settings" dependencies: @@ -2447,7 +2447,7 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/ui-shared@2.11.3, @polkadot/ui-shared@workspace:packages/ui-shared": +"@polkadot/ui-shared@2.12.0, @polkadot/ui-shared@workspace:packages/ui-shared": version: 0.0.0-use.local resolution: "@polkadot/ui-shared@workspace:packages/ui-shared" dependencies: @@ -2505,7 +2505,7 @@ __metadata: resolution: "@polkadot/vue-identicon@workspace:packages/vue-identicon" dependencies: "@babel/runtime": ^7.20.13 - "@polkadot/ui-shared": 2.11.3 + "@polkadot/ui-shared": 2.12.0 "@polkadot/util": ^10.4.2 "@polkadot/util-crypto": ^10.4.2 jdenticon: 3.2.0 @@ -13908,9 +13908,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.17.1": - version: 3.17.1 - resolution: "rollup@npm:3.17.1" +"rollup@npm:^3.17.2": + version: 3.17.2 + resolution: "rollup@npm:3.17.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -13918,7 +13918,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 3c6076eba228a6623b886929154ebbb9ddfb6a044e567456eeb6257b5235f4fd740655836b539155b1b25697f38f5d189bf81b9ce0624ce5aafc6c8620bd80c0 + checksum: 9473eb7e7ffdb74c8e01e813eccb2e81e86cd429aea4705c424a5369845bedd871e715347a53be04a157f8febb99a8e502c124b896141e06d94fb86d6e121721 languageName: node linkType: hard @@ -13928,7 +13928,7 @@ __metadata: dependencies: "@babel/core": ^7.20.12 "@babel/runtime": ^7.20.13 - "@polkadot/dev": ^0.68.38 + "@polkadot/dev": ^0.68.40 "@polkadot/x-bundle": ^10.4.2 "@types/jest": ^29.4.0 babel-loader: ^8.3.0