Skip to content

Commit fa65f27

Browse files
authored
feat: replace ts-jest with babel (#131)
1 parent 0c5bf8f commit fa65f27

File tree

22 files changed

+131
-255
lines changed

22 files changed

+131
-255
lines changed

babel.config.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/preset-env',
5+
{
6+
targets: {
7+
node: 'current',
8+
},
9+
modules: 'commonjs',
10+
},
11+
],
12+
'@babel/preset-typescript',
13+
],
14+
};

jest.config.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
module.exports = {
2-
globals: {
3-
'ts-jest': {
4-
isolatedModules: false,
5-
},
6-
},
72
moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
83
testMatch: ['**/?(*.)+(spec|test).[tj]s?(x)'],
94
testPathIgnorePatterns: ['/node_modules/', '/dist/', '/build/', '/coverage/', '/public/'],
5+
watchPathIgnorePatterns: ['lib'],
106
transform: {
11-
'^.+\\.ts?$': 'ts-jest',
7+
'^.+\\.(js|jsx|ts|tsx)$': ['babel-jest', { rootMode: 'upward' }],
128
},
13-
watchPathIgnorePatterns: ['lib'],
149
};

package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
"example": "cd ./packages/connect-examples/expo-example && yarn start"
2525
},
2626
"devDependencies": {
27-
"@babel/core": "^7.16.0",
2827
"@babel/eslint-parser": "^7.16.3",
2928
"@babel/plugin-proposal-object-rest-spread": "^7.18.0",
3029
"@babel/preset-react": "^7.16.0",
31-
"@babel/preset-typescript": "^7.17.12",
30+
"@babel/preset-typescript": "^7.18.6",
3231
"@rollup/plugin-babel": "^5.3.1",
3332
"@rollup/plugin-commonjs": "^22.0.0",
3433
"@rollup/plugin-json": "^4.1.0",
@@ -58,8 +57,6 @@
5857
"rimraf": "^3.0.2",
5958
"rollup": "^2.73.0",
6059
"rollup-plugin-dts": "^4.2.1",
61-
"ts-jest": "^28.0.2",
62-
"ts-node": "^10.8.0",
6360
"tsconfig-paths": "^4.0.0",
6461
"typescript": "^4.5.2"
6562
},

packages/connect-examples/expo-example/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-example",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"scripts": {
55
"start": "expo start --dev-client",
66
"android": "expo run:android",
@@ -9,10 +9,10 @@
99
"eject": "expo eject"
1010
},
1111
"dependencies": {
12-
"@onekeyfe/hd-ble-sdk": "^0.1.41",
13-
"@onekeyfe/hd-common-connect-sdk": "^0.1.41",
14-
"@onekeyfe/hd-core": "^0.1.41",
15-
"@onekeyfe/hd-web-sdk": "^0.1.41",
12+
"@onekeyfe/hd-ble-sdk": "^0.1.42",
13+
"@onekeyfe/hd-common-connect-sdk": "^0.1.42",
14+
"@onekeyfe/hd-core": "^0.1.42",
15+
"@onekeyfe/hd-web-sdk": "^0.1.42",
1616
"@react-native-async-storage/async-storage": "^1.17.6",
1717
"@react-navigation/native": "^6.0.10",
1818
"@react-navigation/native-stack": "^6.6.2",

packages/core/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-core",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"description": "> TODO: description",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2525
},
2626
"dependencies": {
27-
"@onekeyfe/hd-shared": "^0.1.41",
28-
"@onekeyfe/hd-transport": "^0.1.41",
27+
"@onekeyfe/hd-shared": "^0.1.42",
28+
"@onekeyfe/hd-transport": "^0.1.42",
2929
"axios": "^0.27.2",
3030
"bignumber.js": "^9.0.2",
3131
"js-sha256": "^0.9.0",

packages/hd-ble-sdk/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-ble-sdk",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,8 +20,8 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^0.1.41",
24-
"@onekeyfe/hd-shared": "^0.1.41",
25-
"@onekeyfe/hd-transport-react-native": "^0.1.41"
23+
"@onekeyfe/hd-core": "^0.1.42",
24+
"@onekeyfe/hd-shared": "^0.1.42",
25+
"@onekeyfe/hd-transport-react-native": "^0.1.42"
2626
}
2727
}

packages/hd-common-connect-sdk/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-common-connect-sdk",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,8 +20,8 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^0.1.41",
24-
"@onekeyfe/hd-shared": "^0.1.41",
25-
"@onekeyfe/hd-transport-webusb": "^0.1.41"
23+
"@onekeyfe/hd-core": "^0.1.42",
24+
"@onekeyfe/hd-shared": "^0.1.42",
25+
"@onekeyfe/hd-transport-webusb": "^0.1.42"
2626
}
2727
}

packages/hd-transport-http/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-http",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"description": "hardware http transport",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
2525
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-shared": "^0.1.41",
29-
"@onekeyfe/hd-transport": "^0.1.41",
28+
"@onekeyfe/hd-shared": "^0.1.42",
29+
"@onekeyfe/hd-transport": "^0.1.42",
3030
"axios": "^0.27.2"
3131
}
3232
}

packages/hd-transport-react-native/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-react-native",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
55
"license": "MIT",
66
"main": "dist/index.js",
@@ -19,8 +19,8 @@
1919
"lint:fix": "eslint . --fix"
2020
},
2121
"dependencies": {
22-
"@onekeyfe/hd-shared": "^0.1.41",
23-
"@onekeyfe/hd-transport": "^0.1.41",
22+
"@onekeyfe/hd-shared": "^0.1.42",
23+
"@onekeyfe/hd-transport": "^0.1.42",
2424
"react-native-ble-manager": "^8.1.0",
2525
"react-native-ble-plx": "^2.0.3"
2626
}

packages/hd-transport-webusb/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-webusb",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "MIT",
@@ -21,8 +21,8 @@
2121
"lint:fix": "eslint . --fix"
2222
},
2323
"dependencies": {
24-
"@onekeyfe/hd-shared": "^0.1.41",
25-
"@onekeyfe/hd-transport": "^0.1.41"
24+
"@onekeyfe/hd-shared": "^0.1.42",
25+
"@onekeyfe/hd-transport": "^0.1.42"
2626
},
2727
"devDependencies": {
2828
"@types/w3c-web-usb": "^1.0.6"

packages/hd-transport/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"description": "> TODO: description",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",

packages/hd-transport/src/serialization/protobuf/decode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Type, Message, Field } from 'protobufjs/light';
2-
import { ByteBuffer } from '../../utils';
2+
import ByteBuffer from 'bytebuffer';
33
import { isPrimitiveField } from '../../utils/protobuf';
44

55
const transform = (field: Field, value: any) => {

packages/hd-transport/src/serialization/protobuf/encode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Type } from 'protobufjs/light';
22
import { Buffer } from 'buffer';
3-
import { ByteBuffer } from '../../utils';
3+
import ByteBuffer from 'bytebuffer';
44

55
import { isPrimitiveField } from '../../utils/protobuf';
66

packages/hd-transport/src/serialization/protocol/decode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ByteBuffer } from '../../utils';
1+
import ByteBuffer from 'bytebuffer';
22
import { MESSAGE_HEADER_BYTE } from '../../constants';
33

44
/**

packages/hd-transport/src/serialization/protocol/encode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ByteBuffer } from '../../utils';
1+
import ByteBuffer from 'bytebuffer';
22

33
import { HEADER_SIZE, MESSAGE_HEADER_BYTE, BUFFER_SIZE } from '../../constants';
44

packages/hd-transport/src/serialization/receive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Root } from 'protobufjs/light';
2-
import { ByteBuffer } from '../utils';
2+
import ByteBuffer from 'bytebuffer';
33

44
import * as decodeProtobuf from './protobuf/decode';
55
import * as decodeProtocol from './protocol/decode';

packages/hd-transport/src/serialization/send.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Logic of "call" is broken to two parts - sending and receiving
44
import { Root } from 'protobufjs/light';
5-
import { ByteBuffer } from '../utils';
5+
import ByteBuffer from 'bytebuffer';
66
import { encode as encodeProtobuf } from './protobuf';
77
import { encode as encodeProtocol } from './protocol';
88
import { createMessageFromName } from './protobuf/messages';

packages/hd-transport/src/utils/index.ts

-6
This file was deleted.

packages/hd-transport/src/utils/namespace.ts

-3
This file was deleted.

packages/hd-web-sdk/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-web-sdk",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -21,10 +21,10 @@
2121
},
2222
"dependencies": {
2323
"@onekeyfe/cross-inpage-provider-core": "^0.0.17",
24-
"@onekeyfe/hd-core": "^0.1.41",
25-
"@onekeyfe/hd-shared": "^0.1.41",
26-
"@onekeyfe/hd-transport-http": "^0.1.41",
27-
"@onekeyfe/hd-transport-webusb": "^0.1.41"
24+
"@onekeyfe/hd-core": "^0.1.42",
25+
"@onekeyfe/hd-shared": "^0.1.42",
26+
"@onekeyfe/hd-transport-http": "^0.1.42",
27+
"@onekeyfe/hd-transport-webusb": "^0.1.42"
2828
},
2929
"devDependencies": {
3030
"@babel/plugin-proposal-optional-chaining": "^7.17.12",

packages/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-shared",
3-
"version": "0.1.41",
3+
"version": "0.1.42",
44
"description": "Hardware SDK's shared tool library",
55
"keywords": [
66
"Hardware-SDK",

0 commit comments

Comments
 (0)