Merge branch 'move-dev-server-config-out-of-webpacker-yaml' into 'develop'
Migrate devServer settings from config/webpacker.yml to development.js See merge request soapbox-pub/soapbox-fe!338
This commit is contained in:
commit
fb092714e7
2 changed files with 15 additions and 32 deletions
|
@ -52,25 +52,6 @@ development:
|
||||||
|
|
||||||
compile: true
|
compile: true
|
||||||
|
|
||||||
# Reference: https://webpack.js.org/configuration/dev-server/
|
|
||||||
dev_server:
|
|
||||||
https: false
|
|
||||||
host: localhost
|
|
||||||
port: 3036
|
|
||||||
public: localhost:3036
|
|
||||||
hmr: false
|
|
||||||
# Inline should be set to true if using HMR
|
|
||||||
inline: true
|
|
||||||
overlay: true
|
|
||||||
compress: true
|
|
||||||
disable_host_check: true
|
|
||||||
use_local_ip: false
|
|
||||||
quiet: false
|
|
||||||
headers:
|
|
||||||
'Access-Control-Allow-Origin': '*'
|
|
||||||
watch_options:
|
|
||||||
ignored: '**/node_modules/**'
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
<<: *default
|
<<: *default
|
||||||
|
|
||||||
|
|
|
@ -63,23 +63,25 @@ module.exports = merge(sharedConfig, {
|
||||||
|
|
||||||
devServer: {
|
devServer: {
|
||||||
clientLogLevel: 'none',
|
clientLogLevel: 'none',
|
||||||
compress: settings.dev_server.compress,
|
compress: true,
|
||||||
quiet: settings.dev_server.quiet,
|
quiet: false,
|
||||||
disableHostCheck: settings.dev_server.disable_host_check,
|
disableHostCheck: true,
|
||||||
host: settings.dev_server.host,
|
host: 'localhost',
|
||||||
port: settings.dev_server.port,
|
port: 3036,
|
||||||
https: settings.dev_server.https,
|
https: false,
|
||||||
hot: settings.dev_server.hmr,
|
hot: false,
|
||||||
contentBase: resolve(__dirname, '..', settings.public_root_path),
|
contentBase: resolve(__dirname, '..', settings.public_root_path),
|
||||||
inline: settings.dev_server.inline,
|
inline: true,
|
||||||
useLocalIp: settings.dev_server.use_local_ip,
|
useLocalIp: false,
|
||||||
public: settings.dev_server.public,
|
public: 'localhost:3036',
|
||||||
publicPath: output.publicPath,
|
publicPath: output.publicPath,
|
||||||
historyApiFallback: {
|
historyApiFallback: {
|
||||||
disableDotRule: true,
|
disableDotRule: true,
|
||||||
},
|
},
|
||||||
headers: settings.dev_server.headers,
|
headers: {
|
||||||
overlay: settings.dev_server.overlay,
|
'Access-Control-Allow-Origin': '*',
|
||||||
|
},
|
||||||
|
overlay: true,
|
||||||
stats: {
|
stats: {
|
||||||
entrypoints: false,
|
entrypoints: false,
|
||||||
errorDetails: false,
|
errorDetails: false,
|
||||||
|
@ -88,7 +90,7 @@ module.exports = merge(sharedConfig, {
|
||||||
},
|
},
|
||||||
watchOptions: Object.assign(
|
watchOptions: Object.assign(
|
||||||
{},
|
{},
|
||||||
settings.dev_server.watch_options,
|
{ ignored: '**/node_modules/**' },
|
||||||
watchOptions,
|
watchOptions,
|
||||||
),
|
),
|
||||||
serveIndex: true,
|
serveIndex: true,
|
||||||
|
|
Loading…
Reference in a new issue