Commit b57c0606 authored by Stan Hu's avatar Stan Hu

Merge branch 'leipert-webpack-remove-https-config' into 'master'

Revert https related changes to webpack config

See merge request gitlab-org/gitlab!81031
parents e699d771 8645d975
......@@ -40,13 +40,7 @@ const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/c
const IS_PRODUCTION = process.env.NODE_ENV === 'production';
const IS_DEV_SERVER = process.env.WEBPACK_SERVE === 'true';
const {
DEV_SERVER_HOST,
DEV_SERVER_PUBLIC_ADDR,
DEV_SERVER_TYPE,
DEV_SERVER_SSL_KEY,
DEV_SERVER_SSL_CERT,
} = process.env;
const { DEV_SERVER_HOST, DEV_SERVER_PUBLIC_ADDR } = process.env;
const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10);
const DEV_SERVER_ALLOWED_HOSTS =
process.env.DEV_SERVER_ALLOWED_HOSTS && process.env.DEV_SERVER_ALLOWED_HOSTS.split(',');
......@@ -731,13 +725,6 @@ module.exports = {
client: {
...(DEV_SERVER_PUBLIC_ADDR ? { webSocketURL: DEV_SERVER_PUBLIC_ADDR } : {}),
},
server: {
type: DEV_SERVER_TYPE || 'http',
options: {
key: DEV_SERVER_SSL_KEY,
cert: DEV_SERVER_SSL_CERT,
},
},
},
devtool: NO_SOURCEMAPS ? false : devtool,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment