Skip to content

Commit 0e6ddf6

Browse files
committed
fix(android): replace unmaintained logkitty with logkitten
logkitty is no longer maintained. logkitten (by Wix) is a maintained successor with zero dependencies and support for both Android and iOS.
1 parent 13a0ec2 commit 0e6ddf6

File tree

5 files changed

+32
-71
lines changed

5 files changed

+32
-71
lines changed

__e2e__/__snapshots__/config.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ exports[`shows up current config without unnecessary output 1`] = `
8585
},
8686
{
8787
"name": "log-android",
88-
"description": "starts logkitty"
88+
"description": "starts logkitten"
8989
},
9090
{
9191
"name": "run-android",

packages/cli-platform-android/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ Usage:
129129
npx react-native log-android
130130
```
131131

132-
Starts [`logkitty`](https://github.com/zamotany/logkitty) displaying pretty Android logs.
132+
Starts [`logkitten`](https://github.com/wix-incubator/logkitten) displaying pretty Android logs.

packages/cli-platform-android/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@react-native-community/cli-config-android": "20.1.3",
1111
"@react-native-community/cli-tools": "20.1.3",
1212
"execa": "^5.0.0",
13-
"logkitty": "^0.7.1",
13+
"logkitten": "^1.3.3",
1414
"picocolors": "^1.1.1"
1515
},
1616
"files": [

packages/cli-platform-android/src/commands/logAndroid/index.ts

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,45 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import {
9-
logkitty,
10-
makeTagsFilter,
11-
formatEntry,
12-
formatError,
13-
AndroidPriority,
14-
} from 'logkitty';
8+
import {logkitten} from 'logkitten';
9+
import type {AndroidEntry} from 'logkitten';
1510
import {logger} from '@react-native-community/cli-tools';
1611

12+
const TAGS = new Set(['ReactNative', 'ReactNativeJS']);
13+
14+
const LEVEL_LABELS: Record<number, string> = {
15+
10: 'V',
16+
20: 'D',
17+
30: 'I',
18+
40: 'W',
19+
50: 'E',
20+
60: 'F',
21+
};
22+
23+
function formatEntry(entry: AndroidEntry): string {
24+
const level = LEVEL_LABELS[entry.level] ?? '?';
25+
return `${level} | ${entry.tag}: ${entry.msg}`;
26+
}
27+
1728
async function logAndroid() {
18-
logger.info('Starting logkitty');
29+
logger.info('Starting logkitten');
1930

20-
const emitter = logkitty({
31+
const emitter = logkitten({
2132
platform: 'android',
22-
priority: AndroidPriority.VERBOSE,
23-
filter: makeTagsFilter('ReactNative', 'ReactNativeJS'),
33+
filter: (entry: AndroidEntry) => TAGS.has(entry.tag),
2434
});
2535

2636
emitter.on('entry', (entry) => {
2737
logger.log(formatEntry(entry));
2838
});
2939

3040
emitter.on('error', (error) => {
31-
logger.log(formatError(error));
41+
logger.log(error.message);
3242
});
3343
}
3444

3545
export default {
3646
name: 'log-android',
37-
description: 'starts logkitty',
47+
description: 'starts logkitten',
3848
func: logAndroid,
3949
};

yarn.lock

Lines changed: 6 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2687,25 +2687,11 @@ ansi-escapes@^4.3.0:
26872687
dependencies:
26882688
type-fest "^0.21.3"
26892689

2690-
ansi-fragments@^0.2.1:
2691-
version "0.2.1"
2692-
resolved "https://registry.yarnpkg.com/ansi-fragments/-/ansi-fragments-0.2.1.tgz#24409c56c4cc37817c3d7caa99d8969e2de5a05e"
2693-
integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==
2694-
dependencies:
2695-
colorette "^1.0.7"
2696-
slice-ansi "^2.0.0"
2697-
strip-ansi "^5.0.0"
2698-
26992690
ansi-regex@^3.0.0:
27002691
version "3.0.1"
27012692
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
27022693
integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
27032694

2704-
ansi-regex@^4.1.0:
2705-
version "4.1.1"
2706-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
2707-
integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
2708-
27092695
ansi-regex@^5.0.0, ansi-regex@^5.0.1:
27102696
version "5.0.1"
27112697
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2716,7 +2702,7 @@ ansi-regex@^6.0.1:
27162702
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
27172703
integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
27182704

2719-
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
2705+
ansi-styles@^3.2.1:
27202706
version "3.2.1"
27212707
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
27222708
integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -3620,11 +3606,6 @@ color-support@^1.1.3:
36203606
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
36213607
integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
36223608

3623-
colorette@^1.0.7:
3624-
version "1.2.2"
3625-
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
3626-
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
3627-
36283609
colorette@^2.0.19:
36293610
version "2.0.19"
36303611
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
@@ -3907,11 +3888,6 @@ dateformat@^3.0.3:
39073888
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
39083889
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
39093890

3910-
dayjs@^1.8.15:
3911-
version "1.8.21"
3912-
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.21.tgz#98299185b72b9b679f31c7ed987b63923c961552"
3913-
integrity sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ==
3914-
39153891
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
39163892
version "2.6.9"
39173893
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -6149,11 +6125,6 @@ is-finalizationregistry@^1.0.2:
61496125
dependencies:
61506126
call-bind "^1.0.2"
61516127

6152-
is-fullwidth-code-point@^2.0.0:
6153-
version "2.0.0"
6154-
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
6155-
integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
6156-
61576128
is-fullwidth-code-point@^3.0.0:
61586129
version "3.0.0"
61596130
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -7480,14 +7451,10 @@ log-update@^4.0.0:
74807451
slice-ansi "^4.0.0"
74817452
wrap-ansi "^6.2.0"
74827453

7483-
logkitty@^0.7.1:
7484-
version "0.7.1"
7485-
resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.7.1.tgz#8e8d62f4085a826e8d38987722570234e33c6aa7"
7486-
integrity sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==
7487-
dependencies:
7488-
ansi-fragments "^0.2.1"
7489-
dayjs "^1.8.15"
7490-
yargs "^15.1.0"
7454+
logkitten@^1.3.3:
7455+
version "1.3.3"
7456+
resolved "https://registry.yarnpkg.com/logkitten/-/logkitten-1.3.3.tgz#58d14aef3d6b289f806a0563b5de83d5ef1baa79"
7457+
integrity sha512-6oHaRYZonwU2MV0uJ6m27ur73lX18jqOoNmDPvcrt7Uh/vy+XZoIMi/u+k4hj06Nuv8VVVfyUj68SALqSxzIaA==
74917458

74927459
loose-envify@^1.0.0, loose-envify@^1.4.0:
74937460
version "1.4.0"
@@ -9687,15 +9654,6 @@ slash@3.0.0, slash@^3.0.0:
96879654
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
96889655
integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
96899656

9690-
slice-ansi@^2.0.0:
9691-
version "2.1.0"
9692-
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
9693-
integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
9694-
dependencies:
9695-
ansi-styles "^3.2.0"
9696-
astral-regex "^1.0.0"
9697-
is-fullwidth-code-point "^2.0.0"
9698-
96999657
slice-ansi@^3.0.0:
97009658
version "3.0.0"
97019659
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
@@ -10085,13 +10043,6 @@ strip-ansi@^4.0.0:
1008510043
dependencies:
1008610044
ansi-regex "^3.0.0"
1008710045

10088-
strip-ansi@^5.0.0:
10089-
version "5.2.0"
10090-
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
10091-
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
10092-
dependencies:
10093-
ansi-regex "^4.1.0"
10094-
1009510046
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
1009610047
version "6.0.1"
1009710048
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -11143,7 +11094,7 @@ yargs@16.2.0, yargs@^16.2.0:
1114311094
y18n "^5.0.5"
1114411095
yargs-parser "^20.2.2"
1114511096

11146-
yargs@^15.1.0, yargs@^15.4.1:
11097+
yargs@^15.4.1:
1114711098
version "15.4.1"
1114811099
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
1114911100
integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==

0 commit comments

Comments
 (0)