Update workbox

gulpfile.mjs

@@ -299,6 +299,19 @@ const serverDev = cb => {
 	cb();
 };
 
+const patchWebWorkerTask = cb => {
+	const t = './dist/browser/sw.min.js';
+	if (fs.existsSync(t)) {
+		fs.renameSync(t, t.replace('.min', ''));
+	}
+
+	const a = './dist/browser/sw.min.js.map';
+	if (fs.existsSync(a)) {
+		fs.unlinkSync(a);
+	}
+	cb();
+};
+
 let webpackScript = 'webpack-prod';
 const webpackArgs = ['--'];
 
@@ -380,7 +393,6 @@ export {
 	build,
 	dev,
 	sprites,
+	patchWebWorkerTask as patchWebWorker,
 	tests as test
 };
-		// gulp.watch(['build/**/*.css']).on('change', path => server.notify({ path }));
-		// gulp.watch(['build/**/*.js']).on('change', path => server.notify({ path }));

package.json

@@ -10,9 +10,8 @@
     "lint": "tslint -c tslint.json src/ts/**/*.ts",
     "dev": "gulp dev",
     "dev-sprites": "gulp dev --sprites",
-    "sw-generate": "workbox generateSW workbox-config.js",
-    "sw-uglify": "uglifyjs build/sw.js -o build/sw.min.js",
-    "sw": "npm run sw-generate && npm run sw-uglify",
+    "sw-generate": "workbox generateSW workbox-config.js && gulp patchWebWorker",
+    "sw": "npm run sw-generate",
     "ts": "tsc",
     "ts-tools": "tsc -p tsconfig.tools.json",
     "ts-watch": "npm run ts -- --watch",
@@ -208,7 +207,7 @@
     "webpack-bundle-analyzer": "^5.2.0",
     "webpack-dev-server": "^5.2.3",
     "webpack-merge": "^6.0.1",
-    "workbox-cli": "^4.3.1",
+    "workbox-cli": "^7.4.0",
     "wrapper-webpack-plugin": "^2.2.2",
     "yargs": "^18.0.0",
     "zone.js": "^0.14.2"

workbox-config.js

@@ -1,5 +1,6 @@
 const { hash } = require('./src/ts/generated/hash.json');
-const ignore = /^\/((a(pi(\d?|-tools)|uth|dm(in)?)|(bl|m)ep)|tools|reload)\/|\.html|^\/sw\.js$/;
+const ignore = /^\/((a(pi(\d?|-tools)|uth|dm(in)?)|(bl|m)ep)|tools|reload)\/?|\.html|^\/sw\.js$/;
+
 
 module.exports = {
 	globDirectory: 'build/',
@@ -7,17 +8,18 @@ module.exports = {
 		'**/*.{js,css,png,jpg,wasm}',
 	],
 	globIgnores: [
+		'**/assets/maps/**',
 		'**/assets-admin/**',
 		'**/bootstrap-es*',
 		'**/bootstrap-tools*',
 		'**/style-tools*',
 		'**/style-inline*',
-		'**/sw.min.js',
+		'**/sw.js',
 	],
 	dontCacheBustURLsMatching: /-[a-f0-9]{10}\./,
 	swDest: 'build/sw.js',
 	navigateFallback: '/',
-	navigateFallbackBlacklist: [ignore],
+	navigateFallbackDenylist: [ignore],
 	maximumFileSizeToCacheInBytes: 10 * 1024 * 1024, // 10 MB
 	// importWorkboxFrom: 'local',
 	skipWaiting: true,