From abc39ef98227e3363ae643fde3945533ad668d13 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Fri, 25 Nov 2022 12:06:09 -0800 Subject: [PATCH] chore: remove emoji picker i18n files (#2258) --- package.json | 1 + src/intl/emoji-picker/de.js | 34 ----------------------------- src/intl/emoji-picker/fr.js | 34 ----------------------------- webpack/client.config.js | 4 ++-- webpack/rollup.config.js | 2 ++ yarn.lock | 43 ++++++++++++++++++++++++++++++++++++- 6 files changed, 47 insertions(+), 71 deletions(-) delete mode 100644 src/intl/emoji-picker/de.js delete mode 100644 src/intl/emoji-picker/fr.js diff --git a/package.json b/package.json index cc35e074..57419d38 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "@formatjs/intl-pluralrules": "^5.1.4", "@formatjs/intl-relativetimeformat": "^11.1.4", "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^14.1.0", "@rollup/plugin-replace": "^2.4.2", "@stdlib/utils-noop": "^0.0.13", "arrow-key-navigation": "^1.2.0", diff --git a/src/intl/emoji-picker/de.js b/src/intl/emoji-picker/de.js deleted file mode 100644 index 4655fd90..00000000 --- a/src/intl/emoji-picker/de.js +++ /dev/null @@ -1,34 +0,0 @@ -export default { - categoriesLabel: 'Kategorien', - emojiUnsupportedMessage: 'Dein Browser unterstützt keine farbigen Emojis.', - favoritesLabel: 'Favoriten', - loadingMessage: 'Wird geladen…', - networkErrorMessage: 'Konnte Emoji nicht laden. Versuche, die Seite neu zu laden.', - regionLabel: 'Emoji auswählen', - searchDescription: 'Wenn Suchergebnisse verfügbar sind, wähle sie mit Pfeil rauf und runter, dann Eingabetaste, aus.', - searchLabel: 'Suchen', - searchResultsLabel: 'Suchergebnisse', - skinToneDescription: 'Wenn angezeigt, nutze Pfeiltasten rauf und runter zum Auswählen, Eingabe zum Akzeptieren.', - skinToneLabel: 'Wähle einen Hautton (aktuell {skinTone})', - skinTonesLabel: 'Hauttöne', - skinTones: [ - 'Standard', - 'Hell', - 'Mittel-hell', - 'Mittel', - 'Mittel-dunkel', - 'Dunkel' - ], - categories: { - custom: 'Benutzerdefiniert', - 'smileys-emotion': 'Smileys und Emoticons', - 'people-body': 'Menschen und Körper', - 'animals-nature': 'Tiere und Natur', - 'food-drink': 'Essen und Trinken', - 'travel-places': 'Reisen und Orte', - activities: 'Aktivitäten', - objects: 'Objekte', - symbols: 'Symbole', - flags: 'Flaggen' - } -} diff --git a/src/intl/emoji-picker/fr.js b/src/intl/emoji-picker/fr.js deleted file mode 100644 index f2df4db7..00000000 --- a/src/intl/emoji-picker/fr.js +++ /dev/null @@ -1,34 +0,0 @@ -export default { - categoriesLabel: 'Catégories', - emojiUnsupportedMessage: 'Votre navigateur ne soutient pas les emojis en couleur.', - favoritesLabel: 'Favoris', - loadingMessage: 'Chargement en cours…', - networkErrorMessage: 'Impossible de charger les emojis. Veuillez essayer de recharger.', - regionLabel: 'Choisir un emoji', - searchDescription: 'Quand les résultats sont disponisbles, appuyez la fleche vers le haut ou le bas et la touche entrée pour choisir.', - searchLabel: 'Rechercher', - searchResultsLabel: 'Résultats', - skinToneDescription: 'Quand disponible, appuyez la fleche vers le haut ou le bas et la touch entrée pour choisir.', - skinToneLabel: 'Choisir une couleur de peau (actuellement {skinTone})', - skinTonesLabel: 'Couleurs de peau', - skinTones: [ - 'Défaut', - 'Clair', - 'Moyennement clair', - 'Moyen', - 'Moyennement sombre', - 'Sombre' - ], - categories: { - custom: 'Customisé', - 'smileys-emotion': 'Les smileyes et les émoticônes', - 'people-body': 'Les gens et le corps', - 'animals-nature': 'Les animaux et la nature', - 'food-drink': 'La nourriture et les boissons', - 'travel-places': 'Les voyages et les endroits', - activities: 'Les activités', - objects: 'Les objets', - symbols: 'Les symbols', - flags: 'Les drapeaux' - } -} diff --git a/webpack/client.config.js b/webpack/client.config.js index 69f8ae09..9f7ece67 100644 --- a/webpack/client.config.js +++ b/webpack/client.config.js @@ -10,8 +10,8 @@ import { version } from '../package.json' import urlRegex from '../src/routes/_utils/urlRegexSource.js' // TODO: make it so we don't have to list these out explicitly -import fr from '../src/intl/emoji-picker/fr.js' -import de from '../src/intl/emoji-picker/de.js' +import fr from 'emoji-picker-element/i18n/fr.js' +import de from 'emoji-picker-element/i18n/de.js' const emojiPickerLocales = { fr, de } diff --git a/webpack/rollup.config.js b/webpack/rollup.config.js index 0c2cb9b5..e1f36578 100644 --- a/webpack/rollup.config.js +++ b/webpack/rollup.config.js @@ -1,4 +1,5 @@ import json from '@rollup/plugin-json' +import nodeResolve from '@rollup/plugin-node-resolve' // We have to build this as webpack.config.cjs so that Sapper can require() it correctly, // since Sapper is designed to only work with CommonJS @@ -7,6 +8,7 @@ const createConfig = (input) => { return { input, plugins: [ + nodeResolve(), json() ], output: { diff --git a/yarn.lock b/yarn.lock index c71d0a99..35d591a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1206,6 +1206,18 @@ dependencies: "@rollup/pluginutils" "^3.0.8" +"@rollup/plugin-node-resolve@^14.1.0": + version "14.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-14.1.0.tgz#f2fa475405cd7fed6420bf438fe393f988a9bc96" + integrity sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw== + dependencies: + "@rollup/pluginutils" "^3.1.0" + "@types/resolve" "1.17.1" + deepmerge "^4.2.2" + is-builtin-module "^3.1.0" + is-module "^1.0.0" + resolve "^1.19.0" + "@rollup/plugin-replace@^2.4.2": version "2.4.2" resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" @@ -1314,6 +1326,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== +"@types/resolve@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" + integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== + dependencies: + "@types/node" "*" + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -1885,6 +1904,11 @@ bufferjs@^2.0.0: resolved "https://registry.yarnpkg.com/bufferjs/-/bufferjs-2.0.0.tgz#685e71ed5c0600e3d703ff9bd012bb3270a39e28" integrity sha512-VnTCQKC+AJ61OFGe/hn3jRXoIt/B95NUcuxzAwiVT0PFB0KRZImkoDPYdFqDIs7xAs1eJ3yiKcHnuUiiYe7ucQ== +builtin-modules@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" + integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== + builtins@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" @@ -2455,6 +2479,11 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" @@ -3948,6 +3977,13 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" +is-builtin-module@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.0.tgz#bb0310dfe881f144ca83f30100ceb10cf58835e0" + integrity sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw== + dependencies: + builtin-modules "^3.3.0" + is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" @@ -4045,6 +4081,11 @@ is-jquery-obj@^0.1.0: resolved "https://registry.yarnpkg.com/is-jquery-obj/-/is-jquery-obj-0.1.1.tgz#e8d9cc9737b1ab0733b50303e33a38ed7cc2f60b" integrity sha512-18toSebUVF7y717dgw/Dzn6djOCqrkiDp3MhB8P6TdKyCVkbD1ZwE7Uz8Hwx6hUPTvKjbyYH9ncXT4ts4qLaSA== +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== + is-nan@^1.2.1: version "1.3.2" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" @@ -5640,7 +5681,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: +resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==