Further reduce pack differences with upstream

ClearlyClaire · Mar 15, 2024 · d49e4e7 · d49e4e7
1 parent 42dd3cc
commit d49e4e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
@@ -16,6 +16,8 @@ import { loadLocale, getLocale } from 'flavours/glitch/locales';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 import ready from 'flavours/glitch/ready';
 
+import 'cocoon-js-vanilla';
+
 const messages = defineMessages({
   usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
   passwordExceedsLength: { id: 'password_confirmation.exceeds_maxlength', defaultMessage: 'Password confirmation exceeds the maximum password length' },

diff --git a/app/javascript/flavours/glitch/packs/settings.js b/app/javascript/flavours/glitch/packs/settings.js
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
@@ -18,7 +18,7 @@ pack:
   mailer:
   modal:
   public: packs/public.jsx
-  settings: packs/settings.js
+  settings: packs/public.jsx
   sign_up: packs/sign_up.js
   share: packs/share.jsx