Merge pull request #5749 from featheredtoast/service-worker-registration-fixes

Fix - service worker registrations

app/assets/javascripts/discourse/initializers/register-service-worker.js.es6

@@ -2,7 +2,6 @@ export default {
   name: 'register-service-worker',
 
   initialize() {
-    window.addEventListener('load', () => {
     const isSecured = (document.location.protocol === 'https:') ||
           (location.hostname === "localhost");
 
@@ -23,6 +22,5 @@ export default {
         });
       }
     }
-    });
   }
 };

app/views/common/_discourse_javascript.html.erb

@@ -45,7 +45,7 @@
     Discourse.ThemeSettings = ps.get('themeSettings');
     Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
     Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>';
-    Discourse.ServiceWorkerURL = '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>'
+    Discourse.ServiceWorkerURL = Discourse.Environment != "development" ? '<%= Rails.application.assets_manifest.assets['service-worker.js'] %>' : 'service-worker.js';
     I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
     Discourse.start();
     Discourse.set('assetVersion','<%= Discourse.assets_digest %>');

config/routes.rb

@@ -734,6 +734,8 @@ Discourse::Application.routes.draw do
     # logs.
     get "/service-worker.js" => redirect(relative_url_root + service_worker_asset), format: :js
     get service_worker_asset => "static#service_worker_asset", format: :js
+  elsif Rails.env.development?
+    get "/service-worker.js" => "static#service_worker_asset", format: :js
   end
 
   get "cdn_asset/:site/*path" => "static#cdn_asset", format: false