mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03: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 commit4c89cf7209
Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commitb943f2011f
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commitcd1be2d66d
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit7b8ac01fc2
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit02afed66d5
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit9c0f736f0c
Merge:62c4fbf1e
e04775c4f
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit62c4fbf1e3
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit76b1e44a93
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commitf783e90040
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit3d4ce6554c
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commite35ba58f2a
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit1f30d4216d
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit6cd4e44f07
Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit2ab738b303
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),
|
|
});
|