From 19213de207dc9664ec2757bcfa2d6458579e2729 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Sun, 10 Apr 2022 15:10:11 +0800 Subject: [PATCH 1/9] refactor: move typed-message package to esm --- .../base/binary-encode/decode.ts | 6 +-- .../base/binary-encode/encode.ts | 6 +-- .../typed-message/base/binary-encode/index.ts | 4 +- packages/typed-message/base/core/empty.ts | 4 +- packages/typed-message/base/core/image.ts | 4 +- packages/typed-message/base/core/index.ts | 28 ++++++------ packages/typed-message/base/core/promise.ts | 4 +- packages/typed-message/base/core/text.ts | 4 +- packages/typed-message/base/core/tuple.ts | 6 +-- packages/typed-message/base/core/unknown.ts | 4 +- .../base/deprecated-encode/index.ts | 2 +- .../base/extension/MaskPayload.ts | 4 +- .../typed-message/base/extension/anchor.ts | 6 +-- .../typed-message/base/extension/index.ts | 10 ++--- packages/typed-message/base/index.ts | 22 +++++----- .../typed-message/base/transformer/Flatten.ts | 10 ++--- .../base/transformer/MaskPayload/index.ts | 12 +++--- .../base/transformer/ParseLink.ts | 12 +++--- .../base/transformer/composed.ts | 6 +-- .../typed-message/base/transformer/index.ts | 14 +++--- packages/typed-message/base/tsconfig.json | 2 + packages/typed-message/base/utils/extract.ts | 8 ++-- packages/typed-message/base/utils/index.ts | 6 +-- packages/typed-message/base/utils/internal.ts | 2 +- packages/typed-message/base/utils/metadata.ts | 14 +++--- .../typed-message/base/utils/parseLink.ts | 8 ++-- .../base/visitor/forEachChild.ts | 8 ++-- packages/typed-message/base/visitor/index.ts | 4 +- .../base/visitor/visitEachChild.ts | 10 ++--- .../typed-message/dom/Renderer/Core/Image.tsx | 6 +-- .../dom/Renderer/Core/Promise.tsx | 6 +-- .../typed-message/dom/Renderer/Core/Text.tsx | 6 +-- .../typed-message/dom/Renderer/Core/Tuple.tsx | 8 ++-- .../dom/Renderer/Core/Unknown.tsx | 2 +- packages/typed-message/dom/Renderer/Entry.tsx | 10 ++--- .../dom/Renderer/Extension/Anchor.tsx | 4 +- .../dom/Renderer/MetadataRender.tsx | 4 +- .../typed-message/dom/Renderer/registry.tsx | 14 +++--- .../dom/Renderer/utils/RegistryContext.tsx | 2 +- .../dom/Renderer/utils/RenderFragments.tsx | 2 +- .../dom/Renderer/utils/TransformContext.ts | 2 +- .../dom/Renderer/utils/renderText.tsx | 6 +-- packages/typed-message/dom/index.ts | 16 +++---- packages/typed-message/dom/tsconfig.json | 2 + packages/typed-message/package.json | 18 ++++---- patches/ts-results+3.3.0.patch | 43 +++++++++++++++++-- 46 files changed, 209 insertions(+), 172 deletions(-) diff --git a/packages/typed-message/base/binary-encode/decode.ts b/packages/typed-message/base/binary-encode/decode.ts index 45fbac7f78a5..33246eecec43 100644 --- a/packages/typed-message/base/binary-encode/decode.ts +++ b/packages/typed-message/base/binary-encode/decode.ts @@ -1,8 +1,8 @@ import { decode } from '@msgpack/msgpack' import { Result } from 'ts-results' -import type { TypedMessage } from '../base' -import { makeTypedMessageText, makeTypedMessageTuple, makeTypedMessageUnknown } from '../core' -import { TypedMessageBinaryEncodingTypeEnum } from './type' +import type { TypedMessage } from '../base.js' +import { makeTypedMessageText, makeTypedMessageTuple, makeTypedMessageUnknown } from '../core/index.js' +import { TypedMessageBinaryEncodingTypeEnum } from './type.js' const HEAD = '[@masknet/typed-message] ' export function decodeTypedMessageFromDocument(bin: Uint8Array) { diff --git a/packages/typed-message/base/binary-encode/encode.ts b/packages/typed-message/base/binary-encode/encode.ts index 81d4d65c5671..7bf777194f4d 100644 --- a/packages/typed-message/base/binary-encode/encode.ts +++ b/packages/typed-message/base/binary-encode/encode.ts @@ -3,10 +3,10 @@ import { isTypedMessageTupleSerializable, TypedMessageText, TypedMessageTupleSerializable, -} from '../core' -import type { SerializableTypedMessages, TypedMessage } from '../base' +} from '../core/index.js' +import type { SerializableTypedMessages, TypedMessage } from '../base.js' import { encode } from '@msgpack/msgpack' -import { TypedMessageBinaryEncodingTypeEnum } from './type' +import { TypedMessageBinaryEncodingTypeEnum } from './type.js' const HEAD = '[@masknet/typed-message] ' export function encodeTypedMessageToDocument(tm: SerializableTypedMessages) { diff --git a/packages/typed-message/base/binary-encode/index.ts b/packages/typed-message/base/binary-encode/index.ts index 95179f2f0e2d..1b4628a4e4fc 100644 --- a/packages/typed-message/base/binary-encode/index.ts +++ b/packages/typed-message/base/binary-encode/index.ts @@ -1,2 +1,2 @@ -export { decodeTypedMessageFromDocument } from './decode' -export { encodeTypedMessageToDocument } from './encode' +export { decodeTypedMessageFromDocument } from './decode.js' +export { encodeTypedMessageToDocument } from './encode.js' diff --git a/packages/typed-message/base/core/empty.ts b/packages/typed-message/base/core/empty.ts index eaa227eab98e..f0213611d28a 100644 --- a/packages/typed-message/base/core/empty.ts +++ b/packages/typed-message/base/core/empty.ts @@ -1,5 +1,5 @@ -import type { SerializableTypedMessage } from '../base' -import { createIsType } from '../utils/internal' +import type { SerializableTypedMessage } from '../base.js' +import { createIsType } from '../utils/internal.js' export interface TypedMessageEmpty extends SerializableTypedMessage<1> { readonly type: 'empty' diff --git a/packages/typed-message/base/core/image.ts b/packages/typed-message/base/core/image.ts index e3321663eaa7..bdeef8601b12 100644 --- a/packages/typed-message/base/core/image.ts +++ b/packages/typed-message/base/core/image.ts @@ -1,5 +1,5 @@ -import type { NonSerializableTypedMessage, Meta } from '../base' -import { createIsType } from '../utils/internal' +import type { NonSerializableTypedMessage, Meta } from '../base.js' +import { createIsType } from '../utils/internal.js' /** * A single image diff --git a/packages/typed-message/base/core/index.ts b/packages/typed-message/base/core/index.ts index 015e2047fe1f..2c1c1a6afe73 100644 --- a/packages/typed-message/base/core/index.ts +++ b/packages/typed-message/base/core/index.ts @@ -1,19 +1,19 @@ -export * from './empty' -export * from './text' -export * from './image' -export * from './tuple' -export * from './unknown' -export * from './promise' +export * from './empty.js' +export * from './text.js' +export * from './image.js' +export * from './tuple.js' +export * from './unknown.js' +export * from './promise.js' -import * as empty from './empty' -import * as unknown from './unknown' -import * as tuple from './tuple' -import * as text from './text' -import * as image from './image' -import * as promise from './promise' +import * as empty from './empty.js' +import * as unknown from './unknown.js' +import * as tuple from './tuple.js' +import * as text from './text.js' +import * as image from './image.js' +import * as promise from './promise.js' -import type { TypedMessage } from '../base' -import { composeSome } from '../utils/internal' +import type { TypedMessage } from '../base.js' +import { composeSome } from '../utils/internal.js' export type CoreTypedMessages = | empty.TypedMessageEmpty diff --git a/packages/typed-message/base/core/promise.ts b/packages/typed-message/base/core/promise.ts index 9a2941065525..01612c511e3d 100644 --- a/packages/typed-message/base/core/promise.ts +++ b/packages/typed-message/base/core/promise.ts @@ -1,5 +1,5 @@ -import type { TypedMessage, NonSerializableTypedMessage } from '../base' -import { createIsType } from '../utils/internal' +import type { TypedMessage, NonSerializableTypedMessage } from '../base.js' +import { createIsType } from '../utils/internal.js' export interface TypedMessagePromise extends NonSerializableTypedMessage { readonly type: 'promise' diff --git a/packages/typed-message/base/core/text.ts b/packages/typed-message/base/core/text.ts index 56a5936acd2e..f166f1aaecc1 100644 --- a/packages/typed-message/base/core/text.ts +++ b/packages/typed-message/base/core/text.ts @@ -1,5 +1,5 @@ -import type { SerializableTypedMessage, TypedMessage, Meta } from '../base' -import { createIsType } from '../utils/internal' +import type { SerializableTypedMessage, TypedMessage, Meta } from '../base.js' +import { createIsType } from '../utils/internal.js' export type TypedMessageText = TypedMessageTextV1 diff --git a/packages/typed-message/base/core/tuple.ts b/packages/typed-message/base/core/tuple.ts index 2b8a1c9f9570..b9770fd03f0c 100644 --- a/packages/typed-message/base/core/tuple.ts +++ b/packages/typed-message/base/core/tuple.ts @@ -1,6 +1,6 @@ -import type { SerializableTypedMessage, SerializableTypedMessages, TypedMessage, Meta } from '../base' -import { isSerializableTypedMessage } from '../utils' -import { composeEvery } from '../utils/internal' +import type { SerializableTypedMessage, SerializableTypedMessages, TypedMessage, Meta } from '../base.js' +import { isSerializableTypedMessage } from '../utils/index.js' +import { composeEvery } from '../utils/internal.js' /** Multiple TypedMessages (ordered) */ export interface TypedMessageTuple extends TypedMessage { diff --git a/packages/typed-message/base/core/unknown.ts b/packages/typed-message/base/core/unknown.ts index 8bb8cbe49a7f..07c30ee29988 100644 --- a/packages/typed-message/base/core/unknown.ts +++ b/packages/typed-message/base/core/unknown.ts @@ -1,5 +1,5 @@ -import type { NonSerializableTypedMessage } from '../base' -import { createIsType } from '../utils/internal' +import type { NonSerializableTypedMessage } from '../base.js' +import { createIsType } from '../utils/internal.js' export interface TypedMessageUnknown extends NonSerializableTypedMessage { readonly type: 'unknown' diff --git a/packages/typed-message/base/deprecated-encode/index.ts b/packages/typed-message/base/deprecated-encode/index.ts index 76a7e1ecb195..81dfc2295e2c 100644 --- a/packages/typed-message/base/deprecated-encode/index.ts +++ b/packages/typed-message/base/deprecated-encode/index.ts @@ -1,5 +1,5 @@ import { None, Ok, Result } from 'ts-results' -import { makeTypedMessageText, TypedMessageText } from '../core' +import { makeTypedMessageText, TypedMessageText } from '../core/index.js' export function encodeTypedMessageV38Format(message: TypedMessageText) { const encoder = new TextEncoder() diff --git a/packages/typed-message/base/extension/MaskPayload.ts b/packages/typed-message/base/extension/MaskPayload.ts index 4643f37b2feb..e7ba191ce66f 100644 --- a/packages/typed-message/base/extension/MaskPayload.ts +++ b/packages/typed-message/base/extension/MaskPayload.ts @@ -1,5 +1,5 @@ -import type { Meta, TypedMessage } from '../base' -import { createIsType } from '../utils/internal' +import type { Meta, TypedMessage } from '../base.js' +import { createIsType } from '../utils/internal.js' /** * This TypedMessage represents an encrypted TypedMessage. diff --git a/packages/typed-message/base/extension/anchor.ts b/packages/typed-message/base/extension/anchor.ts index 73fb986d5c27..1985900aede2 100644 --- a/packages/typed-message/base/extension/anchor.ts +++ b/packages/typed-message/base/extension/anchor.ts @@ -1,6 +1,6 @@ -import type { NonSerializableWithAltTypedMessage } from '../base' -import { createIsType } from '../utils/internal' -import { makeTypedMessageText, TypedMessageText } from '../core' +import type { NonSerializableWithAltTypedMessage } from '../base.js' +import { createIsType } from '../utils/internal.js' +import { makeTypedMessageText, TypedMessageText } from '../core/index.js' /** It represents a single link */ export interface TypedMessageAnchor extends NonSerializableWithAltTypedMessage { diff --git a/packages/typed-message/base/extension/index.ts b/packages/typed-message/base/extension/index.ts index 2ed1e097eaf2..1c9c1dc76120 100644 --- a/packages/typed-message/base/extension/index.ts +++ b/packages/typed-message/base/extension/index.ts @@ -1,9 +1,9 @@ -export * from './anchor' -export * from './MaskPayload' +export * from './anchor.js' +export * from './MaskPayload.js' -import { composeSome } from '../utils/internal' -import * as anchor from './anchor' -import * as MaskPayload from './MaskPayload' +import { composeSome } from '../utils/internal.js' +import * as anchor from './anchor.js' +import * as MaskPayload from './MaskPayload.js' export type WellKnownExtensionTypedMessages = anchor.TypedMessageAnchor | MaskPayload.TypedMessageMaskPayload export const isWellKnownExtensionTypedMessages = composeSome( diff --git a/packages/typed-message/base/index.ts b/packages/typed-message/base/index.ts index 2a7b522050ea..232f9b089ee9 100644 --- a/packages/typed-message/base/index.ts +++ b/packages/typed-message/base/index.ts @@ -1,15 +1,15 @@ -export * from './base' -export * from './core' -export * from './extension' -export * from './binary-encode' -export * from './deprecated-encode' -export * from './utils' -export * from './visitor' -export * from './transformer' +export * from './base.js' +export * from './core/index.js' +export * from './extension/index.js' +export * from './binary-encode/index.js' +export * from './deprecated-encode/index.js' +export * from './utils/index.js' +export * from './visitor/index.js' +export * from './transformer/index.js' -import { isCoreTypedMessages, CoreTypedMessages } from './core' -import { isWellKnownExtensionTypedMessages, WellKnownExtensionTypedMessages } from './extension' -import { composeSome } from './utils/internal' +import { isCoreTypedMessages, CoreTypedMessages } from './core/index.js' +import { isWellKnownExtensionTypedMessages, WellKnownExtensionTypedMessages } from './extension/index.js' +import { composeSome } from './utils/internal.js' export type WellKnownTypedMessages = WellKnownExtensionTypedMessages | CoreTypedMessages export const isWellKnownTypedMessages = composeSome(isCoreTypedMessages, isWellKnownExtensionTypedMessages) diff --git a/packages/typed-message/base/transformer/Flatten.ts b/packages/typed-message/base/transformer/Flatten.ts index ba5f8f40f2aa..ba5f32c2a154 100644 --- a/packages/typed-message/base/transformer/Flatten.ts +++ b/packages/typed-message/base/transformer/Flatten.ts @@ -7,11 +7,11 @@ import { makeTypedMessageText, makeTypedMessageTuple, makeTypedMessageTupleSerializable, -} from '../core' -import type { TypedMessage } from '../base' -import { visitEachTypedMessageChild } from '../visitor' -import { isSerializableTypedMessage } from '../utils' -import { emptyTransformationContext, TransformationContext } from './context' +} from '../core/index.js' +import type { TypedMessage } from '../base.js' +import { visitEachTypedMessageChild } from '../visitor/index.js' +import { isSerializableTypedMessage } from '../utils/index.js' +import { emptyTransformationContext, TransformationContext } from './context.js' export function FlattenTypedMessage(message: TypedMessage, context: TransformationContext): TypedMessage { if (isTypedMessagePromise(message) && message.promise.value) return message.promise.value diff --git a/packages/typed-message/base/transformer/MaskPayload/index.ts b/packages/typed-message/base/transformer/MaskPayload/index.ts index 7117f5671f73..7fda26ddd3b3 100644 --- a/packages/typed-message/base/transformer/MaskPayload/index.ts +++ b/packages/typed-message/base/transformer/MaskPayload/index.ts @@ -1,9 +1,9 @@ -import { FlattenTypedMessage } from '../Flatten' -import type { TypedMessage } from '../../base' -import { isTypedMessageImage, isTypedMessageText, isTypedMessageTuple, TypedMessageImage } from '../../core' -import { isTypedMessageAnchor, isTypedMessageMaskPayload } from '../../extension' -import { visitEachTypedMessageChild } from '../../visitor' -import type { TransformationContext } from '../context' +import { FlattenTypedMessage } from '../Flatten.js' +import type { TypedMessage } from '../../base.js' +import { isTypedMessageImage, isTypedMessageText, isTypedMessageTuple, TypedMessageImage } from '../../core/index.js' +import { isTypedMessageAnchor, isTypedMessageMaskPayload } from '../../extension/index.js' +import { visitEachTypedMessageChild } from '../../visitor/index.js' +import type { TransformationContext } from '../context.js' export interface MaskPayloadTransformOptions { /** diff --git a/packages/typed-message/base/transformer/ParseLink.ts b/packages/typed-message/base/transformer/ParseLink.ts index 79550fc17009..9fbafe519d65 100644 --- a/packages/typed-message/base/transformer/ParseLink.ts +++ b/packages/typed-message/base/transformer/ParseLink.ts @@ -1,9 +1,9 @@ -import type { TypedMessage } from '../base' -import { isTypedMessageText, makeTypedMessageTupleSerializable, makeTypedMessageText } from '../core' -import { makeTypedMessageAnchor } from '../extension' -import { parseLink } from '../utils/parseLink' -import { visitEachTypedMessageChild } from '../visitor' -import type { TransformationContext } from './context' +import type { TypedMessage } from '../base.js' +import { isTypedMessageText, makeTypedMessageTupleSerializable, makeTypedMessageText } from '../core/index.js' +import { makeTypedMessageAnchor } from '../extension/index.js' +import { parseLink } from '../utils/parseLink.js' +import { visitEachTypedMessageChild } from '../visitor/index.js' +import type { TransformationContext } from './context.js' export function ParseLinkTransformer(message: TypedMessage, context: TransformationContext): TypedMessage { if (isTypedMessageText(message)) { diff --git a/packages/typed-message/base/transformer/composed.ts b/packages/typed-message/base/transformer/composed.ts index acac6b74b91c..1fbea4d71607 100644 --- a/packages/typed-message/base/transformer/composed.ts +++ b/packages/typed-message/base/transformer/composed.ts @@ -1,6 +1,6 @@ -import type { TypedMessage } from '../base' -import type { TransformationContext } from './context' -import type { Transformer } from './index' +import type { TypedMessage } from '../base.js' +import type { TransformationContext } from './context.js' +import type { Transformer } from './index.js' export interface ComposedTransformers { subscription: { getCurrentValue: () => Transformer diff --git a/packages/typed-message/base/transformer/index.ts b/packages/typed-message/base/transformer/index.ts index 4c9128e560bc..39b78494bae6 100644 --- a/packages/typed-message/base/transformer/index.ts +++ b/packages/typed-message/base/transformer/index.ts @@ -1,8 +1,8 @@ -import type { TypedMessage } from '../base' -import type { TransformationContext } from './context' +import type { TypedMessage } from '../base.js' +import type { TransformationContext } from './context.js' export type Transformer = (message: TypedMessage, context: TransformationContext) => TypedMessage -export * from './composed' -export * from './context' -export { FlattenTypedMessage } from './Flatten' -export { ParseLinkTransformer } from './ParseLink' -export { createMaskPayloadTransform } from './MaskPayload' +export * from './composed.js' +export * from './context.js' +export { FlattenTypedMessage } from './Flatten.js' +export { ParseLinkTransformer } from './ParseLink.js' +export { createMaskPayloadTransform } from './MaskPayload/index.js' diff --git a/packages/typed-message/base/tsconfig.json b/packages/typed-message/base/tsconfig.json index c2405a737449..85c728892fa2 100644 --- a/packages/typed-message/base/tsconfig.json +++ b/packages/typed-message/base/tsconfig.json @@ -1,6 +1,8 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", "rootDir": "../base/", "outDir": "../dist/base", "tsBuildInfoFile": "../dist/base.tsbuildinfo" diff --git a/packages/typed-message/base/utils/extract.ts b/packages/typed-message/base/utils/extract.ts index de84bef18d48..5a1220fe216a 100644 --- a/packages/typed-message/base/utils/extract.ts +++ b/packages/typed-message/base/utils/extract.ts @@ -1,8 +1,8 @@ -import type { TypedMessage } from '../base' -import { isTypedMessageText, isTypedMessageImage } from '../core' -import { isTypedMessageAnchor } from '../extension' +import type { TypedMessage } from '../base.js' +import { isTypedMessageText, isTypedMessageImage } from '../core/index.js' +import { isTypedMessageAnchor } from '../extension/index.js' import { Option, Some, None } from 'ts-results' -import { forEachTypedMessageChild } from '../visitor' +import { forEachTypedMessageChild } from '../visitor/index.js' /** * Get inner text from a TypedMessage diff --git a/packages/typed-message/base/utils/index.ts b/packages/typed-message/base/utils/index.ts index 0e491e29c3c0..6c53ba8110ff 100644 --- a/packages/typed-message/base/utils/index.ts +++ b/packages/typed-message/base/utils/index.ts @@ -1,12 +1,12 @@ -export * from './metadata' -export * from './extract' +export * from './metadata.js' +export * from './extract.js' import type { TypedMessage, SerializableTypedMessages, SerializableTypedMessage, NonSerializableWithAltTypedMessage, -} from '../base' +} from '../base.js' import { isEqual } from 'lodash-unified' export function isNonSerializableTypedMessageWithAlt(x: TypedMessage): x is NonSerializableWithAltTypedMessage { diff --git a/packages/typed-message/base/utils/internal.ts b/packages/typed-message/base/utils/internal.ts index 00513963ae3d..cd9523604cdb 100644 --- a/packages/typed-message/base/utils/internal.ts +++ b/packages/typed-message/base/utils/internal.ts @@ -1,4 +1,4 @@ -import type { SerializableTypedMessage, TypedMessage } from '../base' +import type { SerializableTypedMessage, TypedMessage } from '../base.js' /** @internal */ export function createIsType(x: T['type'], version?: number) { diff --git a/packages/typed-message/base/utils/metadata.ts b/packages/typed-message/base/utils/metadata.ts index e535e680c65c..5d0506fa0a2e 100644 --- a/packages/typed-message/base/utils/metadata.ts +++ b/packages/typed-message/base/utils/metadata.ts @@ -1,5 +1,6 @@ import { Result, Ok, Err, Some, Option, None } from 'ts-results' -import type { TypedMessage } from '../base' +import type { ReactElement, ReactNode } from 'react' +import type { TypedMessage } from '../base.js' import z_schema from 'z-schema' import draft, { enableMapSet, Draft } from 'immer' enableMapSet() @@ -72,10 +73,7 @@ export function isDataMatchJSONSchema(data: any, jsonSchema: object) { * @param metadataReader A metadata reader (can be return value of createTypedMessageMetadataReader) */ export function createRenderWithMetadata(metadataReader: (meta: TypedMessage['meta']) => Result) { - return ( - metadata: TypedMessage['meta'], - render: (data: T) => React.ReactElement | null, - ): React.ReactElement | null => { + return (metadata: TypedMessage['meta'], render: (data: T) => ReactElement | null): ReactElement | null => { const message = metadataReader(metadata) if (message.ok) return render(message.val) return null @@ -86,7 +84,7 @@ export function editMetadata( metadata: TypedMessage['meta'], edit: (meta: NonNullable>) => void, ): NonNullable { - return draft(metadata || new Map(), (e) => void edit(e)) + return draft.default(metadata || new Map(), (e) => void edit(e)) } export function editTypedMessageMeta( typedMessage: T, @@ -106,9 +104,9 @@ export function editTypedMessageMeta( export function renderWithMetadataUntyped( metadata: TypedMessage['meta'], key: string, - render: (data: unknown) => React.ReactNode, + render: (data: unknown) => ReactNode, jsonSchema?: object, -): React.ReactNode | null { +): ReactNode | null { const message = readTypedMessageMetadataUntyped(metadata, key, jsonSchema) if (message.ok) return render(message.val) return null diff --git a/packages/typed-message/base/utils/parseLink.ts b/packages/typed-message/base/utils/parseLink.ts index 7d4e1333ef43..fc04672c3354 100644 --- a/packages/typed-message/base/utils/parseLink.ts +++ b/packages/typed-message/base/utils/parseLink.ts @@ -1,7 +1,5 @@ -import _anchorme from 'anchorme' -import type { TypedMessageAnchor } from '../extension' -// ESM/CJS compat -const anchorme = ((_anchorme as any).default || _anchorme) as typeof _anchorme +import anchorme from 'anchorme' +import type { TypedMessageAnchor } from '../extension/index.js' export type ParseLinkResult = | { @@ -15,7 +13,7 @@ export type ParseLinkResult = } export function parseLink(text: string): ParseLinkResult[] { - const parsed = anchorme.list(text) + const parsed = anchorme.default.list(text) const result: ParseLinkResult[] = [] diff --git a/packages/typed-message/base/visitor/forEachChild.ts b/packages/typed-message/base/visitor/forEachChild.ts index db644388bb25..ea25c59fbdb6 100644 --- a/packages/typed-message/base/visitor/forEachChild.ts +++ b/packages/typed-message/base/visitor/forEachChild.ts @@ -1,7 +1,7 @@ -import { isTypedMessagePromise, isTypedMessageTuple } from '../core' -import { isNonSerializableTypedMessageWithAlt } from '../utils' -import type { TypedMessage } from '../base' -import { isTypedMessageMaskPayload } from '../extension' +import { isTypedMessagePromise, isTypedMessageTuple } from '../core/index.js' +import { isNonSerializableTypedMessageWithAlt } from '../utils/index.js' +import type { TypedMessage } from '../base.js' +import { isTypedMessageMaskPayload } from '../extension/index.js' export function forEachTypedMessageChild(node: TypedMessage, visitor: (x: TypedMessage) => void | 'stop') { let stop: void | 'stop' diff --git a/packages/typed-message/base/visitor/index.ts b/packages/typed-message/base/visitor/index.ts index c5fdbce1dec9..da52ad2487ed 100644 --- a/packages/typed-message/base/visitor/index.ts +++ b/packages/typed-message/base/visitor/index.ts @@ -1,2 +1,2 @@ -export * from './visitEachChild' -export * from './forEachChild' +export * from './visitEachChild.js' +export * from './forEachChild.js' diff --git a/packages/typed-message/base/visitor/visitEachChild.ts b/packages/typed-message/base/visitor/visitEachChild.ts index f077226fe6ee..b3fb0ac8cdd6 100644 --- a/packages/typed-message/base/visitor/visitEachChild.ts +++ b/packages/typed-message/base/visitor/visitEachChild.ts @@ -4,11 +4,11 @@ import { makeTypedMessagePromise, makeTypedMessageTuple, makeTypedMessageTupleSerializable, -} from '../core' -import { isNonSerializableTypedMessageWithAlt, isSerializableTypedMessage } from '../utils' -import type { TypedMessage } from '../base' -import { isTypedMessageMaskPayload, makeTypedMessageMaskPayload } from '../extension' -import type { TransformationContext, Transformer } from '../transformer' +} from '../core/index.js' +import { isNonSerializableTypedMessageWithAlt, isSerializableTypedMessage } from '../utils/index.js' +import type { TypedMessage } from '../base.js' +import { isTypedMessageMaskPayload, makeTypedMessageMaskPayload } from '../extension/index.js' +import type { TransformationContext, Transformer } from '../transformer/index.js' export function visitEachTypedMessageChild( node: TypedMessage, diff --git a/packages/typed-message/dom/Renderer/Core/Image.tsx b/packages/typed-message/dom/Renderer/Core/Image.tsx index 441fcbf46749..6ff4ae41671a 100644 --- a/packages/typed-message/dom/Renderer/Core/Image.tsx +++ b/packages/typed-message/dom/Renderer/Core/Image.tsx @@ -1,7 +1,7 @@ import { memo, useContext, useEffect, useState } from 'react' -import type { TypedMessageImage } from '../../../base' -import { useMetadataRender } from '../MetadataRender' -import { RenderFragmentsContext, DefaultRenderFragments } from '../utils/RenderFragments' +import type { TypedMessageImage } from '../../../base/index.js' +import { useMetadataRender } from '../MetadataRender.js' +import { RenderFragmentsContext, DefaultRenderFragments } from '../utils/RenderFragments.js' export const TypedMessageImageRenderer = memo(function TypedMessageImageRenderer(props: TypedMessageImage) { const { Image = DefaultRenderFragments.Image } = useContext(RenderFragmentsContext) diff --git a/packages/typed-message/dom/Renderer/Core/Promise.tsx b/packages/typed-message/dom/Renderer/Core/Promise.tsx index dc18a89e7eb3..baf6bfb69ff0 100644 --- a/packages/typed-message/dom/Renderer/Core/Promise.tsx +++ b/packages/typed-message/dom/Renderer/Core/Promise.tsx @@ -1,7 +1,7 @@ import { memo, Suspense, useEffect, useState } from 'react' -import type { TypedMessagePromise } from '../../../base' -import { TypedMessageRenderInline } from '../Entry' -import { useTransformedValue } from '../utils/TransformContext' +import type { TypedMessagePromise } from '../../../base/index.js' +import { TypedMessageRenderInline } from '../Entry.js' +import { useTransformedValue } from '../utils/TransformContext.js' export const TypedMessagePromiseRenderer = memo(function TypedMessagePromiseRenderer(props: TypedMessagePromise) { const { promise, alt } = props const _ = useState(0)[1] diff --git a/packages/typed-message/dom/Renderer/Core/Text.tsx b/packages/typed-message/dom/Renderer/Core/Text.tsx index 5694c585d15a..3b00cc4bd167 100644 --- a/packages/typed-message/dom/Renderer/Core/Text.tsx +++ b/packages/typed-message/dom/Renderer/Core/Text.tsx @@ -1,7 +1,7 @@ import { memo } from 'react' -import type { TypedMessageText } from '../../../base' -import { RenderTextFragment } from '../utils/renderText' -import { useMetadataRender } from '../MetadataRender' +import type { TypedMessageText } from '../../../base/index.js' +import { RenderTextFragment } from '../utils/renderText.js' +import { useMetadataRender } from '../MetadataRender.js' export const TypedMessageTextRenderer = memo(function TypedMessageTextRenderer(props: TypedMessageText) { const { content } = props diff --git a/packages/typed-message/dom/Renderer/Core/Tuple.tsx b/packages/typed-message/dom/Renderer/Core/Tuple.tsx index 7f5e9e165c88..82298ecedbf2 100644 --- a/packages/typed-message/dom/Renderer/Core/Tuple.tsx +++ b/packages/typed-message/dom/Renderer/Core/Tuple.tsx @@ -1,8 +1,8 @@ import { memo, useMemo } from 'react' -import type { TypedMessageTuple } from '../../../base' -import { hasCircular } from '../utils/circularDetect' -import { TypedMessageRenderInline } from '../Entry' -import { useMetadataRender } from '../MetadataRender' +import type { TypedMessageTuple } from '../../../base/index.js' +import { hasCircular } from '../utils/circularDetect.js' +import { TypedMessageRenderInline } from '../Entry.js' +import { useMetadataRender } from '../MetadataRender.js' // TODO: remove this after we switch to inline rendering of Mask payload. export const TUPLE_RENDER_STYLE = 'TUPLE_RENDER_STYLE' diff --git a/packages/typed-message/dom/Renderer/Core/Unknown.tsx b/packages/typed-message/dom/Renderer/Core/Unknown.tsx index a9c49991fea5..3ef457d0189c 100644 --- a/packages/typed-message/dom/Renderer/Core/Unknown.tsx +++ b/packages/typed-message/dom/Renderer/Core/Unknown.tsx @@ -1,5 +1,5 @@ import { memo, useRef } from 'react' -import type { TypedMessage } from '../../../base' +import type { TypedMessage } from '../../../base/index.js' /** @internal */ export const TypedMessageUnknownRenderer = memo(function TypedMessageUnknownRenderer(props: TypedMessage) { diff --git a/packages/typed-message/dom/Renderer/Entry.tsx b/packages/typed-message/dom/Renderer/Entry.tsx index 722a3a707a84..55156507c3b7 100644 --- a/packages/typed-message/dom/Renderer/Entry.tsx +++ b/packages/typed-message/dom/Renderer/Entry.tsx @@ -1,9 +1,9 @@ import { useContext } from 'react' -import type { TypedMessage } from '../../base' -import { TypedMessageUnknownRenderer as TypedMessageUnknownRender } from './Core/Unknown' -import { RegistryContext } from './utils/RegistryContext' -import { RenderFragmentsContext } from './utils/RenderFragments' -import { useTextResize } from './utils/TextResizerContext' +import type { TypedMessage } from '../../base/index.js' +import { TypedMessageUnknownRenderer as TypedMessageUnknownRender } from './Core/Unknown.js' +import { RegistryContext } from './utils/RegistryContext.js' +import { RenderFragmentsContext } from './utils/RenderFragments.js' +import { useTextResize } from './utils/TextResizerContext.js' export interface RenderProps { message: TypedMessage } diff --git a/packages/typed-message/dom/Renderer/Extension/Anchor.tsx b/packages/typed-message/dom/Renderer/Extension/Anchor.tsx index f07c3b70a6f2..749d300f849f 100644 --- a/packages/typed-message/dom/Renderer/Extension/Anchor.tsx +++ b/packages/typed-message/dom/Renderer/Extension/Anchor.tsx @@ -1,6 +1,6 @@ import { memo } from 'react' -import type { TypedMessageAnchor } from '../../../base' -import { RenderLinkFragment } from '../utils/renderText' +import type { TypedMessageAnchor } from '../../../base/index.js' +import { RenderLinkFragment } from '../utils/renderText.js' export const TypedMessageAnchorRenderer = memo(function TypedMessageAnchorRenderer(props: TypedMessageAnchor) { return diff --git a/packages/typed-message/dom/Renderer/MetadataRender.tsx b/packages/typed-message/dom/Renderer/MetadataRender.tsx index cbbf057b537a..9840fc09fa33 100644 --- a/packages/typed-message/dom/Renderer/MetadataRender.tsx +++ b/packages/typed-message/dom/Renderer/MetadataRender.tsx @@ -1,6 +1,6 @@ import { useContext } from 'react' -import { RenderFragmentsContext } from './utils/RenderFragments' -import type { TypedMessage } from '../../base' +import { RenderFragmentsContext } from './utils/RenderFragments.js' +import type { TypedMessage } from '../../base/index.js' export interface MetadataRenderProps { metadata: TypedMessage['meta'] diff --git a/packages/typed-message/dom/Renderer/registry.tsx b/packages/typed-message/dom/Renderer/registry.tsx index f6d91cde2c59..0673f68d2496 100644 --- a/packages/typed-message/dom/Renderer/registry.tsx +++ b/packages/typed-message/dom/Renderer/registry.tsx @@ -6,13 +6,13 @@ import type { TypedMessageAnchor, TypedMessageTuple, TypedMessagePromise, -} from '../../base' -import { TypedMessageTextRenderer } from './Core/Text' -import { TypedMessageImageRenderer } from './Core/Image' -import { TypedMessageTupleRenderer } from './Core/Tuple' -import { TypedMessagePromiseRenderer } from './Core/Promise' -import { TypedMessageUnknownRenderer } from './Core/Unknown' -import { TypedMessageAnchorRenderer } from './Extension/Anchor' +} from '../../base/index.js' +import { TypedMessageTextRenderer } from './Core/Text.js' +import { TypedMessageImageRenderer } from './Core/Image.js' +import { TypedMessageTupleRenderer } from './Core/Tuple.js' +import { TypedMessagePromiseRenderer } from './Core/Promise.js' +import { TypedMessageUnknownRenderer } from './Core/Unknown.js' +import { TypedMessageAnchorRenderer } from './Extension/Anchor.js' export interface RenderConfig { component: React.ComponentType diff --git a/packages/typed-message/dom/Renderer/utils/RegistryContext.tsx b/packages/typed-message/dom/Renderer/utils/RegistryContext.tsx index df5c6e28c092..e52e9abe0e83 100644 --- a/packages/typed-message/dom/Renderer/utils/RegistryContext.tsx +++ b/packages/typed-message/dom/Renderer/utils/RegistryContext.tsx @@ -1,5 +1,5 @@ import { createContext } from 'react' -import type { RenderConfig } from '../registry' +import type { RenderConfig } from '../registry.js' export const RegistryContext = createContext<(type: string) => undefined | RenderConfig>(() => { console.error( diff --git a/packages/typed-message/dom/Renderer/utils/RenderFragments.tsx b/packages/typed-message/dom/Renderer/utils/RenderFragments.tsx index 7641a3393c7b..54f683cc5e77 100644 --- a/packages/typed-message/dom/Renderer/utils/RenderFragments.tsx +++ b/packages/typed-message/dom/Renderer/utils/RenderFragments.tsx @@ -1,5 +1,5 @@ import { createContext, memo } from 'react' -import type { MetadataRenderProps } from '../MetadataRender' +import type { MetadataRenderProps } from '../MetadataRender.js' export const DefaultRenderFragments = { Text: memo((props: RenderFragmentsContextType.TextProps) => <>{props.children}), diff --git a/packages/typed-message/dom/Renderer/utils/TransformContext.ts b/packages/typed-message/dom/Renderer/utils/TransformContext.ts index 144d8d5d4299..e139fafae4b1 100644 --- a/packages/typed-message/dom/Renderer/utils/TransformContext.ts +++ b/packages/typed-message/dom/Renderer/utils/TransformContext.ts @@ -1,4 +1,4 @@ -import { Transformer, TypedMessage, emptyTransformationContext, TransformationContext } from '../../../base' +import { Transformer, TypedMessage, emptyTransformationContext, TransformationContext } from '../../../base/index.js' import { createContext, useContext, useMemo } from 'react' export const TransformerProvider = createContext((x) => x) export const TransformationContextProvider = createContext(emptyTransformationContext) diff --git a/packages/typed-message/dom/Renderer/utils/renderText.tsx b/packages/typed-message/dom/Renderer/utils/renderText.tsx index c02793d2d2a8..3d12fc181531 100644 --- a/packages/typed-message/dom/Renderer/utils/renderText.tsx +++ b/packages/typed-message/dom/Renderer/utils/renderText.tsx @@ -1,7 +1,7 @@ import { memo, Fragment, createElement, useContext } from 'react' -import { RenderFragmentsContext, RenderFragmentsContextType, DefaultRenderFragments } from './RenderFragments' -import type { TypedMessageAnchor } from '../../../base' -import { parseLink } from '../../../base/utils/parseLink' +import { RenderFragmentsContext, RenderFragmentsContextType, DefaultRenderFragments } from './RenderFragments.js' +import type { TypedMessageAnchor } from '../../../base/index.js' +import { parseLink } from '../../../base/utils/parseLink.js' /** @internal */ export interface RenderTextProps { diff --git a/packages/typed-message/dom/index.ts b/packages/typed-message/dom/index.ts index 8b20633048f8..17e80b51e728 100644 --- a/packages/typed-message/dom/index.ts +++ b/packages/typed-message/dom/index.ts @@ -1,23 +1,23 @@ // Render -export { TypedMessageRender, TypedMessageRenderInline, type RenderProps } from './Renderer/Entry' -export { useMetadataRender, type MetadataRenderProps } from './Renderer/MetadataRender' +export { TypedMessageRender, TypedMessageRenderInline, type RenderProps } from './Renderer/Entry.js' +export { useMetadataRender, type MetadataRenderProps } from './Renderer/MetadataRender.js' // Render behavior -export { TextResizeContext } from './Renderer/utils/TextResizerContext' -export { TUPLE_RENDER_STYLE } from './Renderer/Core/Tuple' +export { TextResizeContext } from './Renderer/utils/TextResizerContext.js' +export { TUPLE_RENDER_STYLE } from './Renderer/Core/Tuple.js' // Render Registry -export { type RenderConfig, createTypedMessageRenderRegistry } from './Renderer/registry' +export { type RenderConfig, createTypedMessageRenderRegistry } from './Renderer/registry.js' export { RenderFragmentsContext, type RenderFragmentsContextType, DefaultRenderFragments, -} from './Renderer/utils/RenderFragments' -export { RegistryContext } from './Renderer/utils/RegistryContext' +} from './Renderer/utils/RenderFragments.js' +export { RegistryContext } from './Renderer/utils/RegistryContext.js' // Transformation export { TransformerProvider, useTransformedValue, TransformationContextProvider, -} from './Renderer/utils/TransformContext' +} from './Renderer/utils/TransformContext.js' diff --git a/packages/typed-message/dom/tsconfig.json b/packages/typed-message/dom/tsconfig.json index 3e753ffac6e6..2ff9cc3babf0 100644 --- a/packages/typed-message/dom/tsconfig.json +++ b/packages/typed-message/dom/tsconfig.json @@ -1,6 +1,8 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", "rootDir": "../dom/", "outDir": "../dist/dom", "tsBuildInfoFile": "../dist/dom.tsbuildinfo" diff --git a/packages/typed-message/package.json b/packages/typed-message/package.json index 4c8259aaecb2..dcb737d9706e 100644 --- a/packages/typed-message/package.json +++ b/packages/typed-message/package.json @@ -1,24 +1,24 @@ { "name": "@masknet/typed-message", - "version": "0.0.0", "private": true, "type": "module", - "scripts": {}, - "dependencies": { - "@msgpack/msgpack": "^2.7.2", - "@mui/material": "link:..\\empty", - "anchorme": "^2.1.2", - "immer": "^9.0.12", - "z-schema": "^5.0.2" - }, "exports": { ".": { + "types": "./dist/base/index.d.ts", "webpack": "./base/index.ts", "default": "./dist/base/index.js" }, "./dom": { + "types": "./dist/dom/index.d.ts", "webpack": "./dom/index.ts", "default": "./dist/dom/index.js" } + }, + "dependencies": { + "@msgpack/msgpack": "^2.7.2", + "@mui/material": "link:..\\empty", + "anchorme": "^2.1.2", + "immer": "^9.0.12", + "z-schema": "^5.0.2" } } diff --git a/patches/ts-results+3.3.0.patch b/patches/ts-results+3.3.0.patch index f582333eca94..4ad6ddc48588 100644 --- a/patches/ts-results+3.3.0.patch +++ b/patches/ts-results+3.3.0.patch @@ -1,4 +1,4 @@ -# generated by patch-package 6.5.0 on 2021-11-20 09:53:03 +# generated by patch-package 6.5.0 on 2022-04-10 14:55:17 # # command: # npx patch-package ts-results --exclude nothing @@ -41,11 +41,31 @@ index 5a79d2a..0e92b8a 100644 /** * Contains the error value */ +diff --git a/node_modules/ts-results/index.d.ts b/node_modules/ts-results/index.d.ts +index 3dca8ed..4685003 100644 +--- a/node_modules/ts-results/index.d.ts ++++ b/node_modules/ts-results/index.d.ts +@@ -1,3 +1,3 @@ +-export * from './result'; +-export * from './option'; ++export * from './result.js'; ++export * from './option.js'; + //# sourceMappingURL=index.d.ts.map +diff --git a/node_modules/ts-results/option.d.ts b/node_modules/ts-results/option.d.ts +index 7fcb9a8..7daa9bd 100644 +--- a/node_modules/ts-results/option.d.ts ++++ b/node_modules/ts-results/option.d.ts +@@ -1,4 +1,4 @@ +-import { Result, Ok, Err } from './result'; ++import { Result, Ok, Err } from './result.js'; + interface BaseOption extends Iterable ? U : never> { + /** `true` when the Option is Some */ readonly some: boolean; + /** `true` when the Option is None */ readonly none: boolean; diff --git a/node_modules/ts-results/package.json b/node_modules/ts-results/package.json -index 6f35cbe..889423c 100644 +index 6f35cbe..ba38fe3 100644 --- a/node_modules/ts-results/package.json +++ b/node_modules/ts-results/package.json -@@ -2,7 +2,8 @@ +@@ -2,8 +2,15 @@ "name": "ts-results", "version": "3.3.0", "description": "A typescript implementation of Rust's Result and Option objects.", @@ -53,5 +73,22 @@ index 6f35cbe..889423c 100644 + "type": "module", + "main": "./esm/index.js", "module": "./esm/index.js", ++ "exports": { ++ ".": { ++ "types": "./index.d.ts", ++ "default": "./esm/index.js" ++ } ++ }, "types": "index.d.ts", "keywords": [ + "Rust", +diff --git a/node_modules/ts-results/result.d.ts b/node_modules/ts-results/result.d.ts +index d2a9815..6ffa649 100644 +--- a/node_modules/ts-results/result.d.ts ++++ b/node_modules/ts-results/result.d.ts +@@ -1,4 +1,4 @@ +-import { Option } from './option'; ++import { Option } from './option.js'; + interface BaseResult extends Iterable ? U : never> { + /** `true` when the result is Ok */ readonly ok: boolean; + /** `true` when the result is Err */ readonly err: boolean; From 18090738ca96a6bbfeda42d6be556173d21c545a Mon Sep 17 00:00:00 2001 From: Jack Works Date: Tue, 12 Apr 2022 11:05:04 +0800 Subject: [PATCH 2/9] fix: lockfile --- pnpm-lock.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bcc05365e881..05f28653d0f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1195,13 +1195,11 @@ importers: '@msgpack/msgpack': ^2.7.2 '@mui/material': link:..\empty anchorme: ^2.1.2 - immer: ^9.0.12 z-schema: ^5.0.3 dependencies: '@msgpack/msgpack': 2.7.2 '@mui/material': link:../empty anchorme: 2.1.2 - immer: 9.0.12 z-schema: 5.0.3 packages/web3-constants: From d45cb96a4ffaeef243cd91eeeca03cbeaa7f6e56 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Tue, 12 Apr 2022 11:13:19 +0800 Subject: [PATCH 3/9] fix: lockfile --- packages/typed-message/package.json | 1 + pnpm-lock.yaml | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/typed-message/package.json b/packages/typed-message/package.json index bb58032e14cf..dd7787c89209 100644 --- a/packages/typed-message/package.json +++ b/packages/typed-message/package.json @@ -18,6 +18,7 @@ "@msgpack/msgpack": "^2.7.2", "@mui/material": "link:..\\empty", "anchorme": "^2.1.2", + "immer": "^9.0.12", "z-schema": "^5.0.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05f28653d0f7..6cce4e3b896b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1195,11 +1195,13 @@ importers: '@msgpack/msgpack': ^2.7.2 '@mui/material': link:..\empty anchorme: ^2.1.2 + immer: ^9.0.12 z-schema: ^5.0.3 dependencies: '@msgpack/msgpack': 2.7.2 '@mui/material': link:../empty anchorme: 2.1.2 + immer: 9.0.12 z-schema: 5.0.3 packages/web3-constants: @@ -27344,7 +27346,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-js/fabb7660f23f2252c141077e32193d281036299e: - resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-js/tar.gz/fabb7660f23f2252c141077e32193d281036299e} + resolution: {commit: fabb7660f23f2252c141077e32193d281036299e, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-js.git, type: git} name: wyvern-js version: 3.2.0 dependencies: @@ -27376,7 +27378,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-schemas/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26: - resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-schemas/tar.gz/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26} + resolution: {commit: e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-schemas.git, type: git} name: wyvern-schemas version: 0.10.7 dependencies: @@ -27391,7 +27393,7 @@ packages: dev: false github.com/ProjectWyvern/ethereumjs-abi/3d2d89641a6ad5984929b6ca4b646452ec74f73d: - resolution: {tarball: https://codeload.github.com/ProjectWyvern/ethereumjs-abi/tar.gz/3d2d89641a6ad5984929b6ca4b646452ec74f73d} + resolution: {commit: 3d2d89641a6ad5984929b6ca4b646452ec74f73d, repo: git+ssh://git@github.com/ProjectWyvern/ethereumjs-abi.git, type: git} name: ethereumjs-abi version: 0.6.6 dependencies: @@ -27400,7 +27402,7 @@ packages: dev: false github.com/ahultgren/async-eventemitter/fa06e39e56786ba541c180061dbf2c0a5bbf951c: - resolution: {tarball: https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c} + resolution: {commit: fa06e39e56786ba541c180061dbf2c0a5bbf951c, repo: git+ssh://git@github.com/ahultgren/async-eventemitter.git, type: git} name: async-eventemitter version: 0.2.3 dependencies: From 5ce233191507a5bd09d56aac751d8ee6b58d7046 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Tue, 12 Apr 2022 20:02:58 +0800 Subject: [PATCH 4/9] chore: upgrade to types/react 18.0.1 --- package.json | 4 +- pnpm-lock.yaml | 336 ++++++++++++++++++++++++------------------------- 2 files changed, 170 insertions(+), 170 deletions(-) diff --git a/package.json b/package.json index f132177f5a4e..758baaba1a7a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@mui/material": "5.6.1", "@mui/system": "5.6.1", "@types/masknet__global-types": "workspace:*", - "@types/react": "18.0.1", + "@types/react": "18.0.2", "@types/react-dom": "^18.0.0", "@types/web": "^0.0.61", "lodash": "^4.17.21", @@ -83,7 +83,7 @@ "pnpm": { "overrides": { "@types/node": "^17.0.23", - "@types/react": "18.0.1" + "@types/react": "18.0.2" }, "onlyBuiltDependencies": [] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6cce4e3b896b..dd72e46ad2fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ onlyBuiltDependencies: [] overrides: '@types/node': ^17.0.23 - '@types/react': 18.0.1 + '@types/react': 18.0.2 importers: @@ -32,7 +32,7 @@ importers: '@swc/core': ^1.2.165 '@types/lodash-es': ^4.17.6 '@types/masknet__global-types': workspace:* - '@types/react': 18.0.1 + '@types/react': 18.0.2 '@types/react-dom': ^18.0.0 '@types/web': ^0.0.61 '@typescript-eslint/experimental-utils': ^5.18.0 @@ -63,16 +63,16 @@ importers: dependencies: '@dimensiondev/kit': 0.0.0-20220228054820-f2378be '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 '@emotion/serialize': 1.0.3 - '@emotion/styled': 11.8.1_64d3086ac63367e0e252e331e816a4a7 + '@emotion/styled': 11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6 '@emotion/utils': 1.1.0 - '@mui/icons-material': 5.6.1_bb4aea03edb4a049b08296da68fb5fb2 - '@mui/lab': 5.0.0-alpha.77_7f9def88eccee610086e11579ddae85c - '@mui/material': 5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0 - '@mui/system': 5.6.1_a8e4c1d5d6504c83bcced91ba3634c66 + '@mui/icons-material': 5.6.1_15f9e73798f83ff073fea11061a4a4f7 + '@mui/lab': 5.0.0-alpha.77_594218741661fc54915c073d63b4aa87 + '@mui/material': 5.6.1_1376d0c029fe63cac75d7e36fe4212f4 + '@mui/system': 5.6.1_de97b6be3b01c831652fad9cf8222fb8 '@types/masknet__global-types': link:packages/polyfills/types - '@types/react': 18.0.1 + '@types/react': 18.0.2 '@types/react-dom': 18.0.0 '@types/web': 0.0.61 lodash: 4.17.21 @@ -224,12 +224,12 @@ importers: zod: 3.14.4 devDependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-essentials': 6.4.21_225a530d9cd6791e9719186612ddf1a5 + '@storybook/addon-actions': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-essentials': 6.4.21_46a386e8179f97510cfe1e4b3d652301 '@storybook/addon-links': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/manager-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/react': 6.4.21_4211773f781695c10dfc3a14b84b9785 + '@storybook/builder-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/manager-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/react': 6.4.21_859b80d179c0972c67d4b5505974e33b babel-loader: 8.2.4_@babel+core@7.17.9 packages/empty: @@ -1065,7 +1065,7 @@ importers: '@mui/material': link:..\empty '@mui/system': link:..\empty '@servie/events': ^3.0.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 anchorme: ^2.1.2 async-call-rpc: ^6.0.2 bignumber.js: ^9.0.2 @@ -1090,7 +1090,7 @@ importers: '@mui/material': link:../empty '@mui/system': link:../empty '@servie/events': 3.0.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 anchorme: 2.1.2 async-call-rpc: 6.0.2 bignumber.js: 9.0.2 @@ -1134,7 +1134,7 @@ importers: webpack: ^5.72.0 devDependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/react': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 + '@storybook/react': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 '@swc/core': 1.2.165 stream-browserify: 3.0.0 swc-loader: 0.1.15_@swc+core@1.2.165+webpack@5.72.0 @@ -1182,12 +1182,12 @@ importers: use-subscription: 1.6.0_react@18.0.0 devDependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-essentials': 6.4.21_225a530d9cd6791e9719186612ddf1a5 + '@storybook/addon-actions': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-essentials': 6.4.21_46a386e8179f97510cfe1e4b3d652301 '@storybook/addon-links': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/manager-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/react': 6.4.21_4211773f781695c10dfc3a14b84b9785 + '@storybook/builder-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/manager-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/react': 6.4.21_859b80d179c0972c67d4b5505974e33b babel-loader: 8.2.4_@babel+core@7.17.9 packages/typed-message: @@ -4154,7 +4154,7 @@ packages: resolution: {integrity: sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==} dev: false - /@emotion/react/11.9.0_@types+react@18.0.1+react@18.0.0: + /@emotion/react/11.9.0_@types+react@18.0.2+react@18.0.0: resolution: {integrity: sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==} peerDependencies: '@babel/core': ^7.0.0 @@ -4172,7 +4172,7 @@ packages: '@emotion/serialize': 1.0.3 '@emotion/utils': 1.1.0 '@emotion/weak-memoize': 0.2.5 - '@types/react': 18.0.1 + '@types/react': 18.0.2 hoist-non-react-statics: 3.3.2 react: 18.0.0 dev: false @@ -4245,7 +4245,7 @@ packages: react: 18.0.0 dev: true - /@emotion/styled/11.8.1_64d3086ac63367e0e252e331e816a4a7: + /@emotion/styled/11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6: resolution: {integrity: sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==} peerDependencies: '@babel/core': ^7.0.0 @@ -4261,10 +4261,10 @@ packages: '@babel/runtime': 7.17.2 '@emotion/babel-plugin': 11.7.2 '@emotion/is-prop-valid': 1.1.2 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 '@emotion/serialize': 1.0.3 '@emotion/utils': 1.1.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 react: 18.0.0 dev: false @@ -5537,7 +5537,7 @@ packages: engines: {node: '>= 10'} dev: false - /@mui/base/5.0.0-alpha.76_d1b655986da7bf62d1172c7ae6e89165: + /@mui/base/5.0.0-alpha.76_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-Pd0l4DvjXiGRyipn/CTDlYB2XrJwhpLktVXvbvcmzL2SMDaNprSarZqBkPHIubkulmRDZEEcnFDrpKgeSJDg4A==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5550,10 +5550,10 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@emotion/is-prop-valid': 1.1.2 - '@mui/types': 7.1.3_@types+react@18.0.1 + '@mui/types': 7.1.3_@types+react@18.0.2 '@mui/utils': 5.6.1_react@18.0.0 '@popperjs/core': 2.11.5 - '@types/react': 18.0.1 + '@types/react': 18.0.2 clsx: 1.1.1 prop-types: 15.8.1 react: 18.0.0 @@ -5561,7 +5561,7 @@ packages: react-is: 17.0.2 dev: false - /@mui/icons-material/5.6.1_bb4aea03edb4a049b08296da68fb5fb2: + /@mui/icons-material/5.6.1_15f9e73798f83ff073fea11061a4a4f7: resolution: {integrity: sha512-I1x8u+FRLOmoJpRJASMx9UG+jZrSkNLyRQmBXivQQwXu3m3iasMoaKYhhI0J18t8+FWktbkNTp63oEUHE9Gw0Q==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5573,12 +5573,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@mui/material': 5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0 - '@types/react': 18.0.1 + '@mui/material': 5.6.1_1376d0c029fe63cac75d7e36fe4212f4 + '@types/react': 18.0.2 react: 18.0.0 dev: false - /@mui/lab/5.0.0-alpha.77_7f9def88eccee610086e11579ddae85c: + /@mui/lab/5.0.0-alpha.77_594218741661fc54915c073d63b4aa87: resolution: {integrity: sha512-N+XVPqb3/IAH2i6oz2rk0sPogxOws9FNG045702z6cGL/F9lccOxF+3B12GxrHgKt9dmdeGV+BYDIf0bv2W+Eg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5603,12 +5603,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@mui/base': 5.0.0-alpha.76_d1b655986da7bf62d1172c7ae6e89165 - '@mui/material': 5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0 - '@mui/system': 5.6.1_a8e4c1d5d6504c83bcced91ba3634c66 + '@mui/base': 5.0.0-alpha.76_31fee5138b61bcdeb416e3946f47cd38 + '@mui/material': 5.6.1_1376d0c029fe63cac75d7e36fe4212f4 + '@mui/system': 5.6.1_de97b6be3b01c831652fad9cf8222fb8 '@mui/utils': 5.6.1_react@18.0.0 '@mui/x-date-pickers': 5.0.0-alpha.0_e844a6e16fd7d7a28f33fa21f9f2d7df - '@types/react': 18.0.1 + '@types/react': 18.0.2 clsx: 1.1.1 prop-types: 15.8.1 react: 18.0.0 @@ -5621,7 +5621,7 @@ packages: - '@emotion/styled' dev: false - /@mui/material/5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0: + /@mui/material/5.6.1_1376d0c029fe63cac75d7e36fe4212f4: resolution: {integrity: sha512-xg6pPq+1jxWupwmPpnfmsHNjrsOe2xynUQWrRfcH8WHrrr1sQulq0VF4gORq/l8DD8a/jb4s8SsC20e/e6mHKQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5639,13 +5639,13 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 - '@emotion/styled': 11.8.1_64d3086ac63367e0e252e331e816a4a7 - '@mui/base': 5.0.0-alpha.76_d1b655986da7bf62d1172c7ae6e89165 - '@mui/system': 5.6.1_a8e4c1d5d6504c83bcced91ba3634c66 - '@mui/types': 7.1.3_@types+react@18.0.1 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 + '@emotion/styled': 11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6 + '@mui/base': 5.0.0-alpha.76_31fee5138b61bcdeb416e3946f47cd38 + '@mui/system': 5.6.1_de97b6be3b01c831652fad9cf8222fb8 + '@mui/types': 7.1.3_@types+react@18.0.2 '@mui/utils': 5.6.1_react@18.0.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 '@types/react-transition-group': 4.4.4 clsx: 1.1.1 csstype: 3.0.11 @@ -5657,7 +5657,7 @@ packages: react-transition-group: 4.4.2_react-dom@18.0.0+react@18.0.0 dev: false - /@mui/private-theming/5.6.1_@types+react@18.0.1+react@18.0.0: + /@mui/private-theming/5.6.1_@types+react@18.0.2+react@18.0.0: resolution: {integrity: sha512-8lgh+tUt/3ftStfvml3dwAzhW3fe/cUFjLcBViOTnWk7UixWR79me4qehsO4NVj0THpu3d2qclrLzdD8qBAWAQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5669,7 +5669,7 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@mui/utils': 5.6.1_react@18.0.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 prop-types: 15.8.1 react: 18.0.0 dev: false @@ -5689,13 +5689,13 @@ packages: dependencies: '@babel/runtime': 7.17.9 '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 - '@emotion/styled': 11.8.1_64d3086ac63367e0e252e331e816a4a7 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 + '@emotion/styled': 11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6 prop-types: 15.8.1 react: 18.0.0 dev: false - /@mui/system/5.6.1_a8e4c1d5d6504c83bcced91ba3634c66: + /@mui/system/5.6.1_de97b6be3b01c831652fad9cf8222fb8: resolution: {integrity: sha512-Y5pDvEOK6VOY+0vgNeyDuEEO5QCinhXbZQDyLOlaGLKuAoRGLXO9pcSsjZoGkewYZitXD44EDfgBQ+BqsAfgUA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5712,20 +5712,20 @@ packages: optional: true dependencies: '@babel/runtime': 7.17.9 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 - '@emotion/styled': 11.8.1_64d3086ac63367e0e252e331e816a4a7 - '@mui/private-theming': 5.6.1_@types+react@18.0.1+react@18.0.0 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 + '@emotion/styled': 11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6 + '@mui/private-theming': 5.6.1_@types+react@18.0.2+react@18.0.0 '@mui/styled-engine': 5.6.1_840a430ee8e73823706c6e9dc692d93a - '@mui/types': 7.1.3_@types+react@18.0.1 + '@mui/types': 7.1.3_@types+react@18.0.2 '@mui/utils': 5.6.1_react@18.0.0 - '@types/react': 18.0.1 + '@types/react': 18.0.2 clsx: 1.1.1 csstype: 3.0.11 prop-types: 15.8.1 react: 18.0.0 dev: false - /@mui/types/7.1.3_@types+react@18.0.1: + /@mui/types/7.1.3_@types+react@18.0.2: resolution: {integrity: sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==} peerDependencies: '@types/react': '*' @@ -5733,7 +5733,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@mui/utils/5.6.1_react@18.0.0: @@ -5775,8 +5775,8 @@ packages: '@date-io/dayjs': 2.13.1 '@date-io/luxon': 2.13.1 '@date-io/moment': 2.13.1 - '@mui/material': 5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0 - '@mui/system': 5.6.1_a8e4c1d5d6504c83bcced91ba3634c66 + '@mui/material': 5.6.1_1376d0c029fe63cac75d7e36fe4212f4 + '@mui/system': 5.6.1_de97b6be3b01c831652fad9cf8222fb8 '@mui/utils': 5.6.1_react@18.0.0 clsx: 1.1.1 prop-types: 15.8.1 @@ -6523,7 +6523,7 @@ packages: '@stablelib/xchacha20': 1.0.1 dev: false - /@storybook/addon-actions/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-actions/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-rqEsAHwywZZv9Zzv6A/QXNLiosKY6S+JAEoT9VSeDW07d/MvH7FKoF7fQCnm3ZR53et9AazBJttoiyODZsbjxA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6536,7 +6536,7 @@ packages: dependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6558,7 +6558,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-backgrounds/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-backgrounds/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-W7FTIBdztuj3zwQX6c+YdnQQqqk5JrWGJ+OwMIRusG7uPOLeADLVHNwC19avytWuK5xsioawzsj7ZB/Od+z9aA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6572,7 +6572,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6588,7 +6588,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-controls/6.4.21_1c49be8156f74f5ba1929616b8a09d89: + /@storybook/addon-controls/6.4.21_bfee6351a6303f00690ef33a3e04bd61: resolution: {integrity: sha512-lrBmFB/Zog41rIKOohYXmA6yjeust5AtO+ZK02iqQZVCSMfYF9FXN7XRsnd0wv4WbFgPtQbLyWRWerb+IPOvBw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6602,7 +6602,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -6623,7 +6623,7 @@ packages: - webpack-command dev: true - /@storybook/addon-docs/6.4.21_f2506061c4a1a1a0b8053acaf53f9b53: + /@storybook/addon-docs/6.4.21_40b9502c0e5103902b6309d55a7d9ba4: resolution: {integrity: sha512-yaj6f5wHUwju1mq3sAs1CuP01EJ3jwJ5awes/1oH6T3FSumphhECzyMeSWbNheQU/9wGVwMdPRPSjuNumTMOrQ==} peerDependencies: '@storybook/angular': 6.4.21 @@ -6681,17 +6681,17 @@ packages: '@mdx-js/react': 1.6.22_react@18.0.0 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/builder-webpack4': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 + '@storybook/builder-webpack4': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/core': 6.4.21_e0d7a8723707e2900f2054d729ebf052 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/core': 6.4.21_bef5ca359ba9d4b1fe8165a615ff7721 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 '@storybook/node-logger': 6.4.21 '@storybook/postinstall': 6.4.21 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/react': 6.4.21_4211773f781695c10dfc3a14b84b9785 + '@storybook/react': 6.4.21_859b80d179c0972c67d4b5505974e33b '@storybook/source-loader': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -6734,7 +6734,7 @@ packages: - webpack-command dev: true - /@storybook/addon-essentials/6.4.21_225a530d9cd6791e9719186612ddf1a5: + /@storybook/addon-essentials/6.4.21_46a386e8179f97510cfe1e4b3d652301: resolution: {integrity: sha512-2vhbzSMAfQ2Trwrg7E+doWLHy++mhXtV+ksgezo7PATMCKnBK6ItUwGvL7fQzLtaz+JbLqx/tgI8spMCUod+BA==} peerDependencies: '@babel/core': ^7.9.6 @@ -6760,14 +6760,14 @@ packages: optional: true dependencies: '@babel/core': 7.17.9 - '@storybook/addon-actions': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-backgrounds': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-controls': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 - '@storybook/addon-docs': 6.4.21_f2506061c4a1a1a0b8053acaf53f9b53 - '@storybook/addon-measure': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-outline': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-toolbars': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 - '@storybook/addon-viewport': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/addon-actions': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-backgrounds': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-controls': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 + '@storybook/addon-docs': 6.4.21_40b9502c0e5103902b6309d55a7d9ba4 + '@storybook/addon-measure': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-outline': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-toolbars': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 + '@storybook/addon-viewport': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/node-logger': 6.4.21 @@ -6827,7 +6827,7 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/addon-measure/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-measure/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-Gg+/os8erwwMkxqMnMeRtS7zrRBqPlWxYoXCdDEDqWe+sbJ8lbIXpJpBDC7PfVpotVYWuNETSxR3qAfJjWrBRg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6841,7 +6841,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 core-js: 3.21.1 @@ -6852,7 +6852,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-outline/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-outline/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-ADVnl3dOKkzdv32qkS63Fm37keellV98RrNbGDmE4xMiu55/srn/LfklTHRdbUwpKvVxf/44EQ0HXSNJBuWeDg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6866,7 +6866,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 core-js: 3.21.1 @@ -6879,7 +6879,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-toolbars/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-toolbars/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-eu1OkMy4slGsK1jYxfEydQXDW+/VnhBf9zf6JexUh9SVzIWswDzmtsoZ4L1ws/vw7EQcbBBXU4UIG/xy5qH8dA==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6892,7 +6892,7 @@ packages: dependencies: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 core-js: 3.21.1 react: 18.0.0 @@ -6902,7 +6902,7 @@ packages: - '@types/react' dev: true - /@storybook/addon-viewport/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/addon-viewport/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-O+SarJuO+S3ZrGskgMDmDnDjZg+7spCE6zdOuv2OX2wB+OTnoka0P0OhwHsg14Lc5DOWn22rv4q91v6RqAx6Yg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -6916,7 +6916,7 @@ packages: '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 core-js: 3.21.1 @@ -6978,7 +6978,7 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/builder-webpack4/6.4.21_1c49be8156f74f5ba1929616b8a09d89: + /@storybook/builder-webpack4/6.4.21_bfee6351a6303f00690ef33a3e04bd61: resolution: {integrity: sha512-tetK8iZJ/S7U1Hrvm9i5ejH/SKJ/UHJcZ+j1VrzQK15wuwalevYJGJI3Gk2NzqKE8rda4CXPK1ES3iGcS67eZw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7015,7 +7015,7 @@ packages: '@storybook/channels': 6.4.21 '@storybook/client-api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/node-logger': 6.4.21 @@ -7024,7 +7024,7 @@ packages: '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@types/node': 17.0.23 '@types/webpack': 4.41.32 autoprefixer: 9.8.8 @@ -7069,7 +7069,7 @@ packages: - webpack-command dev: true - /@storybook/builder-webpack5/6.4.21_b517851c98b3e544b872272274ace335: + /@storybook/builder-webpack5/6.4.21_042eccd98e18c6c0269a4ca9851468a5: resolution: {integrity: sha512-pUD8+wL2LN1iFHAcpDo0E7lXkL5E6pCqmKmUbkgs1bPgvY0n9gyvDK46H70P/HWu+PGXKMXI/gofsF5ub1NaRQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7105,7 +7105,7 @@ packages: '@storybook/channels': 6.4.21 '@storybook/client-api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/node-logger': 6.4.21 @@ -7219,7 +7219,7 @@ packages: global: 4.4.0 dev: true - /@storybook/components/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/components/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-OnuAS/bMdLKdmkWtDNUxM9qSFCU3pcGWqXzasU3sjvibIcz3472xTFiwjW9UiHR7ipu/YQKALnIbyyjznGY4Kg==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7247,7 +7247,7 @@ packages: react-dom: 18.0.0_react@18.0.0 react-popper-tooltip: 3.1.1_react-dom@18.0.0+react@18.0.0 react-syntax-highlighter: 13.5.3_react@18.0.0 - react-textarea-autosize: 8.3.3_@types+react@18.0.1+react@18.0.0 + react-textarea-autosize: 8.3.3_@types+react@18.0.2+react@18.0.0 regenerator-runtime: 0.13.9 ts-dedent: 2.2.0 util-deprecate: 1.0.2 @@ -7255,7 +7255,7 @@ packages: - '@types/react' dev: true - /@storybook/core-client/6.4.21_904874d2a092b3e6e9532d1f7526317c: + /@storybook/core-client/6.4.21_0ac8a84fd488b5cdea5a942899f0b334: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7275,7 +7275,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7289,11 +7289,12 @@ packages: typescript: 4.7.0-beta unfetch: 4.2.0 util-deprecate: 1.0.2 + webpack: 4.46.0 transitivePeerDependencies: - '@types/react' dev: true - /@storybook/core-client/6.4.21_91a6fb5a9cd3c0c1f1497015a27a6b98: + /@storybook/core-client/6.4.21_28aeb7e933b1113aa8f260c24922fc28: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7313,7 +7314,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7332,7 +7333,7 @@ packages: - '@types/react' dev: true - /@storybook/core-client/6.4.21_e49e2587dce29879831daf26ff13c5d1: + /@storybook/core-client/6.4.21_ccf4397c41fc80734c9a43d281e5b69c: resolution: {integrity: sha512-1zdfhL7ryP5xgcBNuaQplkiPIgPZ2OnIFA1gqun1xl9OBA7K2J115uZ2grQwS7hrhRBqsRIvMv1k9UmAYzXqiw==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7352,7 +7353,7 @@ packages: '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/preview-web': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 airbnb-js-shims: 2.2.1 ansi-to-html: 0.6.15 core-js: 3.21.1 @@ -7366,7 +7367,6 @@ packages: typescript: 4.7.0-beta unfetch: 4.2.0 util-deprecate: 1.0.2 - webpack: 4.46.0 transitivePeerDependencies: - '@types/react' dev: true @@ -7447,7 +7447,7 @@ packages: core-js: 3.21.1 dev: true - /@storybook/core-server/6.4.21_1c49be8156f74f5ba1929616b8a09d89: + /@storybook/core-server/6.4.21_bef5ca359ba9d4b1fe8165a615ff7721: resolution: {integrity: sha512-uOBrLKzERAJvGAtd9ieozoTjEu0Hnr7DnufppG4t14Yu61lcbsT3IzPeZDuFaM3tGjWlNgXIezZ2aBoxTMVokQ==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7464,13 +7464,15 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@storybook/builder-webpack4': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 - '@storybook/core-client': 6.4.21_e49e2587dce29879831daf26ff13c5d1 + '@storybook/builder-webpack4': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 + '@storybook/builder-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/core-client': 6.4.21_0ac8a84fd488b5cdea5a942899f0b334 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 - '@storybook/manager-webpack4': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 + '@storybook/manager-webpack4': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 + '@storybook/manager-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 '@storybook/node-logger': 6.4.21 '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -7520,7 +7522,7 @@ packages: - webpack-command dev: true - /@storybook/core-server/6.4.21_e0d7a8723707e2900f2054d729ebf052: + /@storybook/core-server/6.4.21_bfee6351a6303f00690ef33a3e04bd61: resolution: {integrity: sha512-uOBrLKzERAJvGAtd9ieozoTjEu0Hnr7DnufppG4t14Yu61lcbsT3IzPeZDuFaM3tGjWlNgXIezZ2aBoxTMVokQ==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7537,15 +7539,13 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@storybook/builder-webpack4': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 - '@storybook/builder-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/core-client': 6.4.21_e49e2587dce29879831daf26ff13c5d1 + '@storybook/builder-webpack4': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 + '@storybook/core-client': 6.4.21_0ac8a84fd488b5cdea5a942899f0b334 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/core-events': 6.4.21 '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/csf-tools': 6.4.21 - '@storybook/manager-webpack4': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 - '@storybook/manager-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 + '@storybook/manager-webpack4': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 '@storybook/node-logger': 6.4.21 '@storybook/semver': 7.3.2 '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 @@ -7595,7 +7595,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_771a12d22d1c00970f0993c20e113f9b: + /@storybook/core/6.4.21_1973b18e8ab0a70b19a94580b9d0fd50: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7609,8 +7609,8 @@ packages: typescript: optional: true dependencies: - '@storybook/core-client': 6.4.21_e49e2587dce29879831daf26ff13c5d1 - '@storybook/core-server': 6.4.21_1c49be8156f74f5ba1929616b8a09d89 + '@storybook/core-client': 6.4.21_0ac8a84fd488b5cdea5a942899f0b334 + '@storybook/core-server': 6.4.21_bfee6351a6303f00690ef33a3e04bd61 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7628,7 +7628,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_9482c2b37ee3b129dac76fde7b8ba74b: + /@storybook/core/6.4.21_37daf9f443ddbf2aab898cfad5a2cf4e: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7642,9 +7642,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/core-client': 6.4.21_e49e2587dce29879831daf26ff13c5d1 - '@storybook/core-server': 6.4.21_e0d7a8723707e2900f2054d729ebf052 + '@storybook/builder-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/core-client': 6.4.21_0ac8a84fd488b5cdea5a942899f0b334 + '@storybook/core-server': 6.4.21_bef5ca359ba9d4b1fe8165a615ff7721 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7662,7 +7662,7 @@ packages: - webpack-command dev: true - /@storybook/core/6.4.21_e0d7a8723707e2900f2054d729ebf052: + /@storybook/core/6.4.21_bef5ca359ba9d4b1fe8165a615ff7721: resolution: {integrity: sha512-HNy3L/5stURU5CPyo4Gh/NHhgs6qgvNq82pOr9mhnr2chNOUTh/kaWjrR4k/Mnh8qzItYLs1tpIFKvhclHXAdw==} peerDependencies: '@storybook/builder-webpack5': 6.4.21 @@ -7676,9 +7676,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.4.21_b517851c98b3e544b872272274ace335 - '@storybook/core-client': 6.4.21_904874d2a092b3e6e9532d1f7526317c - '@storybook/core-server': 6.4.21_e0d7a8723707e2900f2054d729ebf052 + '@storybook/builder-webpack5': 6.4.21_042eccd98e18c6c0269a4ca9851468a5 + '@storybook/core-client': 6.4.21_ccf4397c41fc80734c9a43d281e5b69c + '@storybook/core-server': 6.4.21_bef5ca359ba9d4b1fe8165a615ff7721 react: 18.0.0 react-dom: 18.0.0_react@18.0.0 typescript: 4.7.0-beta @@ -7725,7 +7725,7 @@ packages: lodash: 4.17.21 dev: true - /@storybook/manager-webpack4/6.4.21_1c49be8156f74f5ba1929616b8a09d89: + /@storybook/manager-webpack4/6.4.21_bfee6351a6303f00690ef33a3e04bd61: resolution: {integrity: sha512-JhcGU6KtmNQUfSNNgAWIKVKOaupx7+RYw3y6P0JN5km5nzqpipkeJzh+jdMqefJbIRV/psqKm/jpt/pPfaIHyQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7739,11 +7739,11 @@ packages: '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.17.9 '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core-client': 6.4.21_e49e2587dce29879831daf26ff13c5d1 + '@storybook/core-client': 6.4.21_0ac8a84fd488b5cdea5a942899f0b334 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/node-logger': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@types/node': 17.0.23 '@types/webpack': 4.41.32 babel-loader: 8.2.4_598a497cebab8e15ee8f9e5632178e63 @@ -7784,7 +7784,7 @@ packages: - webpack-command dev: true - /@storybook/manager-webpack5/6.4.21_b517851c98b3e544b872272274ace335: + /@storybook/manager-webpack5/6.4.21_042eccd98e18c6c0269a4ca9851468a5: resolution: {integrity: sha512-oAec1kNFVcGSPOht51BN6uE+OvEcZPa04qgqoMu58vBF20XVcNXofs0sJxXTdwNgwPW+xL2rzsGk1GK1EsLmmQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -7798,11 +7798,11 @@ packages: '@babel/plugin-transform-template-literals': 7.16.7_@babel+core@7.17.9 '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core-client': 6.4.21_91a6fb5a9cd3c0c1f1497015a27a6b98 + '@storybook/core-client': 6.4.21_28aeb7e933b1113aa8f260c24922fc28 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/node-logger': 6.4.21 '@storybook/theming': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/ui': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/ui': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@types/node': 17.0.23 babel-loader: 8.2.4_acba72ea4bf9d339cdfcd8f55cdb7006 case-sensitive-paths-webpack-plugin: 2.4.0 @@ -7905,7 +7905,7 @@ packages: - supports-color dev: true - /@storybook/react/6.4.21_1c49be8156f74f5ba1929616b8a09d89: + /@storybook/react/6.4.21_859b80d179c0972c67d4b5505974e33b: resolution: {integrity: sha512-7SJJnEbZ5THQBjor37shxnhXiFTB7g46U68I/PY56A5ZLb4TkorKStrniKgTcxG9xNqQjyxm0S6CICUp9gn8PQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -7920,11 +7920,12 @@ packages: typescript: optional: true dependencies: - '@babel/preset-flow': 7.16.7 - '@babel/preset-react': 7.16.7 + '@babel/core': 7.17.9 + '@babel/preset-flow': 7.16.7_@babel+core@7.17.9 + '@babel/preset-react': 7.16.7_@babel+core@7.17.9 '@pmmmwh/react-refresh-webpack-plugin': 0.5.5_06cd85ae30adde416cafc06517ba554d '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core': 6.4.21_771a12d22d1c00970f0993c20e113f9b + '@storybook/core': 6.4.21_37daf9f443ddbf2aab898cfad5a2cf4e '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -7933,7 +7934,7 @@ packages: '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@types/webpack-env': 1.16.3 babel-plugin-add-react-displayname: 0.0.5 - babel-plugin-named-asset-import: 0.3.8 + babel-plugin-named-asset-import: 0.3.8_@babel+core@7.17.9 babel-plugin-react-docgen: 4.2.1 core-js: 3.21.1 global: 4.4.0 @@ -7967,7 +7968,7 @@ packages: - webpack-plugin-serve dev: true - /@storybook/react/6.4.21_4211773f781695c10dfc3a14b84b9785: + /@storybook/react/6.4.21_bfee6351a6303f00690ef33a3e04bd61: resolution: {integrity: sha512-7SJJnEbZ5THQBjor37shxnhXiFTB7g46U68I/PY56A5ZLb4TkorKStrniKgTcxG9xNqQjyxm0S6CICUp9gn8PQ==} engines: {node: '>=10.13.0'} hasBin: true @@ -7982,12 +7983,11 @@ packages: typescript: optional: true dependencies: - '@babel/core': 7.17.9 - '@babel/preset-flow': 7.16.7_@babel+core@7.17.9 - '@babel/preset-react': 7.16.7_@babel+core@7.17.9 + '@babel/preset-flow': 7.16.7 + '@babel/preset-react': 7.16.7 '@pmmmwh/react-refresh-webpack-plugin': 0.5.5_06cd85ae30adde416cafc06517ba554d '@storybook/addons': 6.4.21_react-dom@18.0.0+react@18.0.0 - '@storybook/core': 6.4.21_9482c2b37ee3b129dac76fde7b8ba74b + '@storybook/core': 6.4.21_1973b18e8ab0a70b19a94580b9d0fd50 '@storybook/core-common': 6.4.21_86f11b2edbb70ee34c965bcefe0038fc '@storybook/csf': 0.0.2--canary.87bc651.0 '@storybook/node-logger': 6.4.21 @@ -7996,7 +7996,7 @@ packages: '@storybook/store': 6.4.21_react-dom@18.0.0+react@18.0.0 '@types/webpack-env': 1.16.3 babel-plugin-add-react-displayname: 0.0.5 - babel-plugin-named-asset-import: 0.3.8_@babel+core@7.17.9 + babel-plugin-named-asset-import: 0.3.8 babel-plugin-react-docgen: 4.2.1 core-js: 3.21.1 global: 4.4.0 @@ -8127,7 +8127,7 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/ui/6.4.21_d1b655986da7bf62d1172c7ae6e89165: + /@storybook/ui/6.4.21_31fee5138b61bcdeb416e3946f47cd38: resolution: {integrity: sha512-jjEEFDm8PAzscn5dN+3YJap9033ce98YYC9FCQVF5sB41CIwI0PD5LUafxWbaxQdL+t/ZlRYXNz3FLNFHMwzcQ==} peerDependencies: react: ^16.8.0 || ^17.0.0 @@ -8138,7 +8138,7 @@ packages: '@storybook/api': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/channels': 6.4.21 '@storybook/client-logger': 6.4.21 - '@storybook/components': 6.4.21_d1b655986da7bf62d1172c7ae6e89165 + '@storybook/components': 6.4.21_31fee5138b61bcdeb416e3946f47cd38 '@storybook/core-events': 6.4.21 '@storybook/router': 6.4.21_react-dom@18.0.0+react@18.0.0 '@storybook/semver': 7.3.2 @@ -8923,32 +8923,32 @@ packages: /@types/react-avatar-editor/10.3.6: resolution: {integrity: sha512-2r9+WYriqXIyjOTxy/DSiCUhr2TBiYD4Gzbyych1WUEwdPboNj0JRz9B5868TwiGgKD61jdWYyKy/OutHs7L6A==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-dom/18.0.0: resolution: {integrity: sha512-49897Y0UiCGmxZqpC8Blrf6meL8QUla6eb+BBhn69dTXlmuOlzkfr7HHY/O8J25e1lTUMs+YYxSlVDAaGHCOLg==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-highlight-words/0.16.4: resolution: {integrity: sha512-KITBX3xzheQLu2s3bUgLmRE7ekmhc52zRjRTwkKayQARh30L4fjEGzGm7ULK9TuX2LgxWWavZqyQGDGjAHbL3w==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-is/17.0.3: resolution: {integrity: sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-router-dom/5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.0.1 + '@types/react': 18.0.2 '@types/react-router': 5.1.18 dev: false @@ -8956,35 +8956,35 @@ packages: resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==} dependencies: '@types/history': 4.7.11 - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-syntax-highlighter/11.0.5: resolution: {integrity: sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: true /@types/react-transition-group/4.4.4: resolution: {integrity: sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-virtualized-auto-sizer/1.0.1: resolution: {integrity: sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false /@types/react-window/1.8.5: resolution: {integrity: sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==} dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 dev: false - /@types/react/18.0.1: - resolution: {integrity: sha512-VnWlrVgG0dYt+NqlfMI0yUYb8Rdl4XUROyH+c6gq/iFCiZ805Vi//26UW38DHnxQkbDhnrIWTBiy6oKZqL11cw==} + /@types/react/18.0.2: + resolution: {integrity: sha512-2poV9ReTwwV5ZNxkKyk7t6Vp/odeTfYI3vRjtDYWfUdEstx9mp26jzELfMBwV6gXg1irhHUnmZJH/dJW7xafcA==} dependencies: '@types/prop-types': 15.7.5 '@types/scheduler': 0.16.2 @@ -20545,9 +20545,9 @@ packages: '@emotion/styled': optional: true dependencies: - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 - '@emotion/styled': 11.8.1_64d3086ac63367e0e252e331e816a4a7 - '@mui/material': 5.6.1_b73e98d62f0f3dc6d8f6fd5b5b22b4f0 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 + '@emotion/styled': 11.8.1_d04d4cdfb6fe6aad6dcad79e21a129f6 + '@mui/material': 5.6.1_1376d0c029fe63cac75d7e36fe4212f4 clsx: 1.1.1 hoist-non-react-statics: 3.3.2 react: 18.0.0 @@ -22213,7 +22213,7 @@ packages: refractor: 3.6.0 dev: true - /react-textarea-autosize/8.3.3_@types+react@18.0.1+react@18.0.0: + /react-textarea-autosize/8.3.3_@types+react@18.0.2+react@18.0.0: resolution: {integrity: sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==} engines: {node: '>=10'} peerDependencies: @@ -22222,7 +22222,7 @@ packages: '@babel/runtime': 7.17.9 react: 18.0.0 use-composed-ref: 1.2.1_react@18.0.0 - use-latest: 1.2.0_@types+react@18.0.1+react@18.0.0 + use-latest: 1.2.0_@types+react@18.0.2+react@18.0.0 transitivePeerDependencies: - '@types/react' dev: true @@ -24991,7 +24991,7 @@ packages: react: ^16.8.0 || ^17.0.2 || ^18.0.0 dependencies: '@emotion/cache': 11.7.1 - '@emotion/react': 11.9.0_@types+react@18.0.1+react@18.0.0 + '@emotion/react': 11.9.0_@types+react@18.0.2+react@18.0.0 '@emotion/serialize': 1.0.3 '@emotion/utils': 1.1.0 react: 18.0.0 @@ -25548,7 +25548,7 @@ packages: react: 18.0.0 dev: true - /use-isomorphic-layout-effect/1.1.2_@types+react@18.0.1+react@18.0.0: + /use-isomorphic-layout-effect/1.1.2_@types+react@18.0.2+react@18.0.0: resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' @@ -25557,11 +25557,11 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 react: 18.0.0 dev: true - /use-latest/1.2.0_@types+react@18.0.1+react@18.0.0: + /use-latest/1.2.0_@types+react@18.0.2+react@18.0.0: resolution: {integrity: sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==} peerDependencies: '@types/react': '*' @@ -25570,9 +25570,9 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.0.1 + '@types/react': 18.0.2 react: 18.0.0 - use-isomorphic-layout-effect: 1.1.2_@types+react@18.0.1+react@18.0.0 + use-isomorphic-layout-effect: 1.1.2_@types+react@18.0.2+react@18.0.0 dev: true /use-subscription/1.6.0_react@18.0.0: @@ -27346,7 +27346,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-js/fabb7660f23f2252c141077e32193d281036299e: - resolution: {commit: fabb7660f23f2252c141077e32193d281036299e, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-js.git, type: git} + resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-js/tar.gz/fabb7660f23f2252c141077e32193d281036299e} name: wyvern-js version: 3.2.0 dependencies: @@ -27378,7 +27378,7 @@ packages: dev: false github.com/ProjectOpenSea/wyvern-schemas/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26: - resolution: {commit: e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26, repo: git+ssh://git@github.com/ProjectOpenSea/wyvern-schemas.git, type: git} + resolution: {tarball: https://codeload.github.com/ProjectOpenSea/wyvern-schemas/tar.gz/e1a08fcf8ce2b11a0fe9cbdc7c9f77c59fadef26} name: wyvern-schemas version: 0.10.7 dependencies: @@ -27393,7 +27393,7 @@ packages: dev: false github.com/ProjectWyvern/ethereumjs-abi/3d2d89641a6ad5984929b6ca4b646452ec74f73d: - resolution: {commit: 3d2d89641a6ad5984929b6ca4b646452ec74f73d, repo: git+ssh://git@github.com/ProjectWyvern/ethereumjs-abi.git, type: git} + resolution: {tarball: https://codeload.github.com/ProjectWyvern/ethereumjs-abi/tar.gz/3d2d89641a6ad5984929b6ca4b646452ec74f73d} name: ethereumjs-abi version: 0.6.6 dependencies: @@ -27402,7 +27402,7 @@ packages: dev: false github.com/ahultgren/async-eventemitter/fa06e39e56786ba541c180061dbf2c0a5bbf951c: - resolution: {commit: fa06e39e56786ba541c180061dbf2c0a5bbf951c, repo: git+ssh://git@github.com/ahultgren/async-eventemitter.git, type: git} + resolution: {tarball: https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c} name: async-eventemitter version: 0.2.3 dependencies: From 1a2be1ed11553f643e7092c8532a9328f68a071b Mon Sep 17 00:00:00 2001 From: Jack Works Date: Tue, 12 Apr 2022 20:15:38 +0800 Subject: [PATCH 5/9] fix: ci --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0cc9c83f7a68..61463ef69800 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - restore_cache: name: Restore PNPM Package Cache keys: - - v3-mask-cache-pnpm + - v4-mask-cache-pnpm - run: name: Enable corepack command: sudo corepack enable @@ -31,7 +31,7 @@ jobs: command: pnpm install --frozen-lockfile --store-dir ~/.pnpm/ - save_cache: name: Save NPM Package Cache - key: v3-mask-cache-npm + key: v4-mask-cache-pnpm paths: - ~/.pnpm/ - persist_to_workspace: From 110e1cf3db594bbaa42e430bdb45c2b3fbfc5a19 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 13 Apr 2022 12:00:20 +0800 Subject: [PATCH 6/9] fix: build error --- .circleci/config.yml | 2 +- .github/workflows/compile.yml | 2 +- .github/workflows/deploy-proxy.yml | 10 ---------- .github/workflows/linters.yml | 6 +++--- jest.config.ts | 1 - packages/mask/.webpack/config.ts | 2 ++ packages/mask/package.json | 1 + pnpm-lock.yaml | 16 ++++++++++++++-- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61463ef69800..40697b538b41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 executors: mask_node: docker: - - image: cimg/node:17.5 + - image: cimg/node:17.8 working_directory: ~/repo commands: restore_workspace: diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 4fe43c6783ed..b1ab3043611c 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -31,7 +31,7 @@ jobs: - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: - node-version: '16' + node-version: '17' cache: 'pnpm' - name: Restore Webpack cache uses: actions/cache@v2 diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index a1f1f90c45e1..9bd3176fa268 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -9,10 +9,6 @@ jobs: packages: write contents: read steps: - - name: Get cache date - id: get-date - run: echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")" - shell: bash - uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} @@ -21,12 +17,6 @@ jobs: - uses: actions/setup-node@v2 with: cache: pnpm - - name: Restore cache - uses: actions/cache@v2 - with: - path: packages/mask/node_modules/.cache/ - key: ${{ runner.os }}-extension-${{ hashFiles('pnpm-lock.yaml') }}-${{ steps.get-date.outputs.date }} - restore-keys: ${{ runner.os }}-extension-${{ hashFiles('pnpm-lock.yaml') }} - uses: DimensionDev/github-token-action@latest with: registry: true diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 09980bec2c26..bff90d350dca 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -55,7 +55,7 @@ jobs: - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: - node-version: "16" + node-version: "17" cache: "pnpm" - run: pnpm install - run: npx gulp locale-kit @@ -72,7 +72,7 @@ jobs: - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: - node-version: "16" + node-version: "17" cache: "pnpm" - run: pnpm install - run: npx gulp codegen @@ -87,7 +87,7 @@ jobs: - uses: pnpm/action-setup@v2.2.1 - uses: actions/setup-node@v2 with: - node-version: "16" + node-version: "17" cache: "pnpm" - run: pnpm install - name: Run Eslint diff --git a/jest.config.ts b/jest.config.ts index 31ccf0f896fb..f3c63bc5235d 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -24,7 +24,6 @@ const config: InitialOptionsTsJest = { extensionsToTreatAsEsm: ['.ts', '.tsx'], moduleNameMapper: { '@masknet/shared-base': '/packages/shared-base/src/index.ts', - '@masknet/typed-message': '/packages/typed-message/base/index.ts', '@masknet/public-api': '/packages/public-api/src/index.ts', 'jest-websocket-mock': '/packages/web3-shared/base/node_modules/jest-websocket-mock', 'reconnecting-websocket': '/packages/web3-shared/base/node_modules/reconnecting-websocket', diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index ad3ef35989ef..04395d158fe6 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -15,6 +15,7 @@ import { isAbsolute, join } from 'path' import { readFileSync } from 'fs' import { nonNullable, EntryDescription, normalizeEntryDescription, joinEntryItem } from './utils' import { BuildFlags, normalizeBuildFlags, computedBuildFlags } from './flags' +import ResolveTypeScriptPlugin from 'resolve-typescript-plugin' import './clean-hmr' @@ -52,6 +53,7 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration { })(), }, resolve: { + plugins: [new ResolveTypeScriptPlugin()], extensions: ['.js', '.ts', '.tsx'], alias: (() => { const alias = { diff --git a/packages/mask/package.json b/packages/mask/package.json index 815712175efd..3c584d161b21 100644 --- a/packages/mask/package.json +++ b/packages/mask/package.json @@ -139,6 +139,7 @@ "html-webpack-plugin": "^5.5.0", "react-devtools-core": "^4.24.4", "react-refresh": "^0.12.0", + "resolve-typescript-plugin": "^1.1.6", "source-map-loader": "^3.0.1", "swc-loader": "^0.1.15", "webpack": "^5.72.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd72e46ad2fb..be09674594cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -397,6 +397,7 @@ importers: react-virtualized-auto-sizer: ^1.0.6 react-window: ^1.8.6 remarkable: ^2.0.1 + resolve-typescript-plugin: ^1.1.6 rss3-next: ^0.6.17 safari-14-idb-fix: ^3.0.0 scrypt-js: ^3.0.1 @@ -558,6 +559,7 @@ importers: html-webpack-plugin: 5.5.0_webpack@5.72.0 react-devtools-core: 4.24.4 react-refresh: 0.12.0 + resolve-typescript-plugin: 1.1.6_webpack@5.72.0 source-map-loader: 3.0.1_webpack@5.72.0 swc-loader: 0.1.15_@swc+core@1.2.165+webpack@5.72.0 webpack: 5.72.0_d159b08e00e92b5d1326c67bfa14033d @@ -22799,6 +22801,16 @@ packages: value-or-function: 3.0.0 dev: true + /resolve-typescript-plugin/1.1.6_webpack@5.72.0: + resolution: {integrity: sha512-9zoYKgKFB1StPRpK7l60T+c8i2OTqxPioaWqYdoXJJI7dswiMP7HkMY6pbppwqmTxieZSmLA7+t1ca7lbDI51Q==} + engines: {node: ^12 || ^14 || >=16} + peerDependencies: + webpack: ^5.0.0 + dependencies: + tslib: 2.3.1 + webpack: 5.72.0_d159b08e00e92b5d1326c67bfa14033d + dev: true + /resolve-url/0.2.1: resolution: {integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=} deprecated: https://github.com/lydell/resolve-url#deprecated @@ -24277,7 +24289,7 @@ packages: dependencies: '@swc/core': 1.2.165 loader-utils: 2.0.2 - webpack: 5.72.0_@swc+core@1.2.165 + webpack: 5.72.0_d159b08e00e92b5d1326c67bfa14033d dev: true /symbol-tree/3.2.4: @@ -24446,7 +24458,7 @@ packages: serialize-javascript: 6.0.0 source-map: 0.6.1 terser: 5.12.1 - webpack: 5.72.0_@swc+core@1.2.165 + webpack: 5.72.0_d159b08e00e92b5d1326c67bfa14033d dev: true /terser/4.8.0: From 979e6382b81ef1e099376f0ecb7adc0d4cd0bf18 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 13 Apr 2022 12:06:41 +0800 Subject: [PATCH 7/9] revert circle ci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40697b538b41..61463ef69800 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ version: 2.1 executors: mask_node: docker: - - image: cimg/node:17.8 + - image: cimg/node:17.5 working_directory: ~/repo commands: restore_workspace: From e0045d3862ec61751211fd4cb8037463cd9f34ef Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 13 Apr 2022 14:05:35 +0800 Subject: [PATCH 8/9] fix: cjs-esm coop --- packages/typed-message/base/utils/parseLink.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/typed-message/base/utils/parseLink.ts b/packages/typed-message/base/utils/parseLink.ts index fc04672c3354..a0940446df71 100644 --- a/packages/typed-message/base/utils/parseLink.ts +++ b/packages/typed-message/base/utils/parseLink.ts @@ -13,7 +13,8 @@ export type ParseLinkResult = } export function parseLink(text: string): ParseLinkResult[] { - const parsed = anchorme.default.list(text) + // ESM-CJS cooperation + const parsed = (anchorme as any as typeof anchorme.default).list(text) const result: ParseLinkResult[] = [] From cd9c87c9bf92b490913622e1f6e5bb38bc5c662b Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 13 Apr 2022 14:27:18 +0800 Subject: [PATCH 9/9] fix: cjs-esm coop --- packages/typed-message/base/utils/metadata.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typed-message/base/utils/metadata.ts b/packages/typed-message/base/utils/metadata.ts index 5d0506fa0a2e..fdf2d88922bf 100644 --- a/packages/typed-message/base/utils/metadata.ts +++ b/packages/typed-message/base/utils/metadata.ts @@ -84,7 +84,7 @@ export function editMetadata( metadata: TypedMessage['meta'], edit: (meta: NonNullable>) => void, ): NonNullable { - return draft.default(metadata || new Map(), (e) => void edit(e)) + return (draft as any as typeof draft.default)(metadata || new Map(), (e) => void edit(e)) } export function editTypedMessageMeta( typedMessage: T,