moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sw-embed' into 'develop' 

ServiceWorker: pass /embed through to the backend

See merge request soapbox-pub/soapbox-fe!1723
This commit is contained in:
Alex Gleason 2022-08-12 12:47:55 +00:00
parent 2d9ac9e22e b085073c10
commit 1debd9c3f9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.js
View File

@ -78,7 +78,6 @@ module.exports = {
'space-infix-ops': 'error', 'space-infix-ops': 'error',
'space-in-parens': ['error', 'never'], 'space-in-parens': ['error', 'never'],
'keyword-spacing': 'error', 'keyword-spacing': 'error',
'consistent-return': 'error',
'dot-notation': 'error', 'dot-notation': 'error',
eqeqeq: 'error', eqeqeq: 'error',
indent: ['error', 2, { indent: ['error', 2, {
@ -278,7 +277,6 @@ module.exports = {
files: ['**/*.ts', '**/*.tsx'], files: ['**/*.ts', '**/*.tsx'],
rules: { rules: {
'no-undef': 'off', // https://stackoverflow.com/a/69155899 'no-undef': 'off', // https://stackoverflow.com/a/69155899
'consistent-return': 'off',
}, },
parser: '@typescript-eslint/parser', parser: '@typescript-eslint/parser',
}, },

11
webpack/production.js
View File

@ -92,7 +92,10 @@ module.exports = merge(sharedConfig, {
cacheMaps: [{ cacheMaps: [{
// NOTE: This function gets stringified by OfflinePlugin, so don't try // NOTE: This function gets stringified by OfflinePlugin, so don't try
// moving it anywhere else or making it depend on anything outside it! // moving it anywhere else or making it depend on anything outside it!
match: ({ pathname }) => { // https://github.com/NekR/offline-plugin/blob/master/docs/cache-maps.md
match: (url) => {
const { pathname } = url;
const backendRoutes = [ const backendRoutes = [
'/.well-known', '/.well-known',
'/activities', '/activities',
@ -119,10 +122,8 @@ module.exports = merge(sharedConfig, {
'/unsubscribe', '/unsubscribe',
]; ];
if (pathname) { if (backendRoutes.some(path => pathname.startsWith(path)) || pathname.endsWith('/embed')) {
return backendRoutes.some(path => pathname.startsWith(path)); return url;
} else {
return false;
} }
}, },
requestTypes: ['navigate'], requestTypes: ['navigate'],