matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'soapbox/develop' into rss-button

Browse Source
This commit is contained in:
marcin mikołajczak
2022-11-21 20:41:25 +01:00
parent 5d10324127 a0597a6445
commit 8be2ee918d
617 changed files with 2758 additions and 6347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webpack/configuration.ts
View File

@ -4,7 +4,7 @@ import { env } from 'process';
const {
FE_SUBDIRECTORY,
FE_BUILD_DIR,
} = require(join(__dirname, '..', 'app', 'soapbox', 'build_config'));
} = require(join(__dirname, '..', 'app', 'soapbox', 'build-config'));
const settings = {
source_path: 'app',

2
webpack/development.ts
View File

@ -24,7 +24,7 @@ const DEFAULTS = {
PATRON_URL: 'http://localhost:3037',
};
const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config'));
const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config'));
const backendEndpoints = [
'/api',

4
webpack/production.ts
View File

@ -12,7 +12,7 @@ import sharedConfig from './shared';
import type { Configuration } from 'webpack';
const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config'));
const { FE_SUBDIRECTORY } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config'));
const joinPublicPath = (...paths: string[]) => join(FE_SUBDIRECTORY, ...paths);
const configuration: Configuration = {
@ -95,7 +95,7 @@ const configuration: Configuration = {
],
ServiceWorker: {
cacheName: 'soapbox',
entry: join(__dirname, '../app/soapbox/service_worker/entry.ts'),
entry: join(__dirname, '../app/soapbox/service-worker/entry.ts'),
events: true,
minify: true,
},

8
webpack/rules/assets.ts
View File

@ -11,7 +11,7 @@ const rules: RuleSetRule[] = [{
test: /\.(png|svg)/,
type: 'asset/resource',
include: [
resolve('app', 'images'),
resolve('app', 'assets', 'images'),
resolve('node_modules', 'emoji-datasource'),
],
generator: {
@ -21,7 +21,7 @@ const rules: RuleSetRule[] = [{
test: /\.(ttf|eot|svg|woff|woff2)/,
type: 'asset/resource',
include: [
resolve('app', 'fonts'),
resolve('app', 'assets', 'fonts'),
resolve('node_modules', 'fork-awesome'),
resolve('node_modules', 'line-awesome'),
resolve('node_modules', '@fontsource'),
@ -32,7 +32,7 @@ const rules: RuleSetRule[] = [{
}, {
test: /\.(ogg|oga|mp3)/,
type: 'asset/resource',
include: resolve('app', 'sounds'),
include: resolve('app', 'assets', 'sounds'),
generator: {
filename: 'packs/sounds/[name]-[contenthash:8][ext]',
},
@ -46,7 +46,7 @@ const rules: RuleSetRule[] = [{
}, {
test: /\.svg$/,
type: 'asset/resource',
include: resolve('app', 'icons'),
include: resolve('app', 'assets', 'icons'),
generator: {
filename: 'packs/icons/[name]-[contenthash:8][ext]',
},

4
webpack/rules/babel-build-config.ts
View File

@ -4,11 +4,11 @@ import { env } from '../configuration';
import type { RuleSetRule } from 'webpack';
// This is a hack, used to force build_config @preval to recompile
// This is a hack, used to force build-config @preval to recompile
// https://github.com/kentcdodds/babel-plugin-preval/issues/19
const rule: RuleSetRule = {
test: resolve(__dirname, '../../app/soapbox/build_config.js'),
test: resolve(__dirname, '../../app/soapbox/build-config.js'),
use: [
{
loader: 'babel-loader',

4
webpack/shared.ts
View File

@ -15,7 +15,7 @@ import DeadCodePlugin from 'webpack-deadcode-plugin';
import { env, settings, output } from './configuration';
import rules from './rules';
const { FE_SUBDIRECTORY, FE_INSTANCE_SOURCE_DIR } = require(join(__dirname, '..', 'app', 'soapbox', 'build_config'));
const { FE_SUBDIRECTORY, FE_INSTANCE_SOURCE_DIR } = require(join(__dirname, '..', 'app', 'soapbox', 'build-config'));
/** Return file as string, or return empty string. */
const readFile = (filename: string) => {
@ -114,7 +114,7 @@ const configuration: Configuration = {
'**/__*__/*',
'**/(LICENSE|README|COPYING)(.md|.txt)?',
// This file is imported with @preval
'app/soapbox/features/emoji/emoji_map.json',
'app/soapbox/features/emoji/emoji-map.json',
],
}),
// https://github.com/jantimon/html-webpack-plugin#options