about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-10-11 19:35:37 +0200
committerGitHub <noreply@github.com>2022-10-11 19:35:37 +0200
commit18f210aff65bb6f4830386d332c721971e20bebe (patch)
tree4df1d697cf0252539d2f9f15459c10a02957b4ce /app/javascript/flavours/glitch
parentb01faa7375493ee91f7e9dfa32b0af3058c8d16f (diff)
Fix accidentally importing vanilla code in glitch-soc flavor (#1863)
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r--app/javascript/flavours/glitch/main.js2
-rw-r--r--app/javascript/flavours/glitch/reducers/tags.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/main.js b/app/javascript/flavours/glitch/main.js
index 04efcd43f..ecb19ef54 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 d24098e39..266b21177 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();