Skip to content

fix: replace https to server to support Webpack 5 #11806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: replace https to server to support Webpack 5 #11806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c824f7
fix: replace https to server to support Webpack 5
luffy84217 Dec 19, 2021
424f6a3
chore: rename variable protocolType to protocol
luffy84217 Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions ...es/react-scripts/config/getHttpsConfig.js → ...s/react-scripts/config/getServerConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,30 @@ function readEnvFile(file, type) {
return fs.readFileSync(file);
}

// Get the https config
// Return cert files if provided in env, otherwise just true or false
function getHttpsConfig() {
// Get the server config
// Return server option if provided in env, otherwise just string
function getServerConfig() {
const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env;
const isHttps = HTTPS === 'true';
const protocol = HTTPS === 'true' ? 'https' : 'http';

if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) {
const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE);
const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE);
const config = {
cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
key: readEnvFile(keyFile, 'SSL_KEY_FILE'),
};
if (protocol === 'https') {
if (SSL_CRT_FILE && SSL_KEY_FILE) {
const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE);
const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE);
const config = {
type: protocol,
options: {
cert: readEnvFile(crtFile, 'SSL_CRT_FILE'),
key: readEnvFile(keyFile, 'SSL_KEY_FILE'),
},
};

validateKeyAndCerts({ ...config, keyFile, crtFile });
return config;
validateKeyAndCerts({ ...config.options, keyFile, crtFile });
return config;
}
return protocol;
}
return isHttps;
return protocol;
}

module.exports = getHttpsConfig;
module.exports = getServerConfig;
7 changes: 4 additions & 3 deletions packages/react-scripts/config/webpackDevServer.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMi
const ignoredFiles = require('react-dev-utils/ignoredFiles');
const redirectServedPath = require('react-dev-utils/redirectServedPathMiddleware');
const paths = require('./paths');
const getHttpsConfig = require('./getHttpsConfig');
const getServerConfig = require('./getServerConfig');

const host = process.env.HOST || '0.0.0.0';
const sockHost = process.env.WDS_SOCKET_HOST;
Expand Down Expand Up @@ -98,8 +98,9 @@ module.exports = function (proxy, allowedHost) {
// remove last slash so user can land on `/test` instead of `/test/`
publicPath: paths.publicUrlOrPath.slice(0, -1),
},

https: getHttpsConfig(),
// https is deprecated from webpack-dev-server v4.4.0+ in favor of server option.
// see https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md#440-2021-10-27
server: getServerConfig(),
host,
historyApiFallback: {
// Paths with dots should still use the history fallback.
Expand Down