Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
		
			
				
	
	
		
			87 lines
		
	
	
	
		
			2.6 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			87 lines
		
	
	
	
		
			2.6 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 };
 | |
|   }
 | |
| }
 | |
| 
 | |
| function removeOuterSlashes(string) {
 | |
|   return string.replace(/^\/*/, '').replace(/\/*$/, '');
 | |
| }
 | |
| 
 | |
| function formatPublicPath(host = '', path = '') {
 | |
|   let formattedHost = removeOuterSlashes(host);
 | |
|   if (formattedHost && !/^http/i.test(formattedHost)) {
 | |
|     formattedHost = `//${formattedHost}`;
 | |
|   }
 | |
|   const formattedPath = removeOuterSlashes(path);
 | |
|   return `${formattedHost}/${formattedPath}/`;
 | |
| }
 | |
| 
 | |
| const output = {
 | |
|   path: resolve('public', settings.public_output_path),
 | |
|   publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
 | |
| };
 | |
| 
 | |
| module.exports = {
 | |
|   settings,
 | |
|   core,
 | |
|   flavours,
 | |
|   env: {
 | |
|     CDN_HOST: env.CDN_HOST,
 | |
|     NODE_ENV: env.NODE_ENV,
 | |
|   },
 | |
|   output,
 | |
| };
 |