diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 354bc3b2fc..737cf3b16b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,6 +29,8 @@ updates: - dependency-name: "date-fns" - dependency-name: "moment" - dependency-name: "lodash" + # see https://github.com/tancredi/fantasticon/issues/470 + - dependency-name: "fantasticon" - package-ecosystem: "npm" directory: "/" diff --git a/packages/docs-data/compile-docs-data.mjs b/packages/docs-data/compile-docs-data.mjs index 536bfab845..3d0712121b 100755 --- a/packages/docs-data/compile-docs-data.mjs +++ b/packages/docs-data/compile-docs-data.mjs @@ -46,6 +46,12 @@ async function generateDocumentalistData() { // must mark our @Decorator APIs as reserved so we can use them in code samples reservedTags: ["import", "ContextMenuTarget", "HotkeysTarget", "param", "returns"], }) + .use(".md", { + compile: files => + // HACKHACK: special case for Windows environment + // see https://github.com/palantir/documentalist/issues/98 + process.platform === "win32" ? files.map(file => file.read().replace(/\r\n/g, "\n")) : files, + }) .use(".md", new MarkdownPlugin({ navPage: "_nav" })) .use( /\.tsx?$/, diff --git a/packages/icons/package.json b/packages/icons/package.json index 068ad299f1..184cd0528f 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -45,7 +45,7 @@ "@blueprintjs/test-commons": "^1.1.13", "@types/svgo": "~1.3.6", "enzyme": "^3.11.0", - "fantasticon": "^2.0.0", + "fantasticon": "^1.2.3", "mocha": "^10.2.0", "npm-run-all": "^4.1.5", "react": "^16.14.0", diff --git a/yarn.lock b/yarn.lock index 43cd6dda92..21affcb624 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2386,7 +2386,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +argparse@^1.0.6, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -3229,7 +3229,7 @@ cli-color@1.2.0: memoizee "^0.4.3" timers-ext "0.1" -cli-color@^2.0.2: +cli-color@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.3.tgz#73769ba969080629670f3f2ef69a4bf4e7cc1879" integrity sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ== @@ -3398,7 +3398,7 @@ commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^9.3.0, commander@^9.4.1: +commander@^9.4.1: version "9.4.1" resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== @@ -5053,22 +5053,22 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -fantasticon@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fantasticon/-/fantasticon-2.0.0.tgz#26b0b8f0b2503c4488ab23d8807e95d9454b642e" - integrity sha512-6/VpHU4CD4qTJblTRXN0/EvNmGPv8P0enQsBLA8PyFupEKvnxlO9ktZyroj1yynskgbzvce5//BYh5OVKw1MSw== +fantasticon@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/fantasticon/-/fantasticon-1.2.3.tgz#9082b8bcb38ef6fd63e4f392643b12675c2fb310" + integrity sha512-VoPXI8+wbLq4qooK2LAFRcqKtOCR20+InF/Io/9I1kLp3IT+LwqJgeFijFvp9a3HRZptfCAxNvazoVHn4kihzQ== dependencies: change-case "^4.1.2" - cli-color "^2.0.2" - commander "^9.4.1" - glob "^8.0.3" + cli-color "^2.0.0" + commander "^7.2.0" + glob "^7.2.0" handlebars "^4.7.7" - slugify "^1.6.5" + slugify "^1.6.0" svg2ttf "^6.0.3" - svgicons2svgfont "^12.0.0" - ttf2eot "^3.1.0" + svgicons2svgfont "^10.0.3" + ttf2eot "^2.0.0" ttf2woff "^3.0.0" - ttf2woff2 "^4.0.5" + ttf2woff2 "^4.0.4" fast-deep-equal@^1.0.0: version "1.1.0" @@ -5453,6 +5453,11 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== +geometry-interfaces@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz#9e82af6700ca639a675299f08e1f5fbc4a79d48d" + integrity sha512-qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA== + get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -5626,7 +5631,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3, glob@^8.1.0: +glob@^8.0.1, glob@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -8183,6 +8188,13 @@ nearley@^2.7.10: railroad-diagrams "^1.0.0" randexp "0.4.6" +neatequal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" + integrity sha512-sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A== + dependencies: + varstream "^0.3.2" + negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -9874,6 +9886,16 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stre string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^1.0.33: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^2.0.1, readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -10421,7 +10443,7 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -slugify@^1.6.5: +slugify@^1.6.0: version "1.6.5" resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.5.tgz#c8f5c072bf2135b80703589b39a3d41451fbe8c8" integrity sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ== @@ -10967,7 +10989,7 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svg-pathdata@^6.0.3: +svg-pathdata@^6.0.0: version "6.0.3" resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac" integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw== @@ -10989,15 +11011,18 @@ svg2ttf@^6.0.3: microbuffer "^1.0.0" svgpath "^2.1.5" -svgicons2svgfont@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-12.0.0.tgz#80dfb5f20a4e83403f893a30320194dc380690b3" - integrity sha512-fjyDkhiG0M1TPBtZzD12QV3yDcG2fUgiqHPOCYzf7hHE40Hl3GhnE6P1njsJCCByhwM7MiufyDW3L7IOR5dg9w== +svgicons2svgfont@^10.0.3: + version "10.0.6" + resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz#2901f9016244049674d3b3178c36471994a30c0a" + integrity sha512-fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A== dependencies: - commander "^9.3.0" - glob "^8.0.3" + commander "^7.2.0" + geometry-interfaces "^1.1.4" + glob "^7.1.6" + neatequal "^1.0.0" + readable-stream "^3.4.0" sax "^1.2.4" - svg-pathdata "^6.0.3" + svg-pathdata "^6.0.0" svgo@^1.3.0, svgo@^1.3.2: version "1.3.2" @@ -11338,14 +11363,15 @@ tsutils@^3.17.1, tsutils@^3.21.0: dependencies: tslib "^1.8.1" -ttf2eot@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-3.1.0.tgz#c8971af7c68c5b996d8cfdb8847cdadfbf195e05" - integrity sha512-aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw== +ttf2eot@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b" + integrity sha512-U56aG2Ylw7psLOmakjemAzmpqVgeadwENg9oaDjaZG5NYX4WB6+7h74bNPcc+0BXsoU5A/XWiHabDXyzFOmsxQ== dependencies: - argparse "^2.0.1" + argparse "^1.0.6" + microbuffer "^1.0.0" -ttf2woff2@^4.0.5: +ttf2woff2@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.5.tgz#c7c87242938e9e2ed37fe5f477dd21acdb88fbfd" integrity sha512-zpoU0NopfjoyVqkFeQ722SyKk/n607mm5OHxuDS/wCCSy82B8H3hHXrezftA2KMbKqfJIjie2lsJHdvPnBGbsw== @@ -11681,6 +11707,13 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +varstream@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1" + integrity sha512-OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg== + dependencies: + readable-stream "^1.0.33" + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"