mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-22 21:15:35 +03:00
c72cd58f69
Squashed commit of the following: commit 1aab0f62e94ce665a1b996552fac41dc4e769b4d Merge: cdf5eb6ec1f5fdae
Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 24 15:36:05 2020 +0300 Merge branch '1920-client-find' into feature/1925 commit cdf5eb6ea67a665d21a3155d8cf89bba9a5a9948 Merge: b6c20b1c10f67bd3
Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 23 20:28:51 2020 +0300 Merge branch 'master' into feature/1925 commit b6c20b1c7359a0e5902405b0551712f936848a80 Merge: 97d388ef96512433
Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 15 10:44:25 2020 +0300 Merge branch 'master' into feature/1925 commit 97d388ef6571d590f21da00f86d889e881ca0c3d Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 15 10:30:50 2020 +0300 Extract buttons commit ca45fde11fc2b2812ff2b84dbd67aff0b5341be1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 10 12:46:09 2020 +0300 Handle errors in updateLogs commit f15e03c2e5a7115db984f70f72b0ddd870ece73d Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 10 12:39:34 2020 +0300 Update mobile block status on click commit 033b28db3b324f6d529ac1a0ef657886cdbe02bd Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 20:53:42 2020 +0300 Fix mobile block buttons, auto open page on web serve start commit 2730937b23309167a066b9154728ac53ffe81a49 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 13:58:37 2020 +0300 Disable allow this client button when isNotInAllowedList is true commit 818cf869d63654c184762ad2701c4429a3e3011e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 13:06:01 2020 +0300 Update client block state on option click commit a072b8983757f419645c0207ea78e6e867c440cb Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 20:17:16 2020 +0300 Adapt to api changes commit 28ab2bd8b3f14f60bc822b5a69fa1801db67d816 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 14:12:20 2020 +0300 Change query log block confirm messages commit 9b0b6f6f9b1ec168fa71dbedd036152da59006e3 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 12:00:46 2020 +0300 Refactor inner work with disallowed commit 05f76154b8f489738d032fdaa835edb371ce70c7 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Sep 7 16:11:37 2020 +0300 + client: Move the client access check to the server-side
67 lines
1.7 KiB
JavaScript
Vendored
67 lines
1.7 KiB
JavaScript
Vendored
const merge = require('webpack-merge');
|
|
const yaml = require('js-yaml');
|
|
const fs = require('fs');
|
|
const common = require('./webpack.common.js');
|
|
const { BASE_URL } = require('./constants');
|
|
|
|
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}`,
|
|
},
|
|
open: true,
|
|
};
|
|
};
|
|
|
|
module.exports = merge(common, {
|
|
devtool: 'eval-source-map',
|
|
module: {
|
|
rules: [
|
|
{
|
|
test: /\.js$/,
|
|
exclude: /node_modules/,
|
|
loader: 'eslint-loader',
|
|
options: {
|
|
emitWarning: true,
|
|
configFile: 'dev.eslintrc',
|
|
},
|
|
},
|
|
],
|
|
},
|
|
...(process.env.WEBPACK_DEV_SERVER ? { devServer: getDevServerConfig(BASE_URL) } : undefined),
|
|
});
|