diff --git a/CHANGELOG.md b/CHANGELOG.md index c46bb385..d41b92fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] -This is a major release, and it might be not compatibel with your current usage of our library. Please read about the necessary changes in the section about how to migrate. +This is a major release, and it might be not compatible with your current usage of our library. Please read about the necessary changes in the section about how to migrate. ### Migration from v23 to v24 @@ -79,6 +79,7 @@ This is a major release, and it might be not compatibel with your current usage - `` - align blocks for language specific code to default code blocks - switch icons for `item-clone` and `item-copy` to Carbon's `` and `` +- Remove duplicated icon names `artefact-customtask*` and only keep `artefact-task*` names. ### Deprecated diff --git a/package.json b/package.json index db40b99b..2d28c977 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,9 @@ }, "resolutions": { "**/@types/react": "^17.0.80", - "node-sass-package-importer/**/postcss": "^8.4.41" + "node-sass-package-importer/**/postcss": "^8.4.41", + "**/cross-spawn": "^7.0.5 ", + "**/micromatch": "^4.0.8" }, "husky": { "hooks": { diff --git a/src/components/Icon/canonicalIconNames.tsx b/src/components/Icon/canonicalIconNames.tsx index 8f4942b8..fd1b94e3 100644 --- a/src/components/Icon/canonicalIconNames.tsx +++ b/src/components/Icon/canonicalIconNames.tsx @@ -17,9 +17,8 @@ const canonicalIcons = { "artefact-chatlog": icons.Chat, "artefact-commit": icons.Commit, - "artefact-customtask-deleteprojectfiles": icons.TrashCan, - "artefact-customtask-downloadfile": icons.CloudDownload, - "artefact-customtask": icons.Script, + "artefact-task-deleteprojectfiles": icons.TrashCan, + "artefact-task-downloadfile": icons.CloudDownload, "artefact-dataset-csv": icons.Csv, "artefact-dataset-eccencadataplatform": icons.DataVis_1, "artefact-dataset-excel": icons.Xls, diff --git a/yarn.lock b/yarn.lock index 2184f4b6..a1846fca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5134,7 +5134,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.2, braces@^3.0.3, braces@~3.0.2: +braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -5779,10 +5779,10 @@ crelt@^1.0.5: resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72" integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g== -cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3, "cross-spawn@^7.0.5 ": + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" @@ -9643,18 +9643,10 @@ micromark@^3.0.0: micromark-util-types "^1.0.1" uvu "^0.5.0" -micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -micromatch@~4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5, micromatch@^4.0.8, micromatch@~4.0.7: + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: braces "^3.0.3" picomatch "^2.3.1"