Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ and this project adheres to
- ♿ add h1 for SR on 40X pages and remove alt texts #1438
- ♿ update labels and shared document icon accessibility #1442
- 🍱(frontend) Fonts GDPR compliants #1453
- ♻️(service-worker) improve SW registration and update handling #1473

### Fixed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const TestComponent = () => {

describe('useSWRegister', () => {
it('checks service-worker is register', () => {
process.env.NEXT_PUBLIC_BUILD_ID = '123456';
vi.spyOn(console, 'error').mockImplementation(() => {});

const registerSpy = vi.fn();
Expand All @@ -35,7 +34,7 @@ describe('useSWRegister', () => {

render(<TestComponent />);

expect(registerSpy).toHaveBeenCalledWith('/service-worker.js?v=123456');
expect(registerSpy).toHaveBeenCalledWith('/service-worker.js');
expect(addEventListenerSpy).toHaveBeenCalledWith(
'controllerchange',
expect.any(Function),
Expand All @@ -44,7 +43,6 @@ describe('useSWRegister', () => {

it('checks service-worker is not register', () => {
process.env.NEXT_PUBLIC_SW_DEACTIVATED = 'true';
process.env.NEXT_PUBLIC_BUILD_ID = '123456';

const registerSpy = vi.fn();
registerSpy.mockImplementation(
Expand All @@ -62,6 +60,6 @@ describe('useSWRegister', () => {

render(<TestComponent />);

expect(registerSpy).not.toHaveBeenCalledWith('/service-worker.js?v=123456');
expect(registerSpy).not.toHaveBeenCalledWith('/service-worker.js');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const useSWRegister = () => {
process.env.NEXT_PUBLIC_SW_DEACTIVATED !== 'true'
) {
navigator.serviceWorker
.register(`/service-worker.js?v=${process.env.NEXT_PUBLIC_BUILD_ID}`)
.register(`/service-worker.js`)
.then((registration) => {
registration.onupdatefound = () => {
const newWorker = registration.installing;
Expand All @@ -29,11 +29,13 @@ export const useSWRegister = () => {
console.error('Service worker registration failed:', err);
});

const currentController = navigator.serviceWorker.controller;
let refreshing = false;
const onControllerChange = () => {
if (currentController) {
window.location.reload();
if (refreshing) {
return;
}
refreshing = true;
window.location.reload();
};
navigator.serviceWorker.addEventListener(
'controllerchange',
Expand Down
Loading