YuruToot/app/javascript/flavours/glitch/packs/common.js

import { start } from '@rails/ujs';

start();

import 'flavours/glitch/styles/index.scss';

//  This ensures that webpack compiles our images.
require.context('../images', true);
Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes. 2020-03-23 00:10:44 +09:00			`import { start } from '@rails/ujs';`
Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 23:42:52 +09:00
			`start();`

Rename themes -> flavours ? ? 2017-12-04 16:26:40 +09:00			`import 'flavours/glitch/styles/index.scss';`
Screenshot support for themes 2017-12-11 13:15:09 +09:00
			`// This ensures that webpack compiles our images.`
			`require.context('../images', true);`