Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable workbox when running in webpack dev server, not in dev mode

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-09-30 17:35:12 +01:00
parent aa9b517664
commit 11e676cee0
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vector/platform/WebPlatform.ts
View File

@ -38,13 +38,20 @@ export default class WebPlatform extends VectorBasePlatform {
super(); super();
// load service worker if available on this platform // load service worker if available on this platform
// Service worker is disabled in development: https://github.com/GoogleChrome/workbox/issues/1790 if ('serviceWorker' in navigator) {
if ('serviceWorker' in navigator && process.env.NODE_ENV === "production") { // clean up old dummy sw.js
navigator.serviceWorker.register('service-worker.js'); navigator.serviceWorker.getRegistration('sw.js').then(reg => reg.unregister());
// Service worker is disabled in webpack-dev-server: https://github.com/GoogleChrome/workbox/issues/1790
if (!process.env.WEBPACK_DEV_SERVER) {
navigator.serviceWorker.register('service-worker.js');
} else {
// we no longer run workbox when in webpack-dev-server, clean it up
navigator.serviceWorker.getRegistration('service-worker.js').then(reg => reg.unregister());
}
} }
} }
getHumanReadableName(): string { getHumanReadableName(): string {
return 'Web Platform'; // no translation required: only used for analytics return 'Web Platform'; // no translation required: only used for analytics
} }

6
webpack.config.js
View File

@ -1,4 +1,5 @@
const path = require('path'); const path = require('path');
const {EnvironmentPlugin} = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const TerserPlugin = require('terser-webpack-plugin'); const TerserPlugin = require('terser-webpack-plugin');
@ -32,6 +33,8 @@ module.exports = (env, argv) => {
const jsSdkSrcDir = path.resolve(require.resolve("matrix-js-sdk/package.json"), '..', 'src'); const jsSdkSrcDir = path.resolve(require.resolve("matrix-js-sdk/package.json"), '..', 'src');
const plugins = [ const plugins = [
new EnvironmentPlugin(["WEBPACK_DEV_SERVER"]), // pass this as it is used for conditionally loading workbox
// This exports our CSS using the splitChunks and loaders above. // This exports our CSS using the splitChunks and loaders above.
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'bundles/[hash]/[name].css', filename: 'bundles/[hash]/[name].css',
@ -92,7 +95,8 @@ module.exports = (env, argv) => {
}), }),
]; ];
if (argv.mode === "production") { const isDevServer = process.env.WEBPACK_DEV_SERVER;
if (!isDevServer) {
plugins.push(new WorkboxPlugin.GenerateSW({ plugins.push(new WorkboxPlugin.GenerateSW({
maximumFileSizeToCacheInBytes: 22000000, maximumFileSizeToCacheInBytes: 22000000,
runtimeCaching: [{ runtimeCaching: [{