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
patch-2
Alex Gleason 2020-10-08 04:34:35 +00:00
commit fb092714e7
2 zmienionych plików z 15 dodań i 32 usunięć

Wyświetl plik

@ -52,25 +52,6 @@ development:
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:
<<: *default

Wyświetl plik

@ -63,23 +63,25 @@ module.exports = merge(sharedConfig, {
devServer: {
clientLogLevel: 'none',
compress: settings.dev_server.compress,
quiet: settings.dev_server.quiet,
disableHostCheck: settings.dev_server.disable_host_check,
host: settings.dev_server.host,
port: settings.dev_server.port,
https: settings.dev_server.https,
hot: settings.dev_server.hmr,
compress: true,
quiet: false,
disableHostCheck: true,
host: 'localhost',
port: 3036,
https: false,
hot: false,
contentBase: resolve(__dirname, '..', settings.public_root_path),
inline: settings.dev_server.inline,
useLocalIp: settings.dev_server.use_local_ip,
public: settings.dev_server.public,
inline: true,
useLocalIp: false,
public: 'localhost:3036',
publicPath: output.publicPath,
historyApiFallback: {
disableDotRule: true,
},
headers: settings.dev_server.headers,
overlay: settings.dev_server.overlay,
headers: {
'Access-Control-Allow-Origin': '*',
},
overlay: true,
stats: {
entrypoints: false,
errorDetails: false,
@ -88,7 +90,7 @@ module.exports = merge(sharedConfig, {
},
watchOptions: Object.assign(
{},
settings.dev_server.watch_options,
{ ignored: '**/node_modules/**' },
watchOptions,
),
serveIndex: true,