From 71259c5f19cd27ecb2db4be5166832c4e819dd03 Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Fri, 18 Jan 2019 19:29:51 +0300 Subject: [PATCH] Added web setup entry point --- client/public/index.html | 26 +++++++++++++------------- client/public/install.html | 16 ++++++++++++++++ client/webpack.common.js | 13 ++++++++++++- client/webpack.dev.js | 1 - 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 client/public/install.html diff --git a/client/public/index.html b/client/public/index.html index e6b99e20..6b003a23 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -1,16 +1,16 @@ - - - - - - AdGuard Home - - - -
- + + + + + + AdGuard Home + + + +
+ diff --git a/client/public/install.html b/client/public/install.html new file mode 100644 index 00000000..45065fe3 --- /dev/null +++ b/client/public/install.html @@ -0,0 +1,16 @@ + + + + + + + + Setup AdGuard Home + + + +
+ + diff --git a/client/webpack.common.js b/client/webpack.common.js index 4ca3b1e4..aa1b2383 100644 --- a/client/webpack.common.js +++ b/client/webpack.common.js @@ -8,7 +8,9 @@ const CleanWebpackPlugin = require('clean-webpack-plugin'); const RESOURCES_PATH = path.resolve(__dirname); const ENTRY_REACT = path.resolve(RESOURCES_PATH, 'src/index.js'); +const ENTRY_INSTALL = path.resolve(RESOURCES_PATH, 'src/install/index.js'); const HTML_PATH = path.resolve(RESOURCES_PATH, 'public/index.html'); +const HTML_INSTALL_PATH = path.resolve(RESOURCES_PATH, 'public/install.html'); const PUBLIC_PATH = path.resolve(__dirname, '../build/static'); @@ -16,7 +18,8 @@ const config = { target: 'web', context: RESOURCES_PATH, entry: { - bundle: ENTRY_REACT, + main: ENTRY_REACT, + install: ENTRY_INSTALL, }, output: { path: PUBLIC_PATH, @@ -101,8 +104,16 @@ const config = { new HtmlWebpackPlugin({ inject: true, cache: false, + chunks: ['main'], template: HTML_PATH, }), + new HtmlWebpackPlugin({ + inject: true, + cache: false, + chunks: ['install'], + filename: 'install.html', + template: HTML_INSTALL_PATH, + }), new ExtractTextPlugin({ filename: '[name].[contenthash].css', }), diff --git a/client/webpack.dev.js b/client/webpack.dev.js index 977e6c9f..79589a08 100644 --- a/client/webpack.dev.js +++ b/client/webpack.dev.js @@ -2,7 +2,6 @@ const merge = require('webpack-merge'); const common = require('./webpack.common.js'); module.exports = merge(common, { - devtool: 'inline-source-map', module: { rules: [{ test: /\.js$/,