summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.dockerignore1
-rw-r--r--.gitignore1
-rw-r--r--.ignore1
-rw-r--r--Makefile2
-rw-r--r--custom/conf/app.example.ini3
-rw-r--r--docs/content/doc/administration/config-cheat-sheet.en-us.md1
-rw-r--r--modules/setting/ui.go2
-rw-r--r--modules/templates/helper.go3
-rw-r--r--package-lock.json23
-rw-r--r--package.json2
-rw-r--r--templates/base/head_script.tmpl1
-rw-r--r--web_src/js/features/serviceworker.js57
-rw-r--r--web_src/js/index.js2
-rw-r--r--web_src/js/serviceworker.js23
-rw-r--r--webpack.config.js9
15 files changed, 3 insertions, 128 deletions
diff --git a/.dockerignore b/.dockerignore
index 1ce2a87611..2a41420889 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -76,7 +76,6 @@ cpu.out
/yarn-error.log
/npm-debug.log*
/public/js
-/public/serviceworker.js
/public/css
/public/fonts
/public/img/webpack
diff --git a/.gitignore b/.gitignore
index ad141c30cd..7ae3455d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ cpu.out
/yarn-error.log
/npm-debug.log*
/public/js
-/public/serviceworker.js
/public/css
/public/fonts
/public/img/webpack
diff --git a/.ignore b/.ignore
index a315e5b5b9..cd869d51cb 100644
--- a/.ignore
+++ b/.ignore
@@ -1,5 +1,6 @@
*.min.css
*.min.js
+/assets/*.json
/modules/options/bindata.go
/modules/public/bindata.go
/modules/templates/bindata.go
diff --git a/Makefile b/Makefile
index 16841796b7..664839273b 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ FOMANTIC_WORK_DIR := web_src/fomantic
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
WEBPACK_CONFIGS := webpack.config.js
WEBPACK_DEST := public/js/index.js public/css/index.css
-WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack public/serviceworker.js
+WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack
BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 01abb15c1d..23dfefa013 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1208,9 +1208,6 @@ LEVEL = Info
;; Whether to search within description at repository search on explore page.
;SEARCH_REPO_DESCRIPTION = true
;;
-;; Whether to enable a Service Worker to cache frontend assets
-;USE_SERVICE_WORKER = false
-;;
;; Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
;; A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
;ONLY_SHOW_RELEVANT_REPOS = false
diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md
index 514719a99a..e3612f3759 100644
--- a/docs/content/doc/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md
@@ -230,7 +230,6 @@ The following configuration set `Content-Type: application/vnd.android.package-a
add it to this config.
- `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
- `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
-- `USE_SERVICE_WORKER`: **false**: Whether to enable a Service Worker to cache frontend assets.
- `ONLY_SHOW_RELEVANT_REPOS`: **false** Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index aa2c64019b..41438db40d 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -32,7 +32,6 @@ var UI = struct {
CustomEmojis []string
CustomEmojisMap map[string]string `ini:"-"`
SearchRepoDescription bool
- UseServiceWorker bool
OnlyShowRelevantRepos bool
Notification struct {
@@ -136,7 +135,6 @@ func loadUIFrom(rootCfg ConfigProvider) {
UI.ShowUserEmail = sec.Key("SHOW_USER_EMAIL").MustBool(true)
UI.DefaultShowFullName = sec.Key("DEFAULT_SHOW_FULL_NAME").MustBool(false)
UI.SearchRepoDescription = sec.Key("SEARCH_REPO_DESCRIPTION").MustBool(true)
- UI.UseServiceWorker = sec.Key("USE_SERVICE_WORKER").MustBool(false)
// OnlyShowRelevantRepos=false is important for many private/enterprise instances,
// because many private repositories do not have "description/topic", users just want to search by their names.
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index cae7452306..2f2ef44049 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -127,9 +127,6 @@ func NewFuncMap() template.FuncMap {
"MetaKeywords": func() string {
return setting.UI.Meta.Keywords
},
- "UseServiceWorker": func() bool {
- return setting.UI.UseServiceWorker
- },
"EnableTimetracking": func() bool {
return setting.Service.EnableTimetracking
},
diff --git a/package-lock.json b/package-lock.json
index 1620267030..5e077b8a98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -51,8 +51,6 @@
"vue3-calendar-heatmap": "2.0.5",
"webpack": "5.84.1",
"webpack-cli": "5.1.1",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0",
"wrap-ansi": "8.1.0"
},
"devDependencies": {
@@ -11045,27 +11043,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/workbox-core": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz",
- "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ=="
- },
- "node_modules/workbox-routing": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz",
- "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==",
- "dependencies": {
- "workbox-core": "6.6.0"
- }
- },
- "node_modules/workbox-strategies": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz",
- "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==",
- "dependencies": {
- "workbox-core": "6.6.0"
- }
- },
"node_modules/wrap-ansi": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
diff --git a/package.json b/package.json
index 72563f8bf7..73ce86f333 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,6 @@
"vue3-calendar-heatmap": "2.0.5",
"webpack": "5.84.1",
"webpack-cli": "5.1.1",
- "workbox-routing": "6.6.0",
- "workbox-strategies": "6.6.0",
"wrap-ansi": "8.1.0"
},
"devDependencies": {
diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
index 670d146b56..4e1dffa474 100644
--- a/templates/base/head_script.tmpl
+++ b/templates/base/head_script.tmpl
@@ -12,7 +12,6 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
assetUrlPrefix: '{{AssetUrlPrefix}}',
runModeIsProd: {{.RunModeIsProd}},
customEmojis: {{CustomEmojis}},
- useServiceWorker: {{UseServiceWorker}},
csrfToken: '{{.CsrfToken}}',
pageData: {{.PageData}},
notificationSettings: {{NotificationSettings}}, {{/*a map provided by NewFuncMap in helper.go*/}}
diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js
deleted file mode 100644
index 32d2e04cd6..0000000000
--- a/web_src/js/features/serviceworker.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import {joinPaths, parseUrl} from '../utils.js';
-
-const {useServiceWorker, assetUrlPrefix, assetVersionEncoded} = window.config;
-const cachePrefix = 'static-cache-v'; // actual version is set in the service worker script
-const workerUrl = `${joinPaths(assetUrlPrefix, 'serviceworker.js')}?v=${assetVersionEncoded}`;
-
-async function unregisterAll() {
- for (const registration of await navigator.serviceWorker.getRegistrations()) {
- if (registration.active) await registration.unregister();
- }
-}
-
-async function unregisterOtherWorkers() {
- for (const registration of await navigator.serviceWorker.getRegistrations()) {
- const scriptPath = parseUrl(registration.active?.scriptURL || '').pathname;
- const workerPath = parseUrl(workerUrl).pathname;
- if (scriptPath !== workerPath) await registration.unregister();
- }
-}
-
-async function invalidateCache() {
- for (const key of await caches.keys()) {
- if (key.startsWith(cachePrefix)) caches.delete(key);
- }
-}
-
-async function checkCacheValidity() {
- const cacheKey = assetVersionEncoded;
- const storedCacheKey = localStorage.getItem('staticCacheKey');
-
- // invalidate cache if it belongs to a different gitea version
- if (cacheKey && storedCacheKey !== cacheKey) {
- await invalidateCache();
- localStorage.setItem('staticCacheKey', cacheKey);
- }
-}
-
-export async function initServiceWorker() {
- if (!('serviceWorker' in navigator)) return;
-
- if (useServiceWorker) {
- // unregister all service workers where scriptURL does not match the current one
- await unregisterOtherWorkers();
- try {
- // the spec strictly requires it to be same-origin so the AssetUrlPrefix should contain AppSubUrl
- await checkCacheValidity();
- await navigator.serviceWorker.register(workerUrl);
- } catch (err) {
- console.error(err);
- await invalidateCache();
- await unregisterAll();
- }
- } else {
- await invalidateCache();
- await unregisterAll();
- }
-}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 8f4d379893..3d8a7fc325 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -11,7 +11,6 @@ import {initHeatmap} from './features/heatmap.js';
import {initImageDiff} from './features/imagediff.js';
import {initRepoMigration} from './features/repo-migration.js';
import {initRepoProject} from './features/repo-projects.js';
-import {initServiceWorker} from './features/serviceworker.js';
import {initTableSort} from './features/tablesort.js';
import {initAdminUserListSearchForm} from './features/admin/users.js';
import {initAdminConfigs} from './features/admin/config.js';
@@ -116,7 +115,6 @@ onDomReady(() => {
initImageDiff();
initMarkupAnchors();
initMarkupContent();
- initServiceWorker();
initSshKeyFormParser();
initStopwatch();
initTableSort();
diff --git a/web_src/js/serviceworker.js b/web_src/js/serviceworker.js
deleted file mode 100644
index c96ef8bd97..0000000000
--- a/web_src/js/serviceworker.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {registerRoute} from 'workbox-routing';
-import {StaleWhileRevalidate} from 'workbox-strategies';
-
-const cacheName = 'static-cache-v2';
-
-// disable workbox debug logging in development, remove when debugging the service worker
-self.__WB_DISABLE_DEV_LOGS = true;
-
-// see https://developer.mozilla.org/en-US/docs/Web/API/RequestDestination for possible values
-const cachedDestinations = new Set([
- 'font',
- 'manifest',
- 'paintworklet',
- 'script',
- 'sharedworker',
- 'style',
- 'worker',
-]);
-
-registerRoute(
- ({request}) => cachedDestinations.has(request.destination),
- new StaleWhileRevalidate({cacheName}),
-);
diff --git a/webpack.config.js b/webpack.config.js
index e64f4acb5e..ae71a0599b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -62,9 +62,6 @@ export default {
fileURLToPath(new URL('web_src/js/standalone/swagger.js', import.meta.url)),
fileURLToPath(new URL('web_src/css/standalone/swagger.css', import.meta.url)),
],
- serviceworker: [
- fileURLToPath(new URL('web_src/js/serviceworker.js', import.meta.url)),
- ],
'eventsource.sharedworker': [
fileURLToPath(new URL('web_src/js/features/eventsource.sharedworker.js', import.meta.url)),
],
@@ -73,11 +70,7 @@ export default {
devtool: false,
output: {
path: fileURLToPath(new URL('public', import.meta.url)),
- filename: ({chunk}) => {
- // serviceworker can only manage assets below it's script's directory so
- // we have to put it in / instead of /js/
- return chunk.name === 'serviceworker' ? '[name].js' : 'js/[name].js';
- },
+ filename: () => 'js/[name].js',
chunkFilename: ({chunk}) => {
const language = (/monaco.*languages?_.+?_(.+?)_/.exec(chunk.id) || [])[1];
return `js/${language ? `monaco-language-${language.toLowerCase()}` : `[name]`}.[contenthash:8].js`;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 15:41:15 +0000