From 0cb4284043680432590010bfb457190757cd778b Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Mon, 26 Sep 2022 20:09:18 -0700 Subject: [PATCH] internal: Get website API build working. --- packages/data/en/shortcodes/iamcal.raw.json | 37 +++++++++++++++++ packages/generator/src/helpers/log.ts | 1 - .../generator/src/loaders/fetchAndCache.ts | 1 - packages/regex/package.json | 4 +- website/docusaurus.config.js | 10 ++--- website/package.json | 4 +- website/src/pages/api.tsx | 11 +++++ yarn.lock | 40 +++++++++---------- 8 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 website/src/pages/api.tsx diff --git a/packages/data/en/shortcodes/iamcal.raw.json b/packages/data/en/shortcodes/iamcal.raw.json index fd4ba5cf..2d7bdd32 100644 --- a/packages/data/en/shortcodes/iamcal.raw.json +++ b/packages/data/en/shortcodes/iamcal.raw.json @@ -1452,6 +1452,9 @@ "1F6D5": "hindu_temple", "1F6D6": "hut", "1F6D7": "elevator", + "1F6DD": "playground_slide", + "1F6DE": "wheel", + "1F6DF": "ring_buoy", "1F6E0": "hammer_and_wrench", "1F6E1": "shield", "1F6E2": "oil_drum", @@ -1484,6 +1487,7 @@ "1F7E9": "large_green_square", "1F7EA": "large_purple_square", "1F7EB": "large_brown_square", + "1F7F0": "heavy_equals_sign", "1F90C": "pinched_fingers", "1F90D": "white_heart", "1F90E": "brown_heart", @@ -1640,6 +1644,7 @@ "1F976": "cold_face", "1F977": "ninja", "1F978": "disguised_face", + "1F979": "face_holding_back_tears", "1F97A": "pleading_face", "1F97B": "sari", "1F97C": "lab_coat", @@ -1722,6 +1727,7 @@ "1F9C9": "mate_drink", "1F9CA": "ice_cube", "1F9CB": "bubble_tea", + "1F9CC": "troll", "1F9CD-200D-2640-FE0F": "woman_standing", "1F9CD-200D-2642-FE0F": "man_standing", "1F9CD": "standing_person", @@ -1835,6 +1841,8 @@ "1FA78": "drop_of_blood", "1FA79": "adhesive_bandage", "1FA7A": "stethoscope", + "1FA7B": "x-ray", + "1FA7C": "crutch", "1FA80": "yo-yo", "1FA81": "kite", "1FA82": "parachute", @@ -1867,6 +1875,10 @@ "1FAA6": "headstone", "1FAA7": "placard", "1FAA8": "rock", + "1FAA9": "mirror_ball", + "1FAAA": "identification_card", + "1FAAB": "low_battery", + "1FAAC": "hamsa", "1FAB0": "fly", "1FAB1": "worm", "1FAB2": "beetle", @@ -1874,9 +1886,16 @@ "1FAB4": "potted_plant", "1FAB5": "wood", "1FAB6": "feather", + "1FAB7": "lotus", + "1FAB8": "coral", + "1FAB9": "empty_nest", + "1FABA": "nest_with_eggs", "1FAC0": "anatomical_heart", "1FAC1": "lungs", "1FAC2": "people_hugging", + "1FAC3": "pregnant_man", + "1FAC4": "pregnant_person", + "1FAC5": "person_with_crown", "1FAD0": "blueberries", "1FAD1": "bell_pepper", "1FAD2": "olive", @@ -1884,6 +1903,24 @@ "1FAD4": "tamale", "1FAD5": "fondue", "1FAD6": "teapot", + "1FAD7": "pouring_liquid", + "1FAD8": "beans", + "1FAD9": "jar", + "1FAE0": "melting_face", + "1FAE1": "saluting_face", + "1FAE2": "face_with_open_eyes_and_hand_over_mouth", + "1FAE3": "face_with_peeking_eye", + "1FAE4": "face_with_diagonal_mouth", + "1FAE5": "dotted_line_face", + "1FAE6": "biting_lip", + "1FAE7": "bubbles", + "1FAF0": "hand_with_index_finger_and_thumb_crossed", + "1FAF1": "rightwards_hand", + "1FAF2": "leftwards_hand", + "1FAF3": "palm_down_hand", + "1FAF4": "palm_up_hand", + "1FAF5": "index_pointing_at_the_viewer", + "1FAF6": "heart_hands", "203C": "bangbang", "21A9": "leftwards_arrow_with_hook", "21AA": "arrow_right_hook", diff --git a/packages/generator/src/helpers/log.ts b/packages/generator/src/helpers/log.ts index 4c0bfd0d..b346b197 100644 --- a/packages/generator/src/helpers/log.ts +++ b/packages/generator/src/helpers/log.ts @@ -1,6 +1,5 @@ /* eslint-disable no-console */ -// eslint-disable-next-line import/no-unresolved import chalk from 'chalk'; export const log = { diff --git a/packages/generator/src/loaders/fetchAndCache.ts b/packages/generator/src/loaders/fetchAndCache.ts index 213a60f6..4d166a3b 100644 --- a/packages/generator/src/loaders/fetchAndCache.ts +++ b/packages/generator/src/loaders/fetchAndCache.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/no-unresolved import chalk from 'chalk'; import fetch, { RequestInit } from 'node-fetch'; import { log } from '../helpers/log'; diff --git a/packages/regex/package.json b/packages/regex/package.json index a9d28190..622dc92c 100644 --- a/packages/regex/package.json +++ b/packages/regex/package.json @@ -20,8 +20,8 @@ "access": "public" }, "devDependencies": { - "emojibase": "^6.1.0", - "emojibase-test-utils": "^7.0.0" + "emojibase": "workspace:*", + "emojibase-test-utils": "workspace:*" }, "funding": { "type": "ko-fi", diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 2a8c8569..5b725b4e 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -53,7 +53,7 @@ module.exports = { position: 'left', }, { - to: 'api', + to: 'api/emojibase', label: 'API', position: 'left', }, @@ -104,10 +104,10 @@ module.exports = { sidebarPath: require.resolve('./sidebars.js'), editUrl: 'https://github.com/milesj/emojibase/edit/master/website/', }, - blog: { - showReadingTime: true, - editUrl: 'https://github.com/milesj/emojibase/edit/master/website/blog/', - }, + // blog: { + // showReadingTime: true, + // editUrl: 'https://github.com/milesj/emojibase/edit/master/website/blog/', + // }, theme: { customCss: require.resolve('./src/css/custom.css'), }, diff --git a/website/package.json b/website/package.json index dd4b24df..4a59e749 100644 --- a/website/package.json +++ b/website/package.json @@ -16,8 +16,8 @@ "@docusaurus/preset-classic": "^2.1.0", "@mdx-js/react": "^1.6.22", "clsx": "^1.2.1", - "docusaurus-plugin-typedoc-api": "^2.4.0", - "emojibase": "^6.1.0", + "docusaurus-plugin-typedoc-api": "^2.4.1", + "emojibase": "workspace:*", "lodash": "^4.17.21", "react": "^17.0.2", "react-dom": "^17.0.2", diff --git a/website/src/pages/api.tsx b/website/src/pages/api.tsx new file mode 100644 index 00000000..8a62ea47 --- /dev/null +++ b/website/src/pages/api.tsx @@ -0,0 +1,11 @@ +import { useEffect } from 'react'; + +export default function Api() { + // Docusaurus won't find the API index for some reason, + // so this fakes it with a page and then redirects. + useEffect(() => { + window.location.href = '/api/emojibase'; + }, []); + + return null; +} diff --git a/yarn.lock b/yarn.lock index bf850c4e..e7305f8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2141,7 +2141,7 @@ __metadata: languageName: node linkType: hard -"@docusaurus/plugin-content-docs@npm:2.1.0, @docusaurus/plugin-content-docs@npm:^2.0.1": +"@docusaurus/plugin-content-docs@npm:2.1.0, @docusaurus/plugin-content-docs@npm:^2.1.0": version: 2.1.0 resolution: "@docusaurus/plugin-content-docs@npm:2.1.0" dependencies: @@ -2387,7 +2387,7 @@ __metadata: languageName: node linkType: hard -"@docusaurus/types@npm:2.1.0, @docusaurus/types@npm:^2.0.1": +"@docusaurus/types@npm:2.1.0, @docusaurus/types@npm:^2.1.0": version: 2.1.0 resolution: "@docusaurus/types@npm:2.1.0" dependencies: @@ -2433,7 +2433,7 @@ __metadata: languageName: node linkType: hard -"@docusaurus/utils@npm:2.1.0, @docusaurus/utils@npm:^2.0.1": +"@docusaurus/utils@npm:2.1.0, @docusaurus/utils@npm:^2.1.0": version: 2.1.0 resolution: "@docusaurus/utils@npm:2.1.0" dependencies: @@ -8159,21 +8159,21 @@ __metadata: languageName: node linkType: hard -"docusaurus-plugin-typedoc-api@npm:^2.4.0": - version: 2.4.0 - resolution: "docusaurus-plugin-typedoc-api@npm:2.4.0" +"docusaurus-plugin-typedoc-api@npm:^2.4.1": + version: 2.4.1 + resolution: "docusaurus-plugin-typedoc-api@npm:2.4.1" dependencies: - "@docusaurus/plugin-content-docs": ^2.0.1 - "@docusaurus/types": ^2.0.1 - "@docusaurus/utils": ^2.0.1 + "@docusaurus/plugin-content-docs": ^2.1.0 + "@docusaurus/types": ^2.1.0 + "@docusaurus/utils": ^2.1.0 "@vscode/codicons": ^0.0.32 - marked: ^4.0.18 - typedoc: ^0.23.10 + marked: ^4.1.0 + typedoc: ^0.23.15 peerDependencies: "@docusaurus/core": ^2.0.0 react: ">=16.0.0" typescript: ^4.0.0 - checksum: ab1a4814c0b4193e75548d5dd7e25c94fe648396c6e30e8afd9921672e76a2f1f9d76f318bf7321ecb8ec8bbf24f5ec7ff225a84c59ecbabee903891a067df57 + checksum: 6e6696318780e36fab0a76927b6a47da5a9cf2c862798fce322847b5d8c1d84ee3ec69de3ae8e665bc6018dcbd1d1475825f0cbf31d650bc3937edf6a74b2199 languageName: node linkType: hard @@ -8397,8 +8397,8 @@ __metadata: version: 0.0.0-use.local resolution: "emojibase-regex@workspace:packages/regex" dependencies: - emojibase: ^6.1.0 - emojibase-test-utils: ^7.0.0 + emojibase: "workspace:*" + emojibase-test-utils: "workspace:*" languageName: unknown linkType: soft @@ -8426,7 +8426,7 @@ __metadata: languageName: unknown linkType: soft -"emojibase-test-utils@^7.0.0, emojibase-test-utils@workspace:packages/test-utils": +"emojibase-test-utils@workspace:*, emojibase-test-utils@workspace:packages/test-utils": version: 0.0.0-use.local resolution: "emojibase-test-utils@workspace:packages/test-utils" peerDependencies: @@ -8434,7 +8434,7 @@ __metadata: languageName: unknown linkType: soft -"emojibase@^6.1.0, emojibase@workspace:*, emojibase@workspace:packages/core": +"emojibase@workspace:*, emojibase@workspace:packages/core": version: 0.0.0-use.local resolution: "emojibase@workspace:packages/core" languageName: unknown @@ -12822,7 +12822,7 @@ __metadata: languageName: node linkType: hard -"marked@npm:^4.0.18, marked@npm:^4.0.19": +"marked@npm:^4.0.19, marked@npm:^4.1.0": version: 4.1.0 resolution: "marked@npm:4.1.0" bin: @@ -17704,7 +17704,7 @@ __metadata: languageName: node linkType: hard -"typedoc@npm:^0.23.10": +"typedoc@npm:^0.23.15": version: 0.23.15 resolution: "typedoc@npm:0.23.15" dependencies: @@ -18520,8 +18520,8 @@ __metadata: "@types/lodash": ^4.14.185 "@types/react": ^17.0.50 clsx: ^1.2.1 - docusaurus-plugin-typedoc-api: ^2.4.0 - emojibase: ^6.1.0 + docusaurus-plugin-typedoc-api: ^2.4.1 + emojibase: "workspace:*" lodash: ^4.17.21 react: ^17.0.2 react-dom: ^17.0.2