diff --git a/package-lock.json b/package-lock.json index 3911c5670e0..971f52cc84c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "axe-core": "4.10.0", "babel-loader": "9.1.3", "change-case": "4.1.2", - "cheerio": "1.0.0-rc.12", + "cheerio": "1.0.0", "chokidar": "3.6.0", "chromatic": "11.7.0", "concurrently": "8.2.2", @@ -11565,20 +11565,25 @@ } }, "node_modules/cheerio": { - "version": "1.0.0-rc.12", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "dev": true, - "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">=18.17" }, "funding": { "url": "https://github.com/cheeriojs/cheerio?sponsor=1" @@ -11600,6 +11605,34 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/cheerio/node_modules/htmlparser2": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, + "node_modules/cheerio/node_modules/undici": { + "version": "6.19.7", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.7.tgz", + "integrity": "sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==", + "dev": true, + "engines": { + "node": ">=18.17" + } + }, "node_modules/chokidar": { "version": "3.6.0", "dev": true, @@ -14420,6 +14453,31 @@ "iconv-lite": "^0.6.2" } }, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "dev": true, + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, + "node_modules/encoding-sniffer/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/encoding/node_modules/iconv-lite": { "version": "0.6.3", "dev": true, @@ -26282,6 +26340,18 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "dev": true, + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/parse5-sax-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz", diff --git a/package.json b/package.json index 8909d59c05d..ad9e5c8456a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "axe-core": "4.10.0", "babel-loader": "9.1.3", "change-case": "4.1.2", - "cheerio": "1.0.0-rc.12", + "cheerio": "1.0.0", "chokidar": "3.6.0", "chromatic": "11.7.0", "concurrently": "8.2.2", diff --git a/packages/calcite-components/.storybook/manager.ts b/packages/calcite-components/.storybook/manager.ts index 06ce12e6645..e6e47b0dc17 100644 --- a/packages/calcite-components/.storybook/manager.ts +++ b/packages/calcite-components/.storybook/manager.ts @@ -1,5 +1,5 @@ import { addons } from "@storybook/manager-api"; -import cheerio from "cheerio"; +import { load } from "cheerio"; import theme from "./theme"; const globalInternalAttributes = ["calcite-hydrated", "calcite-hydrated-hidden"]; @@ -7,7 +7,7 @@ const globalInternalAttributes = ["calcite-hydrated", "calcite-hydrated-hidden"] addons.register("@whitespace/storybook-addon-html", (api) => { // intercept HTML-preview event and remove global internal-attrs api.on("html/htmlReceived", (eventData) => { - const $ = cheerio.load(eventData.html, null, false); + const $ = load(eventData.html, null, false); globalInternalAttributes.forEach((attribute) => $(`[${attribute}]`).removeAttr(attribute)); eventData.html = $.html(); });