tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename themes -> flavours ? ?

Browse Source
This commit is contained in:
kibigo!
2017-12-03 23:26:40 -08:00
parent d216547382
commit bc4fa6b198
313 changed files with 665 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/webpack/configuration.js
View File

@@ -9,9 +9,9 @@ const glob = require('glob');
const configPath = resolve('config', 'webpacker.yml');
const loadersDir = join(__dirname, 'loaders');
const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
const themeFiles = glob.sync('app/javascript/themes/*/theme.yml');
const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml');
const skinFiles = glob.sync('app/javascript/skins/*/*');
const themes = {};
const flavours = {};
const core = function () {
const coreFile = resolve('app', 'javascript', 'core', 'theme.yml');
@@ -22,16 +22,16 @@ const core = function () {
return data.pack ? data : {};
}();
for (let i = 0; i < themeFiles.length; i++) {
const themeFile = themeFiles[i];
const data = safeLoad(readFileSync(themeFile), 'utf8');
data.name = basename(dirname(themeFile));
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(themeFile);
data.pack_directory = dirname(flavourFile);
}
if (data.pack && typeof data.pack === 'object') {
themes[data.name] = data;
flavours[data.name] = data;
}
}
@@ -39,10 +39,10 @@ for (let i = 0; i < skinFiles.length; i++) {
const skinFile = skinFiles[i];
let skin = basename(skinFile);
const name = basename(dirname(skinFile));
if (!themes[name]) {
if (!flavours[name]) {
continue;
}
const data = themes[name].skin;
const data = flavours[name].skin;
if (lstatSync(skinFile).isDirectory()) {
data[skin] = {};
const skinPacks = glob.sync(skinFile, '*.{css,scss}');
@@ -76,7 +76,7 @@ const output = {
module.exports = {
settings,
core,
themes,
flavours,
env,
loadersDir,
output,

6
config/webpack/shared.js
View File

@@ -6,7 +6,7 @@ const { sync } = require('glob');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const ManifestPlugin = require('webpack-manifest-plugin');
const extname = require('path-complete-extname');
const { env, settings, core, themes, output, loadersDir } = require('./configuration.js');
const { env, settings, core, flavours, output, loadersDir } = require('./configuration.js');
const localePackPaths = require('./generateLocalePacks');
function reducePacks (data, into = {}) {
@@ -20,7 +20,7 @@ function reducePacks (data, into = {}) {
}
const packFile = typeof pack === 'string' ? pack : pack.filename;
if (packFile) {
map[data.name ? `themes/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
map[data.name ? `flavours/${data.name}/${entry}` : `core/${entry}`] = resolve(data.pack_directory, packFile);
}
return map;
}, into);
@@ -54,7 +54,7 @@ module.exports = {
return localMap;
}, {}),
reducePacks(core),
Object.keys(themes).reduce((map, entry) => reducePacks(themes[entry], map), {})
Object.keys(flavours).reduce((map, entry) => reducePacks(flavours[entry], map), {})
),
output: {