From c6fa5fe5502ea889b4992c15aaf0b2e3e44aad6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 05:27:32 +0000 Subject: [PATCH 1/2] chore(deps): bump emphasize from 6.0.0 to 7.0.0 Bumps [emphasize](https://github.com/wooorm/emphasize) from 6.0.0 to 7.0.0. - [Release notes](https://github.com/wooorm/emphasize/releases) - [Commits](https://github.com/wooorm/emphasize/compare/6.0.0...7.0.0) --- updated-dependencies: - dependency-name: emphasize dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 63 +++++++++++++++++++++++++++++---------- packages/api/package.json | 2 +- 2 files changed, 48 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03b637ef..27a9028b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3669,6 +3669,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.6.tgz", "integrity": "sha512-47rJE80oqPmFdVDCD7IheXBrVdwuBgsYwoczFvKmwfo2Mzsnt+V9OONsYauFmICb6lQPpCuXYJWejBNs4pDJRg==", + "dev": true, "dependencies": { "@types/unist": "^2" } @@ -7475,7 +7476,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, "engines": { "node": ">=6" } @@ -7489,6 +7489,18 @@ "node": ">=4" } }, + "node_modules/devlop": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", + "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", + "dependencies": { + "dequal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -7614,19 +7626,28 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/emphasize": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-6.0.0.tgz", - "integrity": "sha512-lVh/I8dHqIel6kq4yIRuSsjl4sAQOKpSuBR36V5usLGNP2oehnOwX09742xx16baa7eAahF9v52xO83yzT0NdQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/emphasize/-/emphasize-7.0.0.tgz", + "integrity": "sha512-jdFCDyt+YetBXO12VwK4AiLsMCvkZ3IBxMVIJddB+25EwIL0VETBgpvPkJl63+JyAgaQ5Wja10qWMoXXC95JNg==", "dependencies": { + "@types/hast": "^3.0.0", "chalk": "^5.0.0", - "highlight.js": "~11.6.0", - "lowlight": "~2.7.0" + "highlight.js": "~11.9.0", + "lowlight": "~3.1.0" }, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/emphasize/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/emphasize/node_modules/chalk": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", @@ -9334,6 +9355,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz", "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==", + "dev": true, "dependencies": { "format": "^0.2.0" }, @@ -9623,6 +9645,7 @@ "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", + "dev": true, "engines": { "node": ">=0.4.x" } @@ -10642,9 +10665,9 @@ } }, "node_modules/highlight.js": { - "version": "11.6.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz", - "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==", + "version": "11.9.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz", + "integrity": "sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==", "engines": { "node": ">=12.0.0" } @@ -13845,19 +13868,27 @@ } }, "node_modules/lowlight": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-2.7.0.tgz", - "integrity": "sha512-RRdrHalFfjpxL91ITTX7KhJYH3QmX5bW9Uie2D2E5GPIR3XBYDYhScBjE291ewFZkStz/k2PN9KC+8deNLiI3Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-3.1.0.tgz", + "integrity": "sha512-CEbNVoSikAxwDMDPjXlqlFYiZLkDJHwyGu/MfOsJnF3d7f3tds5J3z8s/l9TMXhzfsJCCJEAsD78842mwmg0PQ==", "dependencies": { - "@types/hast": "^2.0.0", - "fault": "^2.0.0", - "highlight.js": "~11.6.0" + "@types/hast": "^3.0.0", + "devlop": "^1.0.0", + "highlight.js": "~11.9.0" }, "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/lowlight/node_modules/@types/hast": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.3.tgz", + "integrity": "sha512-2fYGlaDy/qyLlhidX42wAH0KBi2TCjKMH8CHmBXgRlJ3Y+OXTiqsPQ6IWarZKwF1JoUcAJdPogv1d4b0COTpmQ==", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -22651,7 +22682,7 @@ "chalk": "^5.3.0", "ci-info": "^4.0.0", "commander": "^11.1.0", - "emphasize": "^6.0.0", + "emphasize": "^7.0.0", "execa": "^8.0.1", "figures": "^6.0.1", "httpsnippet-client-api": "file:../httpsnippet-client-api", diff --git a/packages/api/package.json b/packages/api/package.json index 9781e51d..097d096b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -52,7 +52,7 @@ "chalk": "^5.3.0", "ci-info": "^4.0.0", "commander": "^11.1.0", - "emphasize": "^6.0.0", + "emphasize": "^7.0.0", "execa": "^8.0.1", "figures": "^6.0.1", "httpsnippet-client-api": "file:../httpsnippet-client-api", From 9adff62ec6e4ef631e9b6f1f025d9863361bb0ae Mon Sep 17 00:00:00 2001 From: Kanad Gupta Date: Mon, 4 Dec 2023 13:02:26 -0600 Subject: [PATCH 2/2] fix: update emphasize api usage --- packages/api/src/commands/install.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/api/src/commands/install.ts b/packages/api/src/commands/install.ts index a9dd51f6..6c7bf17f 100644 --- a/packages/api/src/commands/install.ts +++ b/packages/api/src/commands/install.ts @@ -2,7 +2,7 @@ import type { SupportedLanguage } from '../codegen/factory.js'; import chalk from 'chalk'; import { Command, Option } from 'commander'; -import { emphasize } from 'emphasize'; +import { createEmphasize, common } from 'emphasize'; import figures from 'figures'; import Oas from 'oas'; import ora from 'ora'; @@ -14,6 +14,8 @@ import promptTerminal from '../lib/prompt.js'; import logger, { oraOptions } from '../logger.js'; import Storage from '../storage.js'; +const { highlight } = createEmphasize(common); + interface Options { identifier?: string; lang: SupportedLanguage; @@ -208,7 +210,7 @@ cmd logger(''); logger(chalk.bold("👇 Here's an example code snippet you can try out 👇")); logger(''); - logger(emphasize.highlight(language, exampleSnippet).value); + logger(highlight(language, exampleSnippet).value); } logger(''); })