Merge branch 'sw-network-first' into 'develop'

ServiceWorker: use network-first strategy

See merge request soapbox-pub/soapbox!2159
environments/review-develop-3zknud/deployments/2417
Alex Gleason 2023-01-23 18:09:37 +00:00
commit 5973c16839
4 zmienionych plików z 3 dodań i 27 usunięć

Wyświetl plik

@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Posts: remove file icon from empty link previews. - Posts: remove file icon from empty link previews.
- Settings: moved "Import data" under settings. - Settings: moved "Import data" under settings.
- Composer: add more descriptive discard confirmation message. - Composer: add more descriptive discard confirmation message.
- ServiceWorker: switch to a network-first strategy. The "An update is available!" prompt goes away.
### Fixed ### Fixed
- Layout: use accent color for "floating action button" (mobile compose button). - Layout: use accent color for "floating action button" (mobile compose button).

Wyświetl plik

@ -1284,8 +1284,6 @@
"sw.state.unknown": "Unknown", "sw.state.unknown": "Unknown",
"sw.state.waiting": "Waiting", "sw.state.waiting": "Waiting",
"sw.status": "Status", "sw.status": "Status",
"sw.update": "Update",
"sw.update_text": "An update is available.",
"sw.url": "Script URL", "sw.url": "Script URL",
"tabs_bar.all": "All", "tabs_bar.all": "All",
"tabs_bar.dashboard": "Dashboard", "tabs_bar.dashboard": "Dashboard",

Wyświetl plik

@ -1,11 +1,8 @@
import * as OfflinePluginRuntime from '@lcdp/offline-plugin/runtime'; import * as OfflinePluginRuntime from '@lcdp/offline-plugin/runtime';
import React from 'react'; import React from 'react';
import { createRoot } from 'react-dom/client'; import { createRoot } from 'react-dom/client';
import { defineMessages } from 'react-intl';
import { setSwUpdating } from 'soapbox/actions/sw';
import * as BuildConfig from 'soapbox/build-config'; import * as BuildConfig from 'soapbox/build-config';
import { store } from 'soapbox/store';
import { printConsoleWarning } from 'soapbox/utils/console'; import { printConsoleWarning } from 'soapbox/utils/console';
import '@fontsource/inter/200.css'; import '@fontsource/inter/200.css';
@ -27,12 +24,6 @@ import './precheck';
import { default as Soapbox } from './containers/soapbox'; import { default as Soapbox } from './containers/soapbox';
import * as monitoring from './monitoring'; import * as monitoring from './monitoring';
import ready from './ready'; import ready from './ready';
import toast from './toast';
const messages = defineMessages({
update: { id: 'sw.update', defaultMessage: 'Update' },
updateText: { id: 'sw.update_text', defaultMessage: 'An update is available.' },
});
// Sentry // Sentry
monitoring.start(); monitoring.start();
@ -51,20 +42,6 @@ ready(() => {
if (BuildConfig.NODE_ENV === 'production') { if (BuildConfig.NODE_ENV === 'production') {
// avoid offline in dev mode because it's harder to debug // avoid offline in dev mode because it's harder to debug
// https://github.com/NekR/offline-plugin/pull/201#issuecomment-285133572 // https://github.com/NekR/offline-plugin/pull/201#issuecomment-285133572
OfflinePluginRuntime.install({ OfflinePluginRuntime.install();
onUpdateReady: function() {
toast.info(messages.updateText, {
actionLabel: messages.update,
action: () => {
store.dispatch(setSwUpdating(true));
OfflinePluginRuntime.applyUpdate();
},
duration: Infinity,
});
},
onUpdated: function() {
window.location.reload();
},
});
} }
}); });

Wyświetl plik

@ -40,6 +40,7 @@ const configuration: Configuration = {
}), }),
new OfflinePlugin({ new OfflinePlugin({
autoUpdate: true, autoUpdate: true,
responseStrategy: 'network-first',
caches: { caches: {
main: [':rest:'], main: [':rest:'],
additional: [ additional: [
@ -146,7 +147,6 @@ const configuration: Configuration = {
requestTypes: ['navigate'], requestTypes: ['navigate'],
}], }],
safeToUseOptionalCaches: true, safeToUseOptionalCaches: true,
appShell: join(FE_SUBDIRECTORY, '/'),
}), }),
], ],
}; };