From fe7db7905fe9b8a120b6f6f7169eefd3df976727 Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Mon, 29 Apr 2024 10:02:41 +0200 Subject: [PATCH] [Glitch] Convert easy entrypoints files to Typescript Port 36909065b544d06e8487f1e0679e595fd01a7f22 to glitch-soc Signed-off-by: Claire --- .../entrypoints/{application.js => application.ts} | 4 ++-- .../glitch/entrypoints/{error.js => error.ts} | 6 +++++- .../glitch/entrypoints/{inert.js => inert.ts} | 0 .../glitch/entrypoints/{mailer.js => mailer.ts} | 0 .../glitch/entrypoints/{share.jsx => share.tsx} | 14 +++++++++----- 5 files changed, 16 insertions(+), 8 deletions(-) rename app/javascript/flavours/glitch/entrypoints/{application.js => application.ts} (80%) rename app/javascript/flavours/glitch/entrypoints/{error.js => error.ts} (66%) rename app/javascript/flavours/glitch/entrypoints/{inert.js => inert.ts} (100%) rename app/javascript/flavours/glitch/entrypoints/{mailer.js => mailer.ts} (100%) rename app/javascript/flavours/glitch/entrypoints/{share.jsx => share.tsx} (74%) diff --git a/app/javascript/flavours/glitch/entrypoints/application.js b/app/javascript/flavours/glitch/entrypoints/application.ts similarity index 80% rename from app/javascript/flavours/glitch/entrypoints/application.js rename to app/javascript/flavours/glitch/entrypoints/application.ts index a0b5d714c4..3659d8212b 100644 --- a/app/javascript/flavours/glitch/entrypoints/application.js +++ b/app/javascript/flavours/glitch/entrypoints/application.ts @@ -2,7 +2,7 @@ import '@/entrypoints/public-path'; import { start } from 'flavours/glitch/common'; import { loadLocale } from 'flavours/glitch/locales'; -import main from "flavours/glitch/main"; +import main from 'flavours/glitch/main'; import { loadPolyfills } from 'flavours/glitch/polyfills'; start(); @@ -10,6 +10,6 @@ start(); loadPolyfills() .then(loadLocale) .then(main) - .catch(e => { + .catch((e: unknown) => { console.error(e); }); diff --git a/app/javascript/flavours/glitch/entrypoints/error.js b/app/javascript/flavours/glitch/entrypoints/error.ts similarity index 66% rename from app/javascript/flavours/glitch/entrypoints/error.js rename to app/javascript/flavours/glitch/entrypoints/error.ts index 4315d20de1..9e067d4caa 100644 --- a/app/javascript/flavours/glitch/entrypoints/error.js +++ b/app/javascript/flavours/glitch/entrypoints/error.ts @@ -2,7 +2,9 @@ import '@/entrypoints/public-path'; import ready from 'flavours/glitch/ready'; ready(() => { - const image = document.querySelector('img'); + const image = document.querySelector('img'); + + if (!image) return; image.addEventListener('mouseenter', () => { image.src = '/oops.gif'; @@ -11,4 +13,6 @@ ready(() => { image.addEventListener('mouseleave', () => { image.src = '/oops.png'; }); +}).catch((e: unknown) => { + console.error(e); }); diff --git a/app/javascript/flavours/glitch/entrypoints/inert.js b/app/javascript/flavours/glitch/entrypoints/inert.ts similarity index 100% rename from app/javascript/flavours/glitch/entrypoints/inert.js rename to app/javascript/flavours/glitch/entrypoints/inert.ts diff --git a/app/javascript/flavours/glitch/entrypoints/mailer.js b/app/javascript/flavours/glitch/entrypoints/mailer.ts similarity index 100% rename from app/javascript/flavours/glitch/entrypoints/mailer.js rename to app/javascript/flavours/glitch/entrypoints/mailer.ts diff --git a/app/javascript/flavours/glitch/entrypoints/share.jsx b/app/javascript/flavours/glitch/entrypoints/share.tsx similarity index 74% rename from app/javascript/flavours/glitch/entrypoints/share.jsx rename to app/javascript/flavours/glitch/entrypoints/share.tsx index 62d2f6df42..0eda442506 100644 --- a/app/javascript/flavours/glitch/entrypoints/share.jsx +++ b/app/javascript/flavours/glitch/entrypoints/share.tsx @@ -16,7 +16,7 @@ function loaded() { if (!attr) return; - const props = JSON.parse(attr); + const props = JSON.parse(attr) as object; const root = createRoot(mountNode); root.render(); @@ -24,9 +24,13 @@ function loaded() { } function main() { - ready(loaded); + ready(loaded).catch((error: unknown) => { + console.error(error); + }); } -loadPolyfills().then(main).catch(error => { - console.error(error); -}); +loadPolyfills() + .then(main) + .catch((error: unknown) => { + console.error(error); + });