From 18f210aff65bb6f4830386d332c721971e20bebe Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 11 Oct 2022 19:35:37 +0200 Subject: [PATCH] Fix accidentally importing vanilla code in glitch-soc flavor (#1863) --- app/javascript/flavours/glitch/main.js | 2 +- app/javascript/flavours/glitch/reducers/tags.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/main.js b/app/javascript/flavours/glitch/main.js index 04efcd43fd..ecb19ef540 100644 --- a/app/javascript/flavours/glitch/main.js +++ b/app/javascript/flavours/glitch/main.js @@ -30,7 +30,7 @@ function main() { if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { const [{ Workbox }, { me }] = await Promise.all([ import('workbox-window'), - import('mastodon/initial_state'), + import('flavours/glitch/initial_state'), ]); const wb = new Workbox('/sw.js'); diff --git a/app/javascript/flavours/glitch/reducers/tags.js b/app/javascript/flavours/glitch/reducers/tags.js index d24098e394..266b21177f 100644 --- a/app/javascript/flavours/glitch/reducers/tags.js +++ b/app/javascript/flavours/glitch/reducers/tags.js @@ -4,7 +4,7 @@ import { HASHTAG_FOLLOW_FAIL, HASHTAG_UNFOLLOW_REQUEST, HASHTAG_UNFOLLOW_FAIL, -} from 'mastodon/actions/tags'; +} from 'flavours/glitch/actions/tags'; import { Map as ImmutableMap, fromJS } from 'immutable'; const initialState = ImmutableMap();