mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Opt-in config to Prettier
This commit is contained in:
parent
06f070d86d
commit
b7e971f2d1
7 changed files with 48 additions and 37 deletions
|
@ -83,3 +83,4 @@ AUTHORS.md
|
|||
|
||||
# Process a few selected JS files
|
||||
!lint-staged.config.js
|
||||
!/config/**/*.js
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
const path = require('path');
|
||||
|
||||
const currentTranslations = require(path.join(__dirname, "../app/javascript/mastodon/locales/en.json"));
|
||||
const currentTranslations = require(
|
||||
path.join(__dirname, '../app/javascript/mastodon/locales/en.json'),
|
||||
);
|
||||
|
||||
exports.format = (msgs) => {
|
||||
const results = {};
|
||||
|
|
|
@ -7,7 +7,9 @@ const { env } = require('process');
|
|||
const { load } = require('js-yaml');
|
||||
|
||||
const configPath = resolve('config', 'webpacker.yml');
|
||||
const settings = load(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];
|
||||
const settings = load(readFileSync(configPath), 'utf8')[
|
||||
env.RAILS_ENV || env.NODE_ENV
|
||||
];
|
||||
|
||||
const themePath = resolve('config', 'themes.yml');
|
||||
const themes = load(readFileSync(themePath), 'utf8');
|
||||
|
|
|
@ -57,6 +57,6 @@ module.exports = merge(sharedConfig, {
|
|||
settings.dev_server.watch_options,
|
||||
watchOptions,
|
||||
),
|
||||
writeToDisk: filePath => /ocr/.test(filePath),
|
||||
writeToDisk: (filePath) => /ocr/.test(filePath),
|
||||
},
|
||||
});
|
||||
|
|
|
@ -42,24 +42,27 @@ module.exports = merge(sharedConfig, {
|
|||
cache: true,
|
||||
test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/,
|
||||
}),
|
||||
new BundleAnalyzerPlugin({ // generates report.html
|
||||
new BundleAnalyzerPlugin({
|
||||
// generates report.html
|
||||
analyzerMode: 'static',
|
||||
openAnalyzer: false,
|
||||
logLevel: 'silent', // do not bother Webpacker, who runs with --json and parses stdout
|
||||
}),
|
||||
new InjectManifest({
|
||||
additionalManifestEntries: ['1f602.svg', 'sheet_13.png'].map((filename) => {
|
||||
const path = resolve(root, 'public', 'emoji', filename);
|
||||
const body = readFileSync(path);
|
||||
const md5 = createHash('md5');
|
||||
additionalManifestEntries: ['1f602.svg', 'sheet_13.png'].map(
|
||||
(filename) => {
|
||||
const path = resolve(root, 'public', 'emoji', filename);
|
||||
const body = readFileSync(path);
|
||||
const md5 = createHash('md5');
|
||||
|
||||
md5.update(body);
|
||||
md5.update(body);
|
||||
|
||||
return {
|
||||
revision: md5.digest('hex'),
|
||||
url: `/emoji/${filename}`,
|
||||
};
|
||||
}),
|
||||
return {
|
||||
revision: md5.digest('hex'),
|
||||
url: `/emoji/${filename}`,
|
||||
};
|
||||
},
|
||||
),
|
||||
exclude: [
|
||||
/(?:base|extra)_polyfills-.*\.js$/,
|
||||
/locale_.*\.js$/,
|
||||
|
@ -68,7 +71,14 @@ module.exports = merge(sharedConfig, {
|
|||
include: [/\.js$/, /\.css$/],
|
||||
maximumFileSizeToCacheInBytes: 2 * 1_024 * 1_024, // 2 MiB
|
||||
swDest: resolve(root, 'public', 'packs', 'sw.js'),
|
||||
swSrc: resolve(root, 'app', 'javascript', 'mastodon', 'service_worker', 'entry.js'),
|
||||
swSrc: resolve(
|
||||
root,
|
||||
'app',
|
||||
'javascript',
|
||||
'mastodon',
|
||||
'service_worker',
|
||||
'entry.js',
|
||||
),
|
||||
}),
|
||||
],
|
||||
});
|
||||
|
|
|
@ -3,18 +3,18 @@ const { join, resolve } = require('path');
|
|||
const { env, settings } = require('../configuration');
|
||||
|
||||
// Those modules contain modern ES code that need to be transpiled for Webpack to process it
|
||||
const nodeModulesToProcess = [
|
||||
'@reduxjs', 'fuzzysort'
|
||||
];
|
||||
const nodeModulesToProcess = ['@reduxjs', 'fuzzysort'];
|
||||
|
||||
module.exports = {
|
||||
test: /\.(js|jsx|mjs|ts|tsx)$/,
|
||||
include: [
|
||||
settings.source_path,
|
||||
...settings.resolved_paths,
|
||||
...nodeModulesToProcess.map(p => resolve(`node_modules/${p}`)),
|
||||
].map(p => resolve(p)),
|
||||
exclude: new RegExp('node_modules\\/(?!(' + nodeModulesToProcess.join('|')+')\\/).*'),
|
||||
...nodeModulesToProcess.map((p) => resolve(`node_modules/${p}`)),
|
||||
].map((p) => resolve(p)),
|
||||
exclude: new RegExp(
|
||||
'node_modules\\/(?!(' + nodeModulesToProcess.join('|') + ')\\/).*',
|
||||
),
|
||||
use: [
|
||||
{
|
||||
loader: 'babel-loader',
|
||||
|
|
|
@ -21,7 +21,8 @@ module.exports = {
|
|||
packPaths.reduce((map, entry) => {
|
||||
const localMap = map;
|
||||
const namespace = relative(join(entryPath), dirname(entry));
|
||||
localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
|
||||
localMap[join(namespace, basename(entry, extname(entry)))] =
|
||||
resolve(entry);
|
||||
return localMap;
|
||||
}, {}),
|
||||
Object.keys(themes).reduce((themePaths, name) => {
|
||||
|
@ -61,19 +62,17 @@ module.exports = {
|
|||
},
|
||||
|
||||
module: {
|
||||
rules: Object.keys(rules).map(key => rules[key]),
|
||||
rules: Object.keys(rules).map((key) => rules[key]),
|
||||
strictExportPresence: true,
|
||||
},
|
||||
|
||||
plugins: [
|
||||
new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
|
||||
new webpack.NormalModuleReplacementPlugin(
|
||||
/^history\//, (resource) => {
|
||||
// temporary fix for https://github.com/ReactTraining/react-router/issues/5576
|
||||
// to reduce bundle size
|
||||
resource.request = resource.request.replace(/^history/, 'history/es');
|
||||
},
|
||||
),
|
||||
new webpack.NormalModuleReplacementPlugin(/^history\//, (resource) => {
|
||||
// temporary fix for https://github.com/ReactTraining/react-router/issues/5576
|
||||
// to reduce bundle size
|
||||
resource.request = resource.request.replace(/^history/, 'history/es');
|
||||
}),
|
||||
new MiniCssExtractPlugin({
|
||||
filename: 'css/[name]-[contenthash:8].css',
|
||||
chunkFilename: 'css/[name]-[contenthash:8].chunk.css',
|
||||
|
@ -87,18 +86,15 @@ module.exports = {
|
|||
}),
|
||||
new CircularDependencyPlugin({
|
||||
failOnError: true,
|
||||
})
|
||||
}),
|
||||
],
|
||||
|
||||
resolve: {
|
||||
extensions: settings.extensions,
|
||||
modules: [
|
||||
resolve(settings.source_path),
|
||||
'node_modules',
|
||||
],
|
||||
modules: [resolve(settings.source_path), 'node_modules'],
|
||||
alias: {
|
||||
"@": resolve(settings.source_path),
|
||||
}
|
||||
'@': resolve(settings.source_path),
|
||||
},
|
||||
},
|
||||
|
||||
resolveLoader: {
|
||||
|
|
Loading…
Reference in a new issue