mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-02-20 11:44:09 +08:00
Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge: 4c89cf720 1085d59a6 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit 4c89cf720998f981241d521ec355c73755a63206 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commit b943f2011f1526f5387b4df476a1c53115f7420e Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commit cd1be2d66db0a37c853a8336f19e1d5ad03d4803 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit 7b8ac01fc2f8b5969642ec36a68de3ca5c94d9d0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit 02afed66d55cea7499e7d1c6494a17ba5fa36f16 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit 9c0f736f0c853c14e5c3f4fd0c989b3197440068 Merge: 62c4fbf1e e04775c4f Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit 62c4fbf1e354e3f41ae9db278f6383df756e318a Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit 76b1e44a93eb36d7c1004c81c9e1e5f36e03973b Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commit f783e90040b15ebdc86810e1d814982fc5e398d2 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit 3d4ce6554c64209a4fe397b8dac52bb8af7893b1 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commit e35ba58f2af155d67887581ac003ac79211e00e8 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit 1f30d4216dadc57b860a46c98a3a92df86616530 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit 6cd4e44f07308a33521a3772d79f093785e7ede0 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit 2ab738b3036b3b1c31a63dcf68f785699020022e Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
54 lines
1.4 KiB
JavaScript
Vendored
54 lines
1.4 KiB
JavaScript
Vendored
import { merge } from 'webpack-merge';
|
|
import yaml from 'js-yaml';
|
|
import fs from 'fs';
|
|
import { BASE_URL } from './constants.js';
|
|
import common from './webpack.common.js';
|
|
|
|
const ZERO_HOST = '0.0.0.0';
|
|
const LOCALHOST = '127.0.0.1';
|
|
const DEFAULT_PORT = 80;
|
|
|
|
/**
|
|
* Get document, or throw exception on error
|
|
* @returns {{bind_host: string, bind_port: number}}
|
|
*/
|
|
const importConfig = () => {
|
|
try {
|
|
const doc = yaml.safeLoad(fs.readFileSync('../AdguardHome.yaml', 'utf8'));
|
|
const { bind_host, bind_port } = doc;
|
|
return {
|
|
bind_host,
|
|
bind_port,
|
|
};
|
|
} catch (e) {
|
|
console.error(e);
|
|
return {
|
|
bind_host: ZERO_HOST,
|
|
bind_port: DEFAULT_PORT,
|
|
};
|
|
}
|
|
};
|
|
|
|
const getDevServerConfig = (proxyUrl = BASE_URL) => {
|
|
const { bind_host: host, bind_port: port } = importConfig();
|
|
const { DEV_SERVER_PORT } = process.env;
|
|
|
|
const devServerHost = host === ZERO_HOST ? LOCALHOST : host;
|
|
const devServerPort = DEV_SERVER_PORT || port + 8000;
|
|
|
|
return {
|
|
hot: true,
|
|
open: true,
|
|
host: devServerHost,
|
|
port: devServerPort,
|
|
proxy: {
|
|
[proxyUrl]: `http://${devServerHost}:${port}`,
|
|
},
|
|
};
|
|
};
|
|
|
|
export default merge(common, {
|
|
devtool: 'eval-source-map',
|
|
...(process.env.WEBPACK_DEV_SERVER ? { devServer: getDevServerConfig(BASE_URL) } : undefined),
|
|
});
|