diff --git a/package-lock.json b/package-lock.json index 0aa69bf9..cb2dac3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "get-port": "^5.1.1", "inquirer": "^8.2.6", "listr": "^0.14.3", - "node-emoji": "^1.11.0", + "node-emoji": "^2.1.3", "node-stream-zip": "^1.15.0", "per-env": "^1.0.2", "shell-quote": "^1.8.2", @@ -46,7 +46,6 @@ "@types/inquirer": "^8.2.10", "@types/listr": "^0.14.9", "@types/node": "^20.17.14", - "@types/node-emoji": "^1.8.2", "@types/shell-quote": "^1.7.5", "@types/tar": "^6.1.13", "@types/unzip-stream": "^0.3.4", @@ -4952,12 +4951,6 @@ "undici-types": "~6.19.2" } }, - "node_modules/@types/node-emoji": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@types/node-emoji/-/node-emoji-1.8.2.tgz", - "integrity": "sha512-PfF1qL/9veo8BSHLV84C9ORNr3lHSlnWJ6yU8OdNufoftajeWHTLVbGHvp2B7e7DPDS9gMs6cfeSsqo5rqSitg==", - "dev": true - }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", @@ -7243,6 +7236,12 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "node_modules/emojilib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==", + "license": "MIT" + }, "node_modules/enabled": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", @@ -12307,11 +12306,30 @@ } }, "node_modules/node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz", + "integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==", + "license": "MIT", "dependencies": { - "lodash": "^4.17.21" + "@sindresorhus/is": "^4.6.0", + "char-regex": "^1.0.2", + "emojilib": "^2.4.0", + "skin-tone": "^2.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/node-emoji/node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" } }, "node_modules/node-int64": { @@ -14139,6 +14157,18 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, + "node_modules/skin-tone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", + "license": "MIT", + "dependencies": { + "unicode-emoji-modifier-base": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -15063,6 +15093,15 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" }, + "node_modules/unicode-emoji-modifier-base": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", @@ -19369,12 +19408,6 @@ "undici-types": "~6.19.2" } }, - "@types/node-emoji": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@types/node-emoji/-/node-emoji-1.8.2.tgz", - "integrity": "sha512-PfF1qL/9veo8BSHLV84C9ORNr3lHSlnWJ6yU8OdNufoftajeWHTLVbGHvp2B7e7DPDS9gMs6cfeSsqo5rqSitg==", - "dev": true - }, "@types/normalize-package-data": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", @@ -21032,6 +21065,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "emojilib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==" + }, "enabled": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", @@ -24638,11 +24676,21 @@ } }, "node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz", + "integrity": "sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==", "requires": { - "lodash": "^4.17.21" + "@sindresorhus/is": "^4.6.0", + "char-regex": "^1.0.2", + "emojilib": "^2.4.0", + "skin-tone": "^2.0.0" + }, + "dependencies": { + "@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" + } } }, "node-int64": { @@ -25978,6 +26026,14 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, + "skin-tone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", + "requires": { + "unicode-emoji-modifier-base": "^1.0.0" + } + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -26666,6 +26722,11 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" }, + "unicode-emoji-modifier-base": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==" + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", diff --git a/package.json b/package.json index 68b30d46..19c63ccf 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "get-port": "^5.1.1", "inquirer": "^8.2.6", "listr": "^0.14.3", - "node-emoji": "^1.11.0", + "node-emoji": "^2.1.3", "node-stream-zip": "^1.15.0", "per-env": "^1.0.2", "shell-quote": "^1.8.2", @@ -48,7 +48,6 @@ "@types/inquirer": "^8.2.10", "@types/listr": "^0.14.9", "@types/node": "^20.17.14", - "@types/node-emoji": "^1.8.2", "@types/shell-quote": "^1.7.5", "@types/tar": "^6.1.13", "@types/unzip-stream": "^0.3.4", diff --git a/src/autify/mobile/waitTestResult.ts b/src/autify/mobile/waitTestResult.ts index 2f7351dc..a868a7f9 100644 --- a/src/autify/mobile/waitTestResult.ts +++ b/src/autify/mobile/waitTestResult.ts @@ -3,7 +3,7 @@ import { CLIError } from "@oclif/errors"; import Listr, { ListrTaskWrapper } from "listr"; import { setInterval } from "node:timers/promises"; import { MobileClient } from "@autifyhq/autify-sdk"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; const waitUntil = async ( callback: (task: ListrTaskWrapper<{ result: T }>) => Promise, @@ -51,7 +51,7 @@ const emojiStatus = (status?: Status) => { if (status === "queuing") return emoji.get("cyclone") + " Queuing"; if (status === "waiting") return emoji.get("hourglass_flowing_sand") + " Waiting"; - if (status === "running") return emoji.get("car") + " Running"; + if (status === "running") return emoji.get("red_car") + " Running"; if (status === "passed") return emoji.get("+1") + " Passed "; if (status === "failed") return emoji.get("rotating_light") + " Failed "; if (status === "skipped") return emoji.get("zzz") + " Skipped"; diff --git a/src/autify/web/waitTestResult.ts b/src/autify/web/waitTestResult.ts index 8e66a2d4..7cc83599 100644 --- a/src/autify/web/waitTestResult.ts +++ b/src/autify/web/waitTestResult.ts @@ -3,7 +3,7 @@ import { CLIError } from "@oclif/errors"; import Listr, { ListrTaskWrapper } from "listr"; import { setInterval } from "node:timers/promises"; import { WebClient } from "@autifyhq/autify-sdk"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; const waitUntil = async ( callback: (task: ListrTaskWrapper<{ result: T }>) => Promise, @@ -60,7 +60,7 @@ const emojiStatus = (status?: Status) => { if (status === "queuing") return emoji.get("cyclone") + " Queuing"; if (status === "waiting") return emoji.get("hourglass_flowing_sand") + " Waiting"; - if (status === "running") return emoji.get("car") + " Running"; + if (status === "running") return emoji.get("red_car") + " Running"; if (status === "passed") return emoji.get("+1") + " Passed "; if (status === "failed") return emoji.get("rotating_light") + " Failed "; if (status === "skipped") return emoji.get("zzz") + " Skipped"; diff --git a/src/commands/mobile/build/upload.ts b/src/commands/mobile/build/upload.ts index 6c954446..c6db898f 100644 --- a/src/commands/mobile/build/upload.ts +++ b/src/commands/mobile/build/upload.ts @@ -1,5 +1,5 @@ import { Command, Args, Flags } from "@oclif/core"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; import { getBuildDetailUrl } from "../../../autify/mobile/getBuildDetailUrl"; import { getMobileClient } from "../../../autify/mobile/getMobileClient"; import { uploadBuild } from "../../../autify/mobile/uploadBuild"; diff --git a/src/commands/mobile/test/run.ts b/src/commands/mobile/test/run.ts index 11ef74f0..77ae35b6 100644 --- a/src/commands/mobile/test/run.ts +++ b/src/commands/mobile/test/run.ts @@ -1,6 +1,6 @@ import { Command, Args, Flags } from "@oclif/core"; import { CLIError } from "@oclif/errors"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; import { getMobileClient } from "../../../autify/mobile/getMobileClient"; import { getMobileTestResultUrl } from "../../../autify/mobile/getTestResultUrl"; import { parseTestPlanUrl } from "../../../autify/mobile/parseTestPlanUrl"; diff --git a/src/commands/mobile/test/wait.ts b/src/commands/mobile/test/wait.ts index 672c421a..070d4644 100644 --- a/src/commands/mobile/test/wait.ts +++ b/src/commands/mobile/test/wait.ts @@ -1,5 +1,5 @@ import { Command, Args, Flags } from "@oclif/core"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; import { getWaitIntervalSecond } from "../../../autify/getWaitIntervalSecond"; import { getMobileClient } from "../../../autify/mobile/getMobileClient"; import { getMobileTestResultUrl } from "../../../autify/mobile/getTestResultUrl"; diff --git a/src/commands/web/test/run.ts b/src/commands/web/test/run.ts index 78ea0f9e..3daa0d2b 100644 --- a/src/commands/web/test/run.ts +++ b/src/commands/web/test/run.ts @@ -1,5 +1,5 @@ import { Command, Args, Flags } from "@oclif/core"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; import { runTest } from "../../../autify/web/runTest"; import { getWebTestResultUrl } from "../../../autify/web/getTestResultUrl"; import WebTestWait from "./wait"; diff --git a/src/commands/web/test/wait.ts b/src/commands/web/test/wait.ts index e925cfe7..6d968947 100644 --- a/src/commands/web/test/wait.ts +++ b/src/commands/web/test/wait.ts @@ -1,5 +1,5 @@ import { Command, Args, Flags } from "@oclif/core"; -import emoji from "node-emoji"; +import * as emoji from "node-emoji"; import { parseTestResultUrl } from "../../../autify/web/parseTestResultUrl"; import { waitTestResult } from "../../../autify/web/waitTestResult"; import { getWebTestResultUrl } from "../../../autify/web/getTestResultUrl";