refactor progress

fluxer_app/scripts/build/rspack/static-files.mjs

@@ -19,19 +19,19 @@
 
 import {sources} from '@rspack/core';
 
-function normalizeEndpoint(cdnEndpoint) {
-	if (!cdnEndpoint) return '';
-	return cdnEndpoint.endsWith('/') ? cdnEndpoint.slice(0, -1) : cdnEndpoint;
+function normalizeEndpoint(staticCdnEndpoint) {
+	if (!staticCdnEndpoint) return '';
+	return staticCdnEndpoint.endsWith('/') ? staticCdnEndpoint.slice(0, -1) : staticCdnEndpoint;
 }
 
-function generateManifest(cdnEndpointRaw) {
-	const cdnEndpoint = normalizeEndpoint(cdnEndpointRaw);
+function generateManifest(staticCdnEndpointRaw) {
+	const staticCdnEndpoint = normalizeEndpoint(staticCdnEndpointRaw);
 
 	const manifest = {
 		name: 'Fluxer',
 		short_name: 'Fluxer',
 		description:
-			'Fluxer is an open-source, independent instant messaging and VoIP platform. Built for friends, groups, and communities.',
+			'Fluxer is a free and open source instant messaging and VoIP platform built for friends, groups, and communities.',
 		start_url: '/',
 		display: 'standalone',
 		orientation: 'portrait-primary',
@@ -42,29 +42,29 @@ function generateManifest(cdnEndpointRaw) {
 		scope: '/',
 		icons: [
 			{
-				src: `${cdnEndpoint}/web/android-chrome-192x192.png`,
+				src: `${staticCdnEndpoint}/web/android-chrome-192x192.png`,
 				sizes: '192x192',
 				type: 'image/png',
 				purpose: 'maskable any',
 			},
 			{
-				src: `${cdnEndpoint}/web/android-chrome-512x512.png`,
+				src: `${staticCdnEndpoint}/web/android-chrome-512x512.png`,
 				sizes: '512x512',
 				type: 'image/png',
 				purpose: 'maskable any',
 			},
 			{
-				src: `${cdnEndpoint}/web/apple-touch-icon.png`,
+				src: `${staticCdnEndpoint}/web/apple-touch-icon.png`,
 				sizes: '180x180',
 				type: 'image/png',
 			},
 			{
-				src: `${cdnEndpoint}/web/favicon-32x32.png`,
+				src: `${staticCdnEndpoint}/web/favicon-32x32.png`,
 				sizes: '32x32',
 				type: 'image/png',
 			},
 			{
-				src: `${cdnEndpoint}/web/favicon-16x16.png`,
+				src: `${staticCdnEndpoint}/web/favicon-16x16.png`,
 				sizes: '16x16',
 				type: 'image/png',
 			},
@@ -74,14 +74,14 @@ function generateManifest(cdnEndpointRaw) {
 	return JSON.stringify(manifest, null, 2);
 }
 
-function generateBrowserConfig(cdnEndpointRaw) {
-	const cdnEndpoint = normalizeEndpoint(cdnEndpointRaw);
+function generateBrowserConfig(staticCdnEndpointRaw) {
+	const staticCdnEndpoint = normalizeEndpoint(staticCdnEndpointRaw);
 
 	return `<?xml version="1.0" encoding="utf-8"?>
 <browserconfig>
   <msapplication>
     <tile>
-      <square150x150logo src="${cdnEndpoint}/web/mstile-150x150.png"/>
+      <square150x150logo src="${staticCdnEndpoint}/web/mstile-150x150.png"/>
       <TileColor>#4641D9</TileColor>
     </tile>
   </msapplication>
@@ -94,7 +94,7 @@ function generateRobotsTxt() {
 
 export class StaticFilesPlugin {
 	constructor(options) {
-		this.cdnEndpoint = options?.cdnEndpoint ?? '';
+		this.staticCdnEndpoint = options?.staticCdnEndpoint ?? '';
 	}
 
 	apply(compiler) {
@@ -105,8 +105,11 @@ export class StaticFilesPlugin {
 					stage: compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
 				},
 				() => {
-					compilation.emitAsset('manifest.json', new sources.RawSource(generateManifest(this.cdnEndpoint)));
-					compilation.emitAsset('browserconfig.xml', new sources.RawSource(generateBrowserConfig(this.cdnEndpoint)));
+					compilation.emitAsset('manifest.json', new sources.RawSource(generateManifest(this.staticCdnEndpoint)));
+					compilation.emitAsset(
+						'browserconfig.xml',
+						new sources.RawSource(generateBrowserConfig(this.staticCdnEndpoint)),
+					);
 					compilation.emitAsset('robots.txt', new sources.RawSource(generateRobotsTxt()));
 				},
 			);

fluxer_app/scripts/build/tsconfig.json

@@ -10,11 +10,15 @@
 		"resolveJsonModule": true,
 		"isolatedModules": true,
 		"verbatimModuleSyntax": true,
+		"jsx": "preserve",
 		"esModuleInterop": true,
 		"allowSyntheticDefaultImports": true,
 		"strict": true,
 		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true
+		"forceConsistentCasingInFileNames": true,
+		"paths": {
+			"@app_scripts/*": ["./../*"]
+		}
 	},
-	"include": ["./**/*.ts"]
+	"include": ["./**/*.ts", "./**/*.tsx"]
 }

fluxer_app/scripts/build/utils/Assets.tsx

@@ -19,7 +19,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import {ASSETS_DIR, DIST_DIR, PKGS_DIR, PUBLIC_DIR} from '../config';
+import {ASSETS_DIR, DIST_DIR, PKGS_DIR, PUBLIC_DIR} from '@app_scripts/build/Config';
 
 export async function copyPublicAssets(): Promise<void> {
 	if (!fs.existsSync(PUBLIC_DIR)) {

fluxer_app/scripts/build/utils/CssDts.tsx

@@ -19,9 +19,9 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import {PKGS_DIR, SRC_DIR} from '@app_scripts/build/Config';
 import postcss from 'postcss';
 import postcssModules from 'postcss-modules';
-import {PKGS_DIR, SRC_DIR} from '../config';
 
 const RESERVED_KEYWORDS = new Set([
 	'break',

fluxer_app/scripts/build/utils/Html.tsx

@@ -19,7 +19,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import {ASSETS_DIR, CDN_ENDPOINT, ROOT_DIR} from '../config';
+import {ASSETS_DIR, CDN_ENDPOINT, ROOT_DIR} from '@app_scripts/build/Config';
 
 interface BuildOutput {
 	mainScript: string | null;

fluxer_app/scripts/build/utils/Resolve.tsx

@@ -19,7 +19,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import {RESOLVE_EXTENSIONS} from '../config';
+import {RESOLVE_EXTENSIONS} from '@app_scripts/build/Config';
 
 export function tryResolveWithExtensions(basePath: string): string | null {
 	if (fs.existsSync(basePath)) {

fluxer_app/scripts/build/utils/ServiceWorker.tsx

@@ -18,12 +18,12 @@
  */
 
 import * as path from 'node:path';
+import {DIST_DIR, SRC_DIR} from '@app_scripts/build/Config';
 import * as esbuild from 'esbuild';
-import {DIST_DIR, SRC_DIR} from '../config';
 
 export async function buildServiceWorker(production: boolean): Promise<void> {
 	await esbuild.build({
-		entryPoints: [path.join(SRC_DIR, 'sw', 'worker.ts')],
+		entryPoints: [path.join(SRC_DIR, 'service_worker', 'Worker.tsx')],
 		bundle: true,
 		format: 'iife',
 		outfile: path.join(DIST_DIR, 'sw.js'),

fluxer_app/scripts/build/utils/index.ts

@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2026 Fluxer Contributors
- *
- * This file is part of Fluxer.
- *
- * Fluxer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Fluxer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Fluxer. If not, see <https://www.gnu.org/licenses/>.
- */
-
-export {copyPublicAssets, copyWasmFiles, removeUnusedCssAssets} from './assets';
-export {generateAllCssDts, generateCssDtsForFile} from './css-dts';
-export {generateHtml} from './html';
-export {tryResolveWithExtensions} from './resolve';
-export {buildServiceWorker} from './service-worker';
-export {cleanEmptySourceMaps} from './sourcemaps';