Commit b798830c authored by Lukas Eipert's avatar Lukas Eipert

Improve webpack incremental compiler status

Adjust the message depending on the status of LIVE_RELOAD. If the
webpack dev server has live reload disabled, we simply refresh the page
after 5 seconds.
parent c957cc53
/* globals LIVE_RELOAD */
const div = document.createElement('div'); const div = document.createElement('div');
Object.assign(div.style, { Object.assign(div.style, {
...@@ -15,6 +16,10 @@ Object.assign(div.style, { ...@@ -15,6 +16,10 @@ Object.assign(div.style, {
'text-align': 'center', 'text-align': 'center',
}); });
const reloadMessage = LIVE_RELOAD
? 'You have live_reload enabled, the page will reload automatically when complete.'
: 'You have live_reload disabled, the page will reload automatically in a few seconds.';
div.innerHTML = ` div.innerHTML = `
<!-- https://github.com/webpack/media/blob/master/logo/icon-square-big.svg --> <!-- https://github.com/webpack/media/blob/master/logo/icon-square-big.svg -->
<svg height="50" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 1200"> <svg height="50" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1200 1200">
...@@ -30,9 +35,15 @@ div.innerHTML = ` ...@@ -30,9 +35,15 @@ div.innerHTML = `
Learn more <a href="https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/configuration.md#webpack-settings">here</a>. Learn more <a href="https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/configuration.md#webpack-settings">here</a>.
</p> </p>
<p> <p>
If you have live_reload enabled, the page will reload automatically when complete.<br /> ${reloadMessage}<br />
Otherwise, please <a href="">reload the page manually in a few seconds</a> If it doesn't, please <a href="">reload the page manually</a>.
</p> </p>
`; `;
document.body.append(div); document.body.append(div);
if (!LIVE_RELOAD) {
setTimeout(() => {
window.location.reload();
}, 5000);
}
...@@ -677,6 +677,7 @@ module.exports = { ...@@ -677,6 +677,7 @@ module.exports = {
IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false), IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false),
// This is used by Sourcegraph because these assets are loaded dnamically // This is used by Sourcegraph because these assets are loaded dnamically
'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH),
...(IS_PRODUCTION ? {} : { LIVE_RELOAD: DEV_SERVER_LIVERELOAD }),
}), }),
/* Pikaday has a optional dependency to moment. /* Pikaday has a optional dependency to moment.
......
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