mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
75 lines
2.2 KiB
JavaScript
75 lines
2.2 KiB
JavaScript
// Common configuration for webpacker loaded from config/webpacker.yml
|
|
|
|
const { basename, dirname, extname, join, resolve } = require('path');
|
|
const { env } = require('process');
|
|
const { safeLoad } = require('js-yaml');
|
|
const { lstatSync, readFileSync } = require('fs');
|
|
const glob = require('glob');
|
|
|
|
const configPath = resolve('config', 'webpacker.yml');
|
|
const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];
|
|
const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml');
|
|
const skinFiles = glob.sync('app/javascript/skins/*/*');
|
|
const flavours = {};
|
|
|
|
const core = function () {
|
|
const coreFile = resolve('app', 'javascript', 'core', 'theme.yml');
|
|
const data = safeLoad(readFileSync(coreFile), 'utf8');
|
|
if (!data.pack_directory) {
|
|
data.pack_directory = dirname(coreFile);
|
|
}
|
|
return data.pack ? data : {};
|
|
}();
|
|
|
|
for (let i = 0; i < flavourFiles.length; i++) {
|
|
const flavourFile = flavourFiles[i];
|
|
const data = safeLoad(readFileSync(flavourFile), 'utf8');
|
|
data.name = basename(dirname(flavourFile));
|
|
data.skin = {};
|
|
if (!data.pack_directory) {
|
|
data.pack_directory = dirname(flavourFile);
|
|
}
|
|
if (data.locales) {
|
|
data.locales = join(dirname(flavourFile), data.locales);
|
|
}
|
|
if (data.pack && typeof data.pack === 'object') {
|
|
flavours[data.name] = data;
|
|
}
|
|
}
|
|
|
|
for (let i = 0; i < skinFiles.length; i++) {
|
|
const skinFile = skinFiles[i];
|
|
let skin = basename(skinFile);
|
|
const name = basename(dirname(skinFile));
|
|
if (!flavours[name]) {
|
|
continue;
|
|
}
|
|
const data = flavours[name].skin;
|
|
if (lstatSync(skinFile).isDirectory()) {
|
|
data[skin] = {};
|
|
const skinPacks = glob.sync(join(skinFile, '*.{css,scss}'));
|
|
for (let j = 0; j < skinPacks.length; j++) {
|
|
const pack = skinPacks[j];
|
|
data[skin][basename(pack, extname(pack))] = pack;
|
|
}
|
|
} else if ((skin = skin.match(/^(.*)\.s?css$/i))) {
|
|
data[skin[1]] = { common: skinFile };
|
|
}
|
|
}
|
|
|
|
const output = {
|
|
path: resolve('public', settings.public_output_path),
|
|
publicPath: `/${settings.public_output_path}/`,
|
|
};
|
|
|
|
module.exports = {
|
|
settings,
|
|
core,
|
|
flavours,
|
|
env: {
|
|
NODE_ENV: env.NODE_ENV,
|
|
PUBLIC_OUTPUT_PATH: settings.public_output_path,
|
|
},
|
|
output,
|
|
};
|