From a1f1424e76710d1bbc43bf488b7859217507ccce Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 30 Jul 2023 16:45:50 +0200 Subject: [PATCH] Fix interaction modal being broken because of glitch-soc's theming system --- app/javascript/{packs => core}/remote_interaction_helper.ts | 2 +- app/javascript/core/theme.yml | 1 + app/views/remote_interaction_helper/index.html.haml | 2 +- tsconfig.json | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) rename app/javascript/{packs => core}/remote_interaction_helper.ts (99%) diff --git a/app/javascript/packs/remote_interaction_helper.ts b/app/javascript/core/remote_interaction_helper.ts similarity index 99% rename from app/javascript/packs/remote_interaction_helper.ts rename to app/javascript/core/remote_interaction_helper.ts index 76528ff38..53d95b5db 100644 --- a/app/javascript/packs/remote_interaction_helper.ts +++ b/app/javascript/core/remote_interaction_helper.ts @@ -8,7 +8,7 @@ and performs no other task. */ -import './public-path'; +import 'packs/public-path'; import axios from 'axios'; diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml index 30676dcf5..20912e28d 100644 --- a/app/javascript/core/theme.yml +++ b/app/javascript/core/theme.yml @@ -18,3 +18,4 @@ pack: settings: settings.js sign_up: share: + remote_interaction_helper: remote_interaction_helper.ts diff --git a/app/views/remote_interaction_helper/index.html.haml b/app/views/remote_interaction_helper/index.html.haml index 08db7075b..7a1d975c3 100644 --- a/app/views/remote_interaction_helper/index.html.haml +++ b/app/views/remote_interaction_helper/index.html.haml @@ -1,4 +1,4 @@ - content_for :header_tags do %meta{ name: 'robots', content: 'noindex' }/ - = javascript_pack_tag 'remote_interaction_helper', crossorigin: 'anonymous' + = javascript_pack_tag 'core/remote_interaction_helper', crossorigin: 'anonymous' diff --git a/tsconfig.json b/tsconfig.json index 137d87c18..70d65496a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,6 +24,7 @@ "app/javascript/mastodon", "app/javascript/packs", "app/javascript/types", - "app/javascript/flavours/glitch" + "app/javascript/flavours/glitch", + "app/javascript/core" ] }