refactor: move @masknet/typed-message package to esm

.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:

.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

.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

.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

jest.config.ts

@@ -24,7 +24,6 @@ const config: InitialOptionsTsJest = {
     extensionsToTreatAsEsm: ['.ts', '.tsx'],
     moduleNameMapper: {
         '@masknet/shared-base': '<rootDir>/packages/shared-base/src/index.ts',
-        '@masknet/typed-message': '<rootDir>/packages/typed-message/base/index.ts',
         '@masknet/public-api': '<rootDir>/packages/public-api/src/index.ts',
         'jest-websocket-mock': '<rootDir>/packages/web3-shared/base/node_modules/jest-websocket-mock',
         'reconnecting-websocket': '<rootDir>/packages/web3-shared/base/node_modules/reconnecting-websocket',

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": []
   }

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 = {

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",

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) {

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) {

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'

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'

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

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

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<T extends TypedMessage = TypedMessage> extends NonSerializableTypedMessage {
     readonly type: 'promise'

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
 

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<T extends readonly TypedMessage[] = readonly TypedMessage[]> extends TypedMessage {

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'

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()

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.

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 {

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(

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)

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

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 {
     /**

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)) {

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

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'

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"